From 6227d50e8f1d6d50ecba03410a6479be5f7f0a50 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 25 Jul 2017 12:01:13 +0100 Subject: [PATCH] Changed comments in input files. --- tests/fileread/runs/cfs.inp | 21 +++++++++------------ tests/fileread/runs/sfs.inp | 27 ++++++++++++--------------- tests/fileread/runs/zfs.inp | 27 ++++++++++++--------------- 3 files changed, 33 insertions(+), 42 deletions(-) diff --git a/tests/fileread/runs/cfs.inp b/tests/fileread/runs/cfs.inp index aa2b1515..3f98663e 100644 --- a/tests/fileread/runs/cfs.inp +++ b/tests/fileread/runs/cfs.inp @@ -5,15 +5,15 @@ NONE ! Reference solution MM ! File format: MatrixMarket or Harwell-Boeing CSR ! Storage format: CSR COO JAD BLOCK ! PART (partition method): BLOCK GRAPH -FCG ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG +CG ! Iterative method: BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES 2 ! ISTOPC 00500 ! ITMAX 1 ! ITRACE 30 ! IRST (restart for RGMRES and BiCGSTABL) 1.d-6 ! EPS -ML-VCYCLE-FBGS-SLU ! Longer descriptive name for preconditioner (up to 20 chars) +ML-VCYCLE-FBGS-R-UMF ! Longer descriptive name for preconditioner (up to 20 chars) ML ! Preconditioner type: NONE JACOBI BJAC AS ML -VCYCLE ! Type of multilevel correction: ADD MULT +VCYCLE ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MULT ADD 1 ! Number of outer sweeps -3 ! Max Number of levels in a multilevel preconditioner; if <0, lib default -3 ! Target coarse matrix size; if <0, lib default @@ -25,15 +25,12 @@ NOFILTER ! Filtering of matrix ? FILTER NOFILTER 2 ! Number of thresholds in vector, next line ignored if <= 0 0.05 0.025 ! Thresholds 0.0100d0 ! Smoothed aggregation threshold: >= 0.0 -EIG_EST ! Omega algorithm: EIG_EST USER_CHOICE -A_NORMI ! Estimate procedure if EIG_EST -1.0 ! Estimate value (if USER_CHOICE) -FBGS ! Smoother type JACOBI BJAC AS ignored for non-ML +FBGS ! Smoother type JACOBI GS BGS BJAC AS; ignored for non-ML 1 ! Number of sweeps for (pre) smoother 0 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG -DSCALE ! Subdomain solver: DSCALE ILU MILU ILUT UMF SLU MUMPS +JACOBI ! Subdomain solver: JACOBI BS BGS ILU ILUT MILU MUMPS SLU UMF 0 ! Fill level P for ILU(P) and ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P) NONE ! Second (post) smoother, ignored if NONE @@ -41,12 +38,12 @@ NONE ! Second (post) smoother, ignored if NONE 0 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG -DSCALE ! Subdomain solver: DSCALE ILU MILU ILUT UMF SLU MUMPS +JACOBI ! Subdomain solver: JACOBI BS BGS ILU ILUT MILU MUMPS SLU UMF 0 ! Fill level P for ILU(P) and ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P) -SLU ! Coarsest-level solver: JACOBI BJAC UMF SLU SLUDIST MUMPS +UMF ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC REPL ! Coarsest-level matrix distribution: DIST REPL -SLU ! Coarsest-level subsolver: ILU UMF SLU MUMPS SLUDIST +UMF ! Coarsest-level subsolver: ILU UMF SLU MUMPS SLUDIST 1 ! Coarsest-level fillin P for ILU(P) and ILU(T,P) 1.d-4 ! Coarsest-level threshold T for ILU(T,P) -1 ! Number of Jacobi sweeps for BJAC/PJAC coarsest-level solver +1 ! Number of Jacobi sweeps for JACOBI/GS/BJAC coarsest-level solver diff --git a/tests/fileread/runs/sfs.inp b/tests/fileread/runs/sfs.inp index 035d2607..bb1bb32f 100644 --- a/tests/fileread/runs/sfs.inp +++ b/tests/fileread/runs/sfs.inp @@ -1,19 +1,19 @@ -A1M-hetero3D.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or -B1M-hetero3D.mtx ! rhs | http://www.cise.ufl.edu/research/sparse/matrices/index.html +mld_mat.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or +mld_rhs.mtx ! rhs | http://www.cise.ufl.edu/research/sparse/matrices/index.html NONE ! Initial guess -NONE ! Reference solution +mld_sol.mtx ! Reference solution MM ! File format: MatrixMarket or Harwell-Boeing CSR ! Storage format: CSR COO JAD BLOCK ! PART (partition method): BLOCK GRAPH -FCG ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG +CG ! Iterative method: BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES 2 ! ISTOPC 00500 ! ITMAX 1 ! ITRACE 30 ! IRST (restart for RGMRES and BiCGSTABL) 1.d-6 ! EPS -ML-VCYCLE-FBGS-SLU ! Longer descriptive name for preconditioner (up to 20 chars) +ML-VCYCLE-FBGS-R-UMF ! Longer descriptive name for preconditioner (up to 20 chars) ML ! Preconditioner type: NONE JACOBI BJAC AS ML -VCYCLE ! Type of multilevel correction: ADD MULT +VCYCLE ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MULT ADD 1 ! Number of outer sweeps -3 ! Max Number of levels in a multilevel preconditioner; if <0, lib default -3 ! Target coarse matrix size; if <0, lib default @@ -25,15 +25,12 @@ NOFILTER ! Filtering of matrix ? FILTER NOFILTER 2 ! Number of thresholds in vector, next line ignored if <= 0 0.05 0.025 ! Thresholds 0.0100d0 ! Smoothed aggregation threshold: >= 0.0 -EIG_EST ! Omega algorithm: EIG_EST USER_CHOICE -A_NORMI ! Estimate procedure if EIG_EST -1.0 ! Estimate value (if USER_CHOICE) -FBGS ! Smoother type JACOBI BJAC AS ignored for non-ML +FBGS ! Smoother type JACOBI GS BGS BJAC AS; ignored for non-ML 1 ! Number of sweeps for (pre) smoother 0 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG -DSCALE ! Subdomain solver: DSCALE ILU MILU ILUT UMF SLU MUMPS +JACOBI ! Subdomain solver: JACOBI BS BGS ILU ILUT MILU MUMPS SLU UMF 0 ! Fill level P for ILU(P) and ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P) NONE ! Second (post) smoother, ignored if NONE @@ -41,12 +38,12 @@ NONE ! Second (post) smoother, ignored if NONE 0 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG -DSCALE ! Subdomain solver: DSCALE ILU MILU ILUT UMF SLU MUMPS +JACOBI ! Subdomain solver: JACOBI BS BGS ILU ILUT MILU MUMPS SLU UMF 0 ! Fill level P for ILU(P) and ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P) -SLU ! Coarsest-level solver: JACOBI BJAC UMF SLU SLUDIST MUMPS +UMF ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC REPL ! Coarsest-level matrix distribution: DIST REPL -SLU ! Coarsest-level subsolver: ILU UMF SLU MUMPS SLUDIST +UMF ! Coarsest-level subsolver: ILU UMF SLU MUMPS SLUDIST 1 ! Coarsest-level fillin P for ILU(P) and ILU(T,P) 1.d-4 ! Coarsest-level threshold T for ILU(T,P) -1 ! Number of Jacobi sweeps for BJAC/PJAC coarsest-level solver +1 ! Number of Jacobi sweeps for JACOBI/GS/BJAC coarsest-level solver diff --git a/tests/fileread/runs/zfs.inp b/tests/fileread/runs/zfs.inp index 01326fe5..3f98663e 100644 --- a/tests/fileread/runs/zfs.inp +++ b/tests/fileread/runs/zfs.inp @@ -1,19 +1,19 @@ -A1M-hetero3D.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or -B1M-hetero3D.mtx ! rhs | http://www.cise.ufl.edu/research/sparse/matrices/index.html +/opt/matrici/qc2534.mtx ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or +NONE ! rhs | http://www.cise.ufl.edu/research/sparse/matrices/index.html NONE ! Initial guess NONE ! Reference solution MM ! File format: MatrixMarket or Harwell-Boeing CSR ! Storage format: CSR COO JAD BLOCK ! PART (partition method): BLOCK GRAPH -FCG ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG +CG ! Iterative method: BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES 2 ! ISTOPC 00500 ! ITMAX 1 ! ITRACE 30 ! IRST (restart for RGMRES and BiCGSTABL) 1.d-6 ! EPS -ML-VCYCLE-FBGS-SLUD ! Longer descriptive name for preconditioner (up to 20 chars) +ML-VCYCLE-FBGS-R-UMF ! Longer descriptive name for preconditioner (up to 20 chars) ML ! Preconditioner type: NONE JACOBI BJAC AS ML -VCYCLE ! Type of multilevel correction: ADD MULT +VCYCLE ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MULT ADD 1 ! Number of outer sweeps -3 ! Max Number of levels in a multilevel preconditioner; if <0, lib default -3 ! Target coarse matrix size; if <0, lib default @@ -25,15 +25,12 @@ NOFILTER ! Filtering of matrix ? FILTER NOFILTER 2 ! Number of thresholds in vector, next line ignored if <= 0 0.05 0.025 ! Thresholds 0.0100d0 ! Smoothed aggregation threshold: >= 0.0 -EIG_EST ! Omega algorithm: EIG_EST USER_CHOICE -A_NORMI ! Estimate procedure if EIG_EST -1.0 ! Estimate value (if USER_CHOICE) -FBGS ! Smoother type JACOBI BJAC AS ignored for non-ML +FBGS ! Smoother type JACOBI GS BGS BJAC AS; ignored for non-ML 1 ! Number of sweeps for (pre) smoother 0 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG -DSCALE ! Subdomain solver: DSCALE ILU MILU ILUT UMF SLU MUMPS +JACOBI ! Subdomain solver: JACOBI BS BGS ILU ILUT MILU MUMPS SLU UMF 0 ! Fill level P for ILU(P) and ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P) NONE ! Second (post) smoother, ignored if NONE @@ -41,12 +38,12 @@ NONE ! Second (post) smoother, ignored if NONE 0 ! Number of overlap layers for AS preconditioner HALO ! AS restriction operator: NONE HALO NONE ! AS prolongation operator: NONE SUM AVG -DSCALE ! Subdomain solver: DSCALE ILU MILU ILUT UMF SLU MUMPS +JACOBI ! Subdomain solver: JACOBI BS BGS ILU ILUT MILU MUMPS SLU UMF 0 ! Fill level P for ILU(P) and ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P) -SLUDIST ! Coarsest-level solver: JACOBI BJAC UMF SLU SLUDIST MUMPS -DIST ! Coarsest-level matrix distribution: DIST REPL -SLUDIST ! Coarsest-level subsolver: ILU UMF SLU MUMPS SLUDIST +UMF ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC +REPL ! Coarsest-level matrix distribution: DIST REPL +UMF ! Coarsest-level subsolver: ILU UMF SLU MUMPS SLUDIST 1 ! Coarsest-level fillin P for ILU(P) and ILU(T,P) 1.d-4 ! Coarsest-level threshold T for ILU(T,P) -1 ! Number of Jacobi sweeps for BJAC/PJAC coarsest-level solver +1 ! Number of Jacobi sweeps for JACOBI/GS/BJAC coarsest-level solver