From 59ae89af7d97c9898650d931950d1ddd5fd991b5 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 5 Jan 2011 16:44:35 +0000 Subject: [PATCH] mld2p4: mlprec/mld_ziluk_fact.f90 tests/fileread/runs/dfs.inp tests/fileread/runs/zfs.inp Error message in ziluk_Fact overflows string. To be fixed elsewhere --- mlprec/mld_ziluk_fact.f90 | 4 ++-- tests/fileread/runs/dfs.inp | 34 ++++++++++++++++++---------------- tests/fileread/runs/zfs.inp | 10 +++++----- tests/pdegen/runs/ppde.inp | 2 +- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/mlprec/mld_ziluk_fact.f90 b/mlprec/mld_ziluk_fact.f90 index 5f350da8..4bf1af2b 100644 --- a/mlprec/mld_ziluk_fact.f90 +++ b/mlprec/mld_ziluk_fact.f90 @@ -838,7 +838,7 @@ contains ! Local variables integer :: j,isz,err_act,int_err(5),idxp character(len=20), parameter :: name='mld_ziluk_factint' - character(len=20) :: ch_err + character(len=42) :: ch_err if (psb_get_errstatus() /= 0) return info = psb_success_ @@ -945,7 +945,7 @@ contains ! info = psb_err_pivot_too_small_ int_err(1) = i - write(ch_err,'(g20.10)') d(i) + write(ch_err,'(2(g18.9,1x))') d(i) call psb_errpush(info,name,i_err=int_err,a_err=ch_err) goto 9999 else diff --git a/tests/fileread/runs/dfs.inp b/tests/fileread/runs/dfs.inp index 42ddb461..5d4f7e5a 100644 --- a/tests/fileread/runs/dfs.inp +++ b/tests/fileread/runs/dfs.inp @@ -1,33 +1,35 @@ -thm200x120.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or +A_1M_gps.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). +MM ! BICGSTAB ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG CSR ! Storage format: CSR COO JAD -2 ! IPART (partition method): 0 (block) 2 (graph, with Metis) +0 ! IPART (partition method): 0 (block) 2 (graph, with Metis) 2 ! ISTOPC -01000 ! ITMAX +00500 ! ITMAX 02 ! ITRACE 30 ! IRST (restart for RGMRES and BiCGSTABL) -1.d-6 ! EPS +1.d-7 ! EPS 3L-M-RAS-I-D4 ! Longer descriptive name for preconditioner (up to 20 chars) -ML ! Preconditioner type: NONE DIAG BJAC AS ML -1 ! Number of overlap layers for AS preconditioner +ML ! Preconditioner type: NONE JACOBI BJAC AS ML +0 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG -ILU ! AS subdomain solver: ILU MILU ILUT UMF SLU -1 ! Fill level P for ILU(P) and ILU(T,P) +ILU ! AS subdomain solver: DSCALE ILU MILU ILUT UMF SLU +0 ! Fill level P for ILU(P) and ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P) -1 ! Jacobi sweeps +4 ! Number of Jacobi sweeps for base smoother 3 ! Number of levels in a multilevel preconditioner AS ! Smoother type JACOBI BJAC AS ignored for non-ML -MINENERGY ! Type of aggregation: SMOOTHED NONSMOOTHED MINENERGY +NONSMOOTHED ! Type of aggregation: SMOOTHED NONSMOOTHED DEC ! Type of aggregation: DEC MULT ! Type of multilevel correction: ADD MULT -POST ! Side of multiplicative correction PRE POST TWOSIDE (ignored for ADD) +TWOSIDE ! Side of correction PRE POST TWOSIDE (ignored for ADD) DIST ! Coarsest-level matrix distribution: DIST REPL -BJAC ! Coarsest-level solver: BJAC UMF SLU SLUDIST -ILU ! Coarsest-level subsolver: ILU UMF SLU SLUDIST +BJAC ! Coarsest-level solver: JACOBI BJAC UMF SLU SLUDIST +ILU ! 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 -0.10d0 ! Smoothed aggregation threshold: >= 0.0 +4 ! Number of Jacobi sweeps for BJAC/PJAC coarsest-level solver +0.01d0 ! Smoothed aggregation threshold: >= 0.0 +F ! Read aggregation maps from file +mlaggr.out-FRT.lev ! File name prefix diff --git a/tests/fileread/runs/zfs.inp b/tests/fileread/runs/zfs.inp index 75ce2a26..f3a576bc 100644 --- a/tests/fileread/runs/zfs.inp +++ b/tests/fileread/runs/zfs.inp @@ -1,4 +1,4 @@ -qc2534.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or +waveguide3D.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 @@ -10,14 +10,14 @@ CSR ! Storage format: CSR COO JAD 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) -ML ! Preconditioner type: NONE DIAG BJAC AS ML +ML ! Preconditioner type: NONE JACOBI BJAC AS ML 0 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG ILU ! AS subdomain solver: ILU MILU ILUT UMF SLU 1 ! Fill level P for ILU(P) and ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P) -1 ! Jacobi sweeps +4 ! Number of Jacobi sweeps for base smoother 3 ! Number of levels in a multilevel preconditioner AS ! Smoother type JACOBI BJAC AS ignored for non-ML SMOOTHED ! Type of aggregation: SMOOTHED NONSMOOTHED MINENERGY @@ -25,8 +25,8 @@ 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 -BJAC ! Coarsest-level solver: BJAC UMF SLU SLUDIST -UMF ! Coarsest-level subsolver: ILU UMF SLU SLUDIST +BJAC ! Coarsest-level solver: JACOBI BJAC UMF SLU SLUDIST +ILU ! 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 diff --git a/tests/pdegen/runs/ppde.inp b/tests/pdegen/runs/ppde.inp index a1e562e0..ea90fe64 100644 --- a/tests/pdegen/runs/ppde.inp +++ b/tests/pdegen/runs/ppde.inp @@ -16,7 +16,7 @@ ILU ! Subdomain solver DSCALE ILU MILU ILUT UMF SLU 1.d-4 ! Threshold T for ILU(T,P) 1 ! Smoother/Jacobi sweeps AS ! Smoother type JACOBI BJAC AS ignored for non-ML -3 ! Number of levels in a multilevel preconditioner +2 ! Number of levels in a multilevel preconditioner SMOOTHED ! Kind of aggregation: SMOOTHED, NONSMOOTHED, MINENERGY DEC ! Type of aggregation DEC SYMDEC GLB MULT ! Type of multilevel correction: ADD MULT