fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-20 12:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

psblas3:

Browse Source 
krylov/Makefile
 krylov/psb_ccgr.f90
 krylov/psb_cgcr.f90
 krylov/psb_ckrylov.f90
 krylov/psb_dcgr.f90
 krylov/psb_dgcr.f90
 krylov/psb_dkrylov.f90
 krylov/psb_scgr.f90
 krylov/psb_sgcr.f90
 krylov/psb_skrylov.f90
 krylov/psb_zcgr.f90
 krylov/psb_zgcr.f90
 krylov/psb_zkrylov.f90

Change name CGR into GCR, step 2.
This commit is contained in:
Salvatore Filippone
2016-05-25 10:01:06 +00:00
parent 2cd77dd1bd
commit 15a36458cc
9 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
krylov/Makefile
+4 -4
View File
@@ -10,13 +10,13 @@ MODOBJS= psb_base_krylov_conv_mod.o \
psb_d_krylov_conv_mod.o psb_z_krylov_conv_mod.o \
psb_krylov_mod.o
F90OBJS=psb_dkrylov.o psb_skrylov.o psb_ckrylov.o psb_zkrylov.o \
psb_dcgstab.o psb_dcg.o psb_dfcg.o psb_dcgr.o psb_dcgs.o \
psb_dcgstab.o psb_dcg.o psb_dfcg.o psb_dgcr.o psb_dcgs.o \
psb_dbicg.o psb_dcgstabl.o psb_drgmres.o\
psb_scgstab.o psb_scg.o psb_sfcg.o psb_scgr.o psb_scgs.o \
psb_scgstab.o psb_scg.o psb_sfcg.o psb_sgcr.o psb_scgs.o \
psb_sbicg.o psb_scgstabl.o psb_srgmres.o\
psb_ccgstab.o psb_ccg.o psb_cfcg.o psb_ccgr.o psb_ccgs.o \
psb_ccgstab.o psb_ccg.o psb_cfcg.o psb_cgcr.o psb_ccgs.o \
psb_cbicg.o psb_ccgstabl.o psb_crgmres.o\
psb_zcgstab.o psb_zcg.o psb_zfcg.o psb_zcgr.o psb_zcgs.o \
psb_zcgstab.o psb_zcg.o psb_zfcg.o psb_zgcr.o psb_zcgs.o \
psb_zbicg.o psb_zcgstabl.o psb_zrgmres.o
OBJS=$(F90OBJS) $(MODOBJS)
krylov/psb_ccgr.f90 → krylov/psb_cgcr.f90
+10 -10
View File
@@ -29,7 +29,7 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: psb_ccgr.f90
! File: psb_cgcr.f90
!!
!! Contributors: Ambra Abdullahi (UNITOV) and Pasqua D’Ambra (IAC-CNR)
!!
@@ -63,10 +63,10 @@
!!$ C C
!!$ C C
!!$ CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
! File: psb_ccgr.f90
! File: psb_cgcr.f90
!
! Subroutine: psb_ccgr
! This subroutine implements the CGR method.
! Subroutine: psb_cgcr
! This subroutine implements the GCR method.
!
!
! Arguments:
@@ -105,7 +105,7 @@
! irst - integer(optional) Input: restart parameter
!
subroutine psb_ccgr_vect(a,prec,b,x,eps,desc_a,info,&
subroutine psb_cgcr_vect(a,prec,b,x,eps,desc_a,info,&
& itmax,iter,err,itrace, irst, istop)
use psb_base_mod
use psb_prec_mod
@@ -138,10 +138,10 @@ subroutine psb_ccgr_vect(a,prec,b,x,eps,desc_a,info,&
complex(psb_spk_), allocatable, target :: aux(:)
character(len=20) :: name
type(psb_itconv_type) :: stopdat
character(len=*), parameter :: methdname='CGR'
character(len=*), parameter :: methdname='GCR'
integer(psb_ipk_) ::int_err(5)
info = psb_success_
name = 'psb_ccgr'
name = 'psb_cgcr'
call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
@@ -268,8 +268,8 @@ subroutine psb_ccgr_vect(a,prec,b,x,eps,desc_a,info,&
call psb_errpush(info,name)
goto 9999
end if
if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart
call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info)
! if (info /= psb_success_) Then
! call psb_errpush(psb_err_from_subroutine_non_,name)
! goto 9999
@@ -370,6 +370,6 @@ subroutine psb_ccgr_vect(a,prec,b,x,eps,desc_a,info,&
end if
return
end subroutine psb_ccgr_vect
end subroutine psb_cgcr_vect
krylov/psb_ckrylov.f90
+3 -3
View File
@@ -148,7 +148,7 @@ Subroutine psb_ckrylov_vect(method,a,prec,b,x,eps,desc_a,info,&
procedure(psb_ckryl_vect) :: psb_cbicg_vect, psb_ccgstab_vect,&
& psb_ccgs_vect
procedure(psb_ckryl_rest_vect) :: psb_crgmres_vect, psb_ccgstabl_vect, psb_ccgr_vect
procedure(psb_ckryl_rest_vect) :: psb_crgmres_vect, psb_ccgstabl_vect, psb_cgcr_vect
procedure(psb_ckryl_cond_vect) :: psb_ccg_vect, psb_cfcg_vect
@@ -173,8 +173,8 @@ Subroutine psb_ckrylov_vect(method,a,prec,b,x,eps,desc_a,info,&
case('FCG')
call psb_cfcg_vect(a,prec,b,x,eps,desc_a,info,&
&itmax,iter,err,itrace,istop,cond)
case('CGR')
call psb_ccgr_vect(a,prec,b,x,eps,desc_a,info,&
case('GCR')
call psb_cgcr_vect(a,prec,b,x,eps,desc_a,info,&
&itmax,iter,err,itrace,istop)
case('CGS')
call psb_ccgs_vect(a,prec,b,x,eps,desc_a,info,&
krylov/psb_dcgr.f90 → krylov/psb_dgcr.f90
+10 -10
View File
@@ -29,7 +29,7 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: psb_dcgr.f90
! File: psb_dgcr.f90
!!
!! Contributors: Ambra Abdullahi (UNITOV) and Pasqua D’Ambra (IAC-CNR)
!!
@@ -63,10 +63,10 @@
!!$ C C
!!$ C C
!!$ CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
! File: psb_dcgr.f90
! File: psb_dgcr.f90
!
! Subroutine: psb_dcgr
! This subroutine implements the CGR method.
! Subroutine: psb_dgcr
! This subroutine implements the GCR method.
!
!
! Arguments:
@@ -105,7 +105,7 @@
! irst - integer(optional) Input: restart parameter
!
subroutine psb_dcgr_vect(a,prec,b,x,eps,desc_a,info,&
subroutine psb_dgcr_vect(a,prec,b,x,eps,desc_a,info,&
& itmax,iter,err,itrace, irst, istop)
use psb_base_mod
use psb_prec_mod
@@ -138,10 +138,10 @@ subroutine psb_dcgr_vect(a,prec,b,x,eps,desc_a,info,&
real(psb_dpk_), allocatable, target :: aux(:)
character(len=20) :: name
type(psb_itconv_type) :: stopdat
character(len=*), parameter :: methdname='CGR'
character(len=*), parameter :: methdname='GCR'
integer(psb_ipk_) ::int_err(5)
info = psb_success_
name = 'psb_dcgr'
name = 'psb_dgcr'
call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
@@ -268,8 +268,8 @@ subroutine psb_dcgr_vect(a,prec,b,x,eps,desc_a,info,&
call psb_errpush(info,name)
goto 9999
end if
if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart
call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info)
! if (info /= psb_success_) Then
! call psb_errpush(psb_err_from_subroutine_non_,name)
! goto 9999
@@ -370,6 +370,6 @@ subroutine psb_dcgr_vect(a,prec,b,x,eps,desc_a,info,&
end if
return
end subroutine psb_dcgr_vect
end subroutine psb_dgcr_vect
krylov/psb_dkrylov.f90
+3 -3
View File
@@ -148,7 +148,7 @@ Subroutine psb_dkrylov_vect(method,a,prec,b,x,eps,desc_a,info,&
procedure(psb_dkryl_vect) :: psb_dbicg_vect, psb_dcgstab_vect,&
& psb_dcgs_vect
procedure(psb_dkryl_rest_vect) :: psb_drgmres_vect, psb_dcgstabl_vect, psb_dcgr_vect
procedure(psb_dkryl_rest_vect) :: psb_drgmres_vect, psb_dcgstabl_vect, psb_dgcr_vect
procedure(psb_dkryl_cond_vect) :: psb_dcg_vect, psb_dfcg_vect
@@ -173,8 +173,8 @@ Subroutine psb_dkrylov_vect(method,a,prec,b,x,eps,desc_a,info,&
case('FCG')
call psb_dfcg_vect(a,prec,b,x,eps,desc_a,info,&
&itmax,iter,err,itrace,istop,cond)
case('CGR')
call psb_dcgr_vect(a,prec,b,x,eps,desc_a,info,&
case('GCR')
call psb_dgcr_vect(a,prec,b,x,eps,desc_a,info,&
&itmax,iter,err,itrace,istop)
case('CGS')
call psb_dcgs_vect(a,prec,b,x,eps,desc_a,info,&
krylov/psb_scgr.f90 → krylov/psb_sgcr.f90
+10 -10
View File
@@ -29,7 +29,7 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: psb_scgr.f90
! File: psb_sgcr.f90
!!
!! Contributors: Ambra Abdullahi (UNITOV) and Pasqua D’Ambra (IAC-CNR)
!!
@@ -63,10 +63,10 @@
!!$ C C
!!$ C C
!!$ CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
! File: psb_scgr.f90
! File: psb_sgcr.f90
!
! Subroutine: psb_scgr
! This subroutine implements the CGR method.
! Subroutine: psb_sgcr
! This subroutine implements the GCR method.
!
!
! Arguments:
@@ -105,7 +105,7 @@
! irst - integer(optional) Input: restart parameter
!
subroutine psb_scgr_vect(a,prec,b,x,eps,desc_a,info,&
subroutine psb_sgcr_vect(a,prec,b,x,eps,desc_a,info,&
& itmax,iter,err,itrace, irst, istop)
use psb_base_mod
use psb_prec_mod
@@ -138,10 +138,10 @@ subroutine psb_scgr_vect(a,prec,b,x,eps,desc_a,info,&
real(psb_spk_), allocatable, target :: aux(:)
character(len=20) :: name
type(psb_itconv_type) :: stopdat
character(len=*), parameter :: methdname='CGR'
character(len=*), parameter :: methdname='GCR'
integer(psb_ipk_) ::int_err(5)
info = psb_success_
name = 'psb_scgr'
name = 'psb_sgcr'
call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
@@ -268,8 +268,8 @@ subroutine psb_scgr_vect(a,prec,b,x,eps,desc_a,info,&
call psb_errpush(info,name)
goto 9999
end if
if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart
call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info)
! if (info /= psb_success_) Then
! call psb_errpush(psb_err_from_subroutine_non_,name)
! goto 9999
@@ -370,6 +370,6 @@ subroutine psb_scgr_vect(a,prec,b,x,eps,desc_a,info,&
end if
return
end subroutine psb_scgr_vect
end subroutine psb_sgcr_vect
krylov/psb_skrylov.f90
+3 -3
View File
@@ -148,7 +148,7 @@ Subroutine psb_skrylov_vect(method,a,prec,b,x,eps,desc_a,info,&
procedure(psb_skryl_vect) :: psb_sbicg_vect, psb_scgstab_vect,&
& psb_scgs_vect
procedure(psb_skryl_rest_vect) :: psb_srgmres_vect, psb_scgstabl_vect, psb_scgr_vect
procedure(psb_skryl_rest_vect) :: psb_srgmres_vect, psb_scgstabl_vect, psb_sgcr_vect
procedure(psb_skryl_cond_vect) :: psb_scg_vect, psb_sfcg_vect
@@ -173,8 +173,8 @@ Subroutine psb_skrylov_vect(method,a,prec,b,x,eps,desc_a,info,&
case('FCG')
call psb_sfcg_vect(a,prec,b,x,eps,desc_a,info,&
&itmax,iter,err,itrace,istop,cond)
case('CGR')
call psb_scgr_vect(a,prec,b,x,eps,desc_a,info,&
case('GCR')
call psb_sgcr_vect(a,prec,b,x,eps,desc_a,info,&
&itmax,iter,err,itrace,istop)
case('CGS')
call psb_scgs_vect(a,prec,b,x,eps,desc_a,info,&
krylov/psb_zcgr.f90 → krylov/psb_zgcr.f90
+10 -10
View File
@@ -29,7 +29,7 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
! File: psb_zcgr.f90
! File: psb_zgcr.f90
!!
!! Contributors: Ambra Abdullahi (UNITOV) and Pasqua D’Ambra (IAC-CNR)
!!
@@ -63,10 +63,10 @@
!!$ C C
!!$ C C
!!$ CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
! File: psb_zcgr.f90
! File: psb_zgcr.f90
!
! Subroutine: psb_zcgr
! This subroutine implements the CGR method.
! Subroutine: psb_zgcr
! This subroutine implements the GCR method.
!
!
! Arguments:
@@ -105,7 +105,7 @@
! irst - integer(optional) Input: restart parameter
!
subroutine psb_zcgr_vect(a,prec,b,x,eps,desc_a,info,&
subroutine psb_zgcr_vect(a,prec,b,x,eps,desc_a,info,&
& itmax,iter,err,itrace, irst, istop)
use psb_base_mod
use psb_prec_mod
@@ -138,10 +138,10 @@ subroutine psb_zcgr_vect(a,prec,b,x,eps,desc_a,info,&
complex(psb_dpk_), allocatable, target :: aux(:)
character(len=20) :: name
type(psb_itconv_type) :: stopdat
character(len=*), parameter :: methdname='CGR'
character(len=*), parameter :: methdname='GCR'
integer(psb_ipk_) ::int_err(5)
info = psb_success_
name = 'psb_zcgr'
name = 'psb_zgcr'
call psb_erractionsave(err_act)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
@@ -268,8 +268,8 @@ subroutine psb_zcgr_vect(a,prec,b,x,eps,desc_a,info,&
call psb_errpush(info,name)
goto 9999
end if
if (psb_check_conv(methdname,itx,x,r,desc_a,stopdat,info)) exit restart
call psb_init_conv(methdname,istop_,itrace_,itmax_,a,b,eps,desc_a,stopdat,info)
! if (info /= psb_success_) Then
! call psb_errpush(psb_err_from_subroutine_non_,name)
! goto 9999
@@ -370,6 +370,6 @@ subroutine psb_zcgr_vect(a,prec,b,x,eps,desc_a,info,&
end if
return
end subroutine psb_zcgr_vect
end subroutine psb_zgcr_vect
krylov/psb_zkrylov.f90
+3 -3
View File
@@ -148,7 +148,7 @@ Subroutine psb_zkrylov_vect(method,a,prec,b,x,eps,desc_a,info,&
procedure(psb_zkryl_vect) :: psb_zbicg_vect, psb_zcgstab_vect,&
& psb_zcgs_vect
procedure(psb_zkryl_rest_vect) :: psb_zrgmres_vect, psb_zcgstabl_vect, psb_zcgr_vect
procedure(psb_zkryl_rest_vect) :: psb_zrgmres_vect, psb_zcgstabl_vect, psb_zgcr_vect
procedure(psb_zkryl_cond_vect) :: psb_zcg_vect, psb_zfcg_vect
@@ -173,8 +173,8 @@ Subroutine psb_zkrylov_vect(method,a,prec,b,x,eps,desc_a,info,&
case('FCG')
call psb_zfcg_vect(a,prec,b,x,eps,desc_a,info,&
&itmax,iter,err,itrace,istop,cond)
case('CGR')
call psb_zcgr_vect(a,prec,b,x,eps,desc_a,info,&
case('GCR')
call psb_zgcr_vect(a,prec,b,x,eps,desc_a,info,&
&itmax,iter,err,itrace,istop)
case('CGS')
call psb_zcgs_vect(a,prec,b,x,eps,desc_a,info,&