From 9e501c46e12102bd8a9c209de62485ada6ce3d6d Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 24 Jun 2009 11:58:55 +0000 Subject: [PATCH] tests/fileread/runs/cfs.inp tests/fileread/runs/dfs.inp tests/fileread/runs/sfs.inp tests/fileread/runs/zfs.inp tests/pdegen/runs/ppde.inp mld2p4: Fixed strings in input files. --- tests/fileread/runs/cfs.inp | 4 ++-- tests/fileread/runs/dfs.inp | 16 ++++++++-------- tests/fileread/runs/sfs.inp | 4 ++-- tests/fileread/runs/zfs.inp | 4 ++-- tests/pdegen/runs/ppde.inp | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/fileread/runs/cfs.inp b/tests/fileread/runs/cfs.inp index fcac830d..5f5f8de7 100644 --- a/tests/fileread/runs/cfs.inp +++ b/tests/fileread/runs/cfs.inp @@ -18,10 +18,10 @@ 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) 3 ! Number of levels in a multilevel preconditioner -SMOOTH ! Type of aggregation: SMOOTH RAW +SMOOTHED ! Type of aggregation: SMOOTHED NONSMOOTHED MINENERGY DEC ! Type of aggregation: DEC MULT ! Type of multilevel correction: ADD MULT -POST ! Side of multiplicative correction PRE POST BOTH (ignored for ADD) +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 ILU ! Coarsest-level subsolver: ILU UMF SLU SLUDIST diff --git a/tests/fileread/runs/dfs.inp b/tests/fileread/runs/dfs.inp index 53ffd983..7325e9f1 100644 --- a/tests/fileread/runs/dfs.inp +++ b/tests/fileread/runs/dfs.inp @@ -1,6 +1,6 @@ -fidap011.rua !young1r.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or +young1r.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or NONE ! rhs | http://www.cise.ufl.edu/research/sparse/matrices/index.html -HB ! File format: MM (Matrix Market) HB (Harwell-Boeing). +MM ! File format: MM (Matrix Market) HB (Harwell-Boeing). 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) @@ -9,22 +9,22 @@ CSR ! Storage format: CSR COO JAD 02 ! ITRACE 30 ! IRST (restart for RGMRES and BiCGSTABL) 1.d-6 ! EPS -2L-M-RAS-U-D4 ! Longer descriptive name for preconditioner (up to 20 chars) +3L-M-RAS-I-D4 ! Longer descriptive name for preconditioner (up to 20 chars) AS ! Preconditioner type: NONE DIAG BJAC AS ML 1 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG -UMF ! AS subdomain solver: ILU MILU ILUT UMF SLU +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) -2 ! Number of levels in a multilevel preconditioner -SMOOTH ! Type of aggregation: SMOOTH RAW +3 ! Number of levels in a multilevel preconditioner +MINENERGY ! Type of aggregation: SMOOTHED NONSMOOTHED MINENERGY DEC ! Type of aggregation: DEC MULT ! Type of multilevel correction: ADD MULT -POST ! Side of multiplicative correction PRE POST BOTH (ignored for ADD) +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 +ILU ! Coarsest-level subsolver: ILU UMF SLU SLUDIST 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/fileread/runs/sfs.inp b/tests/fileread/runs/sfs.inp index a4e84739..6fb1ff51 100644 --- a/tests/fileread/runs/sfs.inp +++ b/tests/fileread/runs/sfs.inp @@ -18,10 +18,10 @@ 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) 3 ! Number of levels in a multilevel preconditioner -SMOOTH ! Type of aggregation: SMOOTH RAW +SMOOTHED ! Type of aggregation: SMOOTHED NONSMOOTHED MINENERGY DEC ! Type of aggregation: DEC MULT ! Type of multilevel correction: ADD MULT -POST ! Side of multiplicative correction PRE POST BOTH (ignored for ADD) +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 ILU ! Coarsest-level subsolver: ILU UMF SLU SLUDIST diff --git a/tests/fileread/runs/zfs.inp b/tests/fileread/runs/zfs.inp index 5aa8ddb4..44d6466e 100644 --- a/tests/fileread/runs/zfs.inp +++ b/tests/fileread/runs/zfs.inp @@ -18,10 +18,10 @@ 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) 3 ! Number of levels in a multilevel preconditioner -SMOOTH ! Type of aggregation: SMOOTH RAW +SMOOTHED ! Type of aggregation: SMOOTHED NONSMOOTHED MINENERGY DEC ! Type of aggregation: DEC MULT ! Type of multilevel correction: ADD MULT -POST ! Side of multiplicative correction PRE POST BOTH (ignored for ADD) +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 diff --git a/tests/pdegen/runs/ppde.inp b/tests/pdegen/runs/ppde.inp index a08c9129..3b793714 100644 --- a/tests/pdegen/runs/ppde.inp +++ b/tests/pdegen/runs/ppde.inp @@ -1,8 +1,8 @@ BICGSTAB ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG CSR ! Storage format CSR COO JAD -90 ! IDIM; domain size is idim**3 +50 ! IDIM; domain size is idim**3 2 ! ISTOPC -00800 ! ITMAX +00100 ! ITMAX 01 ! ITRACE 30 ! IRST (restart for RGMRES and BiCGSTABL) 1.d-6 ! EPS @@ -14,11 +14,11 @@ NONE ! Prolongation operator NONE SUM AVG ILU ! Subdomain solver ILU MILU ILUT UMF SLU 0 ! Level-set N for ILU(N) 1.d-4 ! Threshold T for ILU(T,P) -4 ! Number of levels in a multilevel preconditioner -SMOOTH ! Kind of aggregation: RAW, SMOOTH +3 ! Number of levels in a multilevel preconditioner +MINENERGY ! Kind of aggregation: SMOOTHED, NONSMOOTHED, MINENERGY DEC ! Type of aggregation DEC SYMDEC GLB MULT ! Type of multilevel correction: ADD MULT -POST ! Side of multiplicative correction PRE POST BOTH (ignored for ADD) +POST ! Side of multiplicative correction PRE POST TWOSIDE (ignored for ADD) DIST ! Coarse level: matrix distribution DIST REPL BJAC ! Coarse level: solver BJAC UMF SLU SLUDIST ILU ! Coarse level: subsolver ILU UMF SLU SLUDIST