fdurastante
/
amg4psblas
mirror of https://github.com/sfilippone/amg4psblas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup use of RICHARDSON

Browse Source
repackage
sfilippone 1 month ago
parent 1aa7c8db59
commit 13c99a0c3f
6 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File

16
samples/advanced/pdegen/amg_d_pde2d.F90
Unescape Escape View File

@ -105,9 +105,9 @@ program amg_d_pde2d
integer(psb_epk_) :: amatsize, precsize, descsize integer(psb_epk_) :: amatsize, precsize, descsize
real(psb_dpk_) :: err, resmx, resmxp real(psb_dpk_) :: err, resmx, resmxp
! Krylov solver data ! Solver data
type solverdata type solverdata
character(len=40) :: kmethd ! Krylov solver character(len=40) :: kmethd ! Iterative solver
integer(psb_ipk_) :: istopc ! stopping criterion integer(psb_ipk_) :: istopc ! stopping criterion
integer(psb_ipk_) :: itmax ! maximum number of iterations integer(psb_ipk_) :: itmax ! maximum number of iterations
integer(psb_ipk_) :: itrace ! tracing integer(psb_ipk_) :: itrace ! tracing
@ -472,16 +472,22 @@ program amg_d_pde2d
! !
call psb_barrier(ctxt) call psb_barrier(ctxt)
t1 = psb_wtime() t1 = psb_wtime()
if (psb_toupper(trim(s_choice%kmethd)) == 'RICHARDSON') then select case(psb_toupper(trim(s_choice%kmethd)))
case('RICHARDSON')
call psb_richardson(a,prec,b,x,s_choice%eps,& call psb_richardson(a,prec,b,x,s_choice%eps,&
& desc_a,info,itmax=s_choice%itmax,iter=iter,& & desc_a,info,itmax=s_choice%itmax,iter=iter,&
& err=err,itrace=s_choice%itrace,& & err=err,itrace=s_choice%itrace,&
& istop=s_choice%istopc) & istop=s_choice%istopc)
else case('BICGSTAB','BICGSTABL','BICG','CG','CGS','FCG','GCR','RGMRES')
call psb_krylov(s_choice%kmethd,a,prec,b,x,s_choice%eps,& call psb_krylov(s_choice%kmethd,a,prec,b,x,s_choice%eps,&
& desc_a,info,itmax=s_choice%itmax,iter=iter,err=err,itrace=s_choice%itrace,& & desc_a,info,itmax=s_choice%itmax,iter=iter,err=err,itrace=s_choice%itrace,&
& istop=s_choice%istopc,irst=s_choice%irst) & istop=s_choice%istopc,irst=s_choice%irst)
end if case default
write(psb_err_unit,*) 'Unknown method :"',trim(s_choice%kmethd),'"'
info=psb_err_invalid_input_
call psb_errpush(info,name)
goto 9999
end select
call psb_barrier(ctxt) call psb_barrier(ctxt)
tslv = psb_wtime() - t1 tslv = psb_wtime() - t1

16
samples/advanced/pdegen/amg_d_pde3d.F90
Unescape Escape View File

@ -106,9 +106,9 @@ program amg_d_pde3d
integer(psb_epk_) :: amatsize, precsize, descsize integer(psb_epk_) :: amatsize, precsize, descsize
real(psb_dpk_) :: err, resmx, resmxp real(psb_dpk_) :: err, resmx, resmxp
! Krylov solver data ! Solver data
type solverdata type solverdata
character(len=40) :: kmethd ! Krylov solver character(len=40) :: kmethd ! Iterative solver
integer(psb_ipk_) :: istopc ! stopping criterion integer(psb_ipk_) :: istopc ! stopping criterion
integer(psb_ipk_) :: itmax ! maximum number of iterations integer(psb_ipk_) :: itmax ! maximum number of iterations
integer(psb_ipk_) :: itrace ! tracing integer(psb_ipk_) :: itrace ! tracing
@ -476,16 +476,22 @@ program amg_d_pde3d
! !
call psb_barrier(ctxt) call psb_barrier(ctxt)
t1 = psb_wtime() t1 = psb_wtime()
if (psb_toupper(trim(s_choice%kmethd)) == 'RICHARDSON') then select case(psb_toupper(trim(s_choice%kmethd)))
case('RICHARDSON')
call psb_richardson(a,prec,b,x,s_choice%eps,& call psb_richardson(a,prec,b,x,s_choice%eps,&
& desc_a,info,itmax=s_choice%itmax,iter=iter,& & desc_a,info,itmax=s_choice%itmax,iter=iter,&
& err=err,itrace=s_choice%itrace,& & err=err,itrace=s_choice%itrace,&
& istop=s_choice%istopc) & istop=s_choice%istopc)
else case('BICGSTAB','BICGSTABL','BICG','CG','CGS','FCG','GCR','RGMRES')
call psb_krylov(s_choice%kmethd,a,prec,b,x,s_choice%eps,& call psb_krylov(s_choice%kmethd,a,prec,b,x,s_choice%eps,&
& desc_a,info,itmax=s_choice%itmax,iter=iter,err=err,itrace=s_choice%itrace,& & desc_a,info,itmax=s_choice%itmax,iter=iter,err=err,itrace=s_choice%itrace,&
& istop=s_choice%istopc,irst=s_choice%irst) & istop=s_choice%istopc,irst=s_choice%irst)
end if case default
write(psb_err_unit,*) 'Unknown method :"',trim(s_choice%kmethd),'"'
info=psb_err_invalid_input_
call psb_errpush(info,name)
goto 9999
end select
call psb_barrier(ctxt) call psb_barrier(ctxt)
tslv = psb_wtime() - t1 tslv = psb_wtime() - t1

16
samples/advanced/pdegen/amg_s_pde2d.F90
Unescape Escape View File

@ -105,9 +105,9 @@ program amg_s_pde2d
integer(psb_epk_) :: amatsize, precsize, descsize integer(psb_epk_) :: amatsize, precsize, descsize
real(psb_spk_) :: err, resmx, resmxp real(psb_spk_) :: err, resmx, resmxp
! Krylov solver data ! Solver data
type solverdata type solverdata
character(len=40) :: kmethd ! Krylov solver character(len=40) :: kmethd ! Iterative solver
integer(psb_ipk_) :: istopc ! stopping criterion integer(psb_ipk_) :: istopc ! stopping criterion
integer(psb_ipk_) :: itmax ! maximum number of iterations integer(psb_ipk_) :: itmax ! maximum number of iterations
integer(psb_ipk_) :: itrace ! tracing integer(psb_ipk_) :: itrace ! tracing
@ -472,16 +472,22 @@ program amg_s_pde2d
! !
call psb_barrier(ctxt) call psb_barrier(ctxt)
t1 = psb_wtime() t1 = psb_wtime()
if (psb_toupper(trim(s_choice%kmethd)) == 'RICHARDSON') then select case(psb_toupper(trim(s_choice%kmethd)))
case('RICHARDSON')
call psb_richardson(a,prec,b,x,s_choice%eps,& call psb_richardson(a,prec,b,x,s_choice%eps,&
& desc_a,info,itmax=s_choice%itmax,iter=iter,& & desc_a,info,itmax=s_choice%itmax,iter=iter,&
& err=err,itrace=s_choice%itrace,& & err=err,itrace=s_choice%itrace,&
& istop=s_choice%istopc) & istop=s_choice%istopc)
else case('BICGSTAB','BICGSTABL','BICG','CG','CGS','FCG','GCR','RGMRES')
call psb_krylov(s_choice%kmethd,a,prec,b,x,s_choice%eps,& call psb_krylov(s_choice%kmethd,a,prec,b,x,s_choice%eps,&
& desc_a,info,itmax=s_choice%itmax,iter=iter,err=err,itrace=s_choice%itrace,& & desc_a,info,itmax=s_choice%itmax,iter=iter,err=err,itrace=s_choice%itrace,&
& istop=s_choice%istopc,irst=s_choice%irst) & istop=s_choice%istopc,irst=s_choice%irst)
end if case default
write(psb_err_unit,*) 'Unknown method :"',trim(s_choice%kmethd),'"'
info=psb_err_invalid_input_
call psb_errpush(info,name)
goto 9999
end select
call psb_barrier(ctxt) call psb_barrier(ctxt)
tslv = psb_wtime() - t1 tslv = psb_wtime() - t1

16
samples/advanced/pdegen/amg_s_pde3d.F90
Unescape Escape View File

@ -106,9 +106,9 @@ program amg_s_pde3d
integer(psb_epk_) :: amatsize, precsize, descsize integer(psb_epk_) :: amatsize, precsize, descsize
real(psb_spk_) :: err, resmx, resmxp real(psb_spk_) :: err, resmx, resmxp
! Krylov solver data ! Solver data
type solverdata type solverdata
character(len=40) :: kmethd ! Krylov solver character(len=40) :: kmethd ! Iterative solver
integer(psb_ipk_) :: istopc ! stopping criterion integer(psb_ipk_) :: istopc ! stopping criterion
integer(psb_ipk_) :: itmax ! maximum number of iterations integer(psb_ipk_) :: itmax ! maximum number of iterations
integer(psb_ipk_) :: itrace ! tracing integer(psb_ipk_) :: itrace ! tracing
@ -476,16 +476,22 @@ program amg_s_pde3d
! !
call psb_barrier(ctxt) call psb_barrier(ctxt)
t1 = psb_wtime() t1 = psb_wtime()
if (psb_toupper(trim(s_choice%kmethd)) == 'RICHARDSON') then select case(psb_toupper(trim(s_choice%kmethd)))
case('RICHARDSON')
call psb_richardson(a,prec,b,x,s_choice%eps,& call psb_richardson(a,prec,b,x,s_choice%eps,&
& desc_a,info,itmax=s_choice%itmax,iter=iter,& & desc_a,info,itmax=s_choice%itmax,iter=iter,&
& err=err,itrace=s_choice%itrace,& & err=err,itrace=s_choice%itrace,&
& istop=s_choice%istopc) & istop=s_choice%istopc)
else case('BICGSTAB','BICGSTABL','BICG','CG','CGS','FCG','GCR','RGMRES')
call psb_krylov(s_choice%kmethd,a,prec,b,x,s_choice%eps,& call psb_krylov(s_choice%kmethd,a,prec,b,x,s_choice%eps,&
& desc_a,info,itmax=s_choice%itmax,iter=iter,err=err,itrace=s_choice%itrace,& & desc_a,info,itmax=s_choice%itmax,iter=iter,err=err,itrace=s_choice%itrace,&
& istop=s_choice%istopc,irst=s_choice%irst) & istop=s_choice%istopc,irst=s_choice%irst)
end if case default
write(psb_err_unit,*) 'Unknown method :"',trim(s_choice%kmethd),'"'
info=psb_err_invalid_input_
call psb_errpush(info,name)
goto 9999
end select
call psb_barrier(ctxt) call psb_barrier(ctxt)
tslv = psb_wtime() - t1 tslv = psb_wtime() - t1

2
samples/advanced/pdegen/runs/amg_pde2d.inp
Unescape Escape View File

@ -4,7 +4,7 @@ CSR ! Storage format CSR COO JAD
POISSON ! PDECOEFF: POISSON, EXP, BOX, GAUSS POISSON ! PDECOEFF: POISSON, EXP, BOX, GAUSS
% ! Coefficients of the PDE % ! Coefficients of the PDE
CG ! Iterative method: CG ! Iterative method:
% ! BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES % ! BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES RICHARDSON
2 ! ISTOPC 2 ! ISTOPC
00500 ! ITMAX 00500 ! ITMAX
1 ! ITRACE 1 ! ITRACE

2
samples/advanced/pdegen/runs/amg_pde3d.inp
Unescape Escape View File

@ -4,7 +4,7 @@ CSR ! Storage format CSR COO JAD
POISSON ! PDECOEFF: POISSON, EXP, BOX, GAUSS POISSON ! PDECOEFF: POISSON, EXP, BOX, GAUSS
% ! Coefficients of the PDE % ! Coefficients of the PDE
CG ! Iterative method: CG ! Iterative method:
% ! BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES % ! BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES RICHARDSON
2 ! ISTOPC 2 ! ISTOPC
00500 ! ITMAX 00500 ! ITMAX
1 ! ITRACE 1 ! ITRACE

Write Preview
Loading…
Cancel
Save