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

mld2p4-smooth-2side:

Browse Source 
mlprec/impl/mld_dprecset.F90
 tests/fileread/df_sample.f90
 tests/fileread/runs/dfs.inp
 tests/pdegen/runs/ppde.inp

Fixed bug in precset.
Adapted df_sample.
stopcriterion
Salvatore Filippone 9 years ago
parent df01dcfebd
commit a1d88c2bbf
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
mlprec/impl/mld_dprecset.F90
Unescape Escape View File

@ -243,7 +243,7 @@ subroutine mld_dprecseti(p,what,val,info,ilev,pos)
& mld_sub_ren_,mld_sub_ovr_,mld_sub_fillin_,& & mld_sub_ren_,mld_sub_ovr_,mld_sub_fillin_,&
& mld_smoother_sweeps_,mld_smoother_type_) & mld_smoother_sweeps_,mld_smoother_type_)
do ilev_=1,max(1,nlev_-1) do ilev_=1,max(1,nlev_-1)
call p%precv(ilev_)%set(mld_smoother_type_,val,info,pos=pos) call p%precv(ilev_)%set(what,val,info,pos=pos)
if (info /= 0) return if (info /= 0) return
end do end do

7
tests/fileread/df_sample.f90
Unescape Escape View File

@ -74,6 +74,8 @@ program df_sample
real(psb_dpk_) :: ascale ! smoothed aggregation scale factor real(psb_dpk_) :: ascale ! smoothed aggregation scale factor
end type precdata end type precdata
type(precdata) :: prec_choice type(precdata) :: prec_choice
type(mld_d_jac_smoother_type) :: dbsmth
type(mld_d_bwgs_solver_type) :: dbwgs
! sparse matrices ! sparse matrices
type(psb_dspmat_type) :: a, aux_a type(psb_dspmat_type) :: a, aux_a
@ -305,7 +307,10 @@ program df_sample
call mld_precset(prec,mld_coarse_fillin_, prec_choice%cfill, info) call mld_precset(prec,mld_coarse_fillin_, prec_choice%cfill, info)
call mld_precset(prec,mld_coarse_iluthrs_, prec_choice%cthres, info) call mld_precset(prec,mld_coarse_iluthrs_, prec_choice%cthres, info)
call mld_precset(prec,mld_coarse_sweeps_, prec_choice%cjswp, info) call mld_precset(prec,mld_coarse_sweeps_, prec_choice%cjswp, info)
call prec%set(dbsmth,info,pos='post')
call prec%set(dbwgs,info,pos='post')
call mld_precset(prec,'solver_sweeps', 4, info, pos='pre')
call mld_precset(prec,'solver_sweeps', 4, info, pos='post')
else else
nlv = 1 nlv = 1
call mld_precinit(prec,prec_choice%prec,info) call mld_precinit(prec,prec_choice%prec,info)

20
tests/fileread/runs/dfs.inp
Unescape Escape View File

@ -1,26 +1,26 @@
pressmat.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or DATIAMBRA/matrix.mm ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or
pressrhs.mtx ! rhs | http://www.cise.ufl.edu/research/sparse/matrices/index.html DATIAMBRA/rhs.mm ! rhs | http://www.cise.ufl.edu/research/sparse/matrices/index.html
MM ! MM !
RGMRES ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG CG ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG
CSR ! Storage format: CSR COO JAD CSR ! Storage format: CSR COO JAD
0 ! IPART (partition method): 0 (block) 2 (graph, with Metis) 0 ! IPART (partition method): 0 (block) 2 (graph, with Metis)
2 ! ISTOPC 2 ! ISTOPC
01000 ! ITMAX 01500 ! ITMAX
02 ! ITRACE 10 ! ITRACE
30 ! IRST (restart for RGMRES and BiCGSTABL) 30 ! IRST (restart for RGMRES and BiCGSTABL)
1.d-9 ! EPS 1.d-6 ! EPS
4L-M-RAS-I-UR ! Longer descriptive name for preconditioner (up to 20 chars) 4L-M-RAS-I-UR ! Longer descriptive name for preconditioner (up to 20 chars)
ML ! Preconditioner type: NONE JACOBI BJAC AS ML ML ! Preconditioner type: NONE JACOBI BJAC AS ML
1 ! Number of overlap layers for AS preconditioner 1 ! Number of overlap layers for AS preconditioner
HALO ! AS restriction operator: NONE HALO HALO ! AS restriction operator: NONE HALO
NONE ! AS prolongation operator: NONE SUM AVG NONE ! AS prolongation operator: NONE SUM AVG
ILU ! AS subdomain solver: DSCALE ILU MILU ILUT UMF SLU MUMPS GS ! AS subdomain solver: DSCALE ILU MILU ILUT UMF SLU MUMPS
0 ! Fill level P for ILU(P) and ILU(T,P) 4 ! Fill level P for ILU(P) and ILU(T,P)
1.d-4 ! Threshold T for ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P)
1 ! Number of Jacobi sweeps for base smoother 1 ! Number of Jacobi sweeps for base smoother
4 ! Number of levels in a multilevel preconditioner 5 ! Number of levels in a multilevel preconditioner
AS ! Smoother type JACOBI BJAC AS ignored for non-ML AS ! Smoother type JACOBI BJAC AS ignored for non-ML
SMOOTHED ! Type of aggregation: SMOOTHED NONSMOOTHED UNSMOOTHED ! Type of aggregation: SMOOTHED NONSMOOTHED
DEC ! Type of aggregation: DEC DEC ! Type of aggregation: DEC
MULT ! Type of multilevel correction: ADD MULT MULT ! Type of multilevel correction: ADD MULT
TWOSIDE ! Side of correction PRE POST TWOSIDE (ignored for ADD) TWOSIDE ! Side of correction PRE POST TWOSIDE (ignored for ADD)

4
tests/pdegen/runs/ppde.inp
Unescape Escape View File

@ -1,8 +1,8 @@
BICGSTAB ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG BICGSTAB ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG
CSR ! Storage format CSR COO JAD CSR ! Storage format CSR COO JAD
0030 ! IDIM; domain size is idim**3 0040 ! IDIM; domain size is idim**3
2 ! ISTOPC 2 ! ISTOPC
0500 ! ITMAX 2000 ! ITMAX
10 ! ITRACE 10 ! ITRACE
30 ! IRST (restart for RGMRES and BiCGSTABL) 30 ! IRST (restart for RGMRES and BiCGSTABL)
1.d-6 ! EPS 1.d-6 ! EPS

Write Preview
Loading…
Cancel
Save