mld2p4-2:

krylov
 krylov/Makefile
 krylov/cleansymlinks
 krylov/psb_prec_mod.F90
 mlprec/mld_cprecset.F90
 mlprec/mld_dprecset.F90
 mlprec/mld_sprecset.F90
 mlprec/mld_zprecset.F90
 tests/fileread/runs/dfs.inp
 tests/fileread/runs/zfs.inp
 tests/fileread/zf_sample.f90

Fixed precset to call smoother when it does not know what is asked of
it. 
Taken out krylov subdir, does not make sense anymore.
This commit is contained in:
Salvatore Filippone
2011-03-15 13:06:54 +00:00
parent 2c2a166f44
commit 114a5de98a
10 changed files with 73 additions and 352 deletions
+2 -2
View File
@@ -24,9 +24,9 @@ NONSMOOTHED ! Type of aggregation: SMOOTHED NONSMOOTHED
DEC ! Type of aggregation: DEC
MULT ! Type of multilevel correction: ADD MULT
TWOSIDE ! Side of correction PRE POST TWOSIDE (ignored for ADD)
DIST ! Coarsest-level matrix distribution: DIST REPL
REPL ! Coarsest-level matrix distribution: DIST REPL
BJAC ! Coarsest-level solver: JACOBI BJAC UMF SLU SLUDIST
ILU ! Coarsest-level subsolver: ILU UMF SLU SLUDIST (DSCALE for JACOBI)
UMF ! Coarsest-level subsolver: ILU UMF SLU SLUDIST (DSCALE for JACOBI)
0 ! Coarsest-level fillin P for ILU(P) and ILU(T,P)
1.d-4 ! Coarsest-level threshold T for ILU(T,P)
4 ! Number of Jacobi sweeps for BJAC/PJAC coarsest-level solver
+5 -5
View File
@@ -1,12 +1,12 @@
waveguide3D.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or
young1c.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or
NONE ! rhs | http://www.cise.ufl.edu/research/sparse/matrices/index.html
MM ! File format: MM (Matrix Market) HB (Harwell-Boeing).
BICGSTAB ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG
CSR ! Storage format: CSR COO JAD
0 ! IPART (partition method): 0 (block) 2 (graph, with Metis)
2 ! ISTOPC
01000 ! ITMAX
-1 ! ITRACE
00200 ! ITMAX
02 ! ITRACE
30 ! IRST (restart for RGMRES and BiCGSTABL)
1.d-5 ! EPS
3L-M-RAS-I-D4 ! Longer descriptive name for preconditioner (up to 20 chars)
@@ -24,9 +24,9 @@ SMOOTHED ! Type of aggregation: SMOOTHED NONSMOOTHED MINENERG
DEC ! Type of aggregation: DEC
MULT ! Type of multilevel correction: ADD MULT
POST ! Side of multiplicative correction PRE POST TWOSIDE (ignored for ADD)
DIST ! Coarsest-level matrix distribution: DIST REPL
REPL ! Coarsest-level matrix distribution: DIST REPL
BJAC ! Coarsest-level solver: JACOBI BJAC UMF SLU SLUDIST
ILU ! Coarsest-level subsolver: ILU UMF SLU SLUDIST (DSCALE for JACOBI)
UMF ! Coarsest-level subsolver: ILU UMF SLU SLUDIST (DSCALE for JACOBI)
0 ! Coarsest-level fillin P for ILU(P) and ILU(T,P)
1.d-4 ! Coarsest-level threshold T for ILU(T,P)
4 ! Number of Jacobi sweeps for BJAC coarsest-level solver
+1
View File
@@ -279,6 +279,7 @@ program zf_sample
call mld_precset(prec,mld_sub_iluthrs_, prec_choice%thr, info)
end if
call psb_set_debug_level(0)
! building the preconditioner
t1 = psb_wtime()
call mld_precbld(a,desc_a,prec,info)