diff --git a/test/fileread/df_sample.f90 b/test/fileread/df_sample.f90 index 4f3e975b..af7b43b6 100644 --- a/test/fileread/df_sample.f90 +++ b/test/fileread/df_sample.f90 @@ -52,24 +52,24 @@ program df_sample character(len=20) :: descr ! verbose description of the prec character(len=10) :: prec ! overall prectype integer :: novr ! number of overlap layers - character(len=16) :: restr ! restriction over application of as - character(len=16) :: prol ! prolongation over application of as - character(len=16) :: solve ! Factorization type: ILU, SuperLU, UMFPACK. - integer :: fill1 ! Fill-in for factorization 1 - real(psb_dpk_) :: thr1 ! Threshold for fact. 1 ILU(T) - integer :: nlev ! Number of levels in multilevel prec. - character(len=16) :: aggrkind ! smoothed/raw aggregatin - character(len=16) :: aggr_alg ! local or global aggregation - character(len=16) :: mltype ! additive or multiplicative 2nd level prec + character(len=16) :: restr ! restriction over application of AS + character(len=16) :: prol ! prolongation over application of AS + character(len=16) :: solve ! factorization type: ILU, SuperLU, UMFPACK + integer :: fill ! fillin for factorization + real(psb_dpk_) :: thr ! threshold for fact. ILU(T) + integer :: nlev ! number of levels in multilevel prec. + character(len=16) :: aggrkind ! smoothed, raw aggregation + character(len=16) :: aggr_alg ! aggregation algorithm (currently only decoupled) + character(len=16) :: mltype ! additive or multiplicative multi-level prec character(len=16) :: smthpos ! side: pre, post, both smoothing - character(len=16) :: cmat ! coarse mat - character(len=16) :: csolve ! Coarse solver: bjac, umf, slu, sludist - character(len=16) :: csbsolve ! Coarse subsolver: ILU, ILU(T), SuperLU, UMFPACK. - integer :: cfill ! Fill-in for factorization 1 - real(psb_dpk_) :: cthres ! Threshold for fact. 1 ILU(T) - integer :: cjswp ! Jacobi sweeps - real(psb_dpk_) :: omega ! smoother omega - real(psb_dpk_) :: athres ! smoother aggregation threshold + character(len=16) :: cmat ! coarse mat: distributed, replicated + character(len=16) :: csolve ! coarse solver: bjac, umf, slu, sludist + character(len=16) :: csbsolve ! coarse subsolver: ILU, ILU(T), SuperLU, UMFPACK + integer :: cfill ! fillin for coarse factorization + real(psb_dpk_) :: cthres ! threshold for coarse fact. ILU(T) + integer :: cjswp ! block-Jacobi sweeps + real(psb_dpk_) :: omega ! damping parameter omega + real(psb_dpk_) :: athres ! smoothed aggregation threshold end type precdata type(precdata) :: prec_choice @@ -253,8 +253,8 @@ program df_sample call mld_precset(prec,mld_sub_restr_, prec_choice%restr,info) call mld_precset(prec,mld_sub_prol_, prec_choice%prol, info) call mld_precset(prec,mld_sub_solve_, prec_choice%solve,info) - call mld_precset(prec,mld_sub_fillin_,prec_choice%fill1,info) - call mld_precset(prec,mld_sub_iluthrs_, prec_choice%thr1, info) + call mld_precset(prec,mld_sub_fillin_,prec_choice%fill,info) + call mld_precset(prec,mld_sub_iluthrs_, prec_choice%thr, info) if (psb_toupper(prec_choice%prec) =='ML') then call mld_precset(prec,mld_aggr_kind_, prec_choice%aggrkind,info) call mld_precset(prec,mld_aggr_alg_, prec_choice%aggr_alg,info) @@ -378,7 +378,7 @@ contains character(len=*) :: kmethd, mtrx, rhs, afmt,filefmt type(precdata) :: prec integer :: iret, istopc,itmax,itrace, ipart, irst - real(psb_dpk_) :: eps, omega,thr1,thr2 + real(psb_dpk_) :: eps, omega,thr integer :: iam, nm, np, i call psb_info(icontxt,iam,np) @@ -402,8 +402,8 @@ contains call read_data(prec%restr,5) ! restriction over application of as call read_data(prec%prol,5) ! prolongation over application of as call read_data(prec%solve,5) ! Factorization type: ILU, SuperLU, UMFPACK. - call read_data(prec%fill1,5) ! Fill-in for factorization 1 - call read_data(prec%thr1,5) ! Threshold for fact. 1 ILU(T) + call read_data(prec%fill,5) ! Fill-in for factorization + call read_data(prec%thr,5) ! Threshold for fact. ILU(T) if (psb_toupper(prec%prec) == 'ML') then call read_data(prec%nlev,5) ! Number of levels in multilevel prec. call read_data(prec%aggrkind,5) ! smoothed/raw aggregatin @@ -413,8 +413,8 @@ contains call read_data(prec%cmat,5) ! coarse mat call read_data(prec%csolve,5) ! Factorization type: ILU, SuperLU, UMFPACK. call read_data(prec%csbsolve,5) ! Factorization type: ILU, SuperLU, UMFPACK. - call read_data(prec%cfill,5) ! Fill-in for factorization 1 - call read_data(prec%cthres,5) ! Threshold for fact. 1 ILU(T) + call read_data(prec%cfill,5) ! Fill-in for factorization + call read_data(prec%cthres,5) ! Threshold for fact. ILU(T) call read_data(prec%cjswp,5) ! Jacobi sweeps call read_data(prec%omega,5) ! smoother omega call read_data(prec%athres,5) ! smoother aggr thresh @@ -439,8 +439,8 @@ contains call psb_bcast(icontxt,prec%restr) ! restriction over application of as call psb_bcast(icontxt,prec%prol) ! prolongation over application of as call psb_bcast(icontxt,prec%solve) ! Factorization type: ILU, SuperLU, UMFPACK. - call psb_bcast(icontxt,prec%fill1) ! Fill-in for factorization 1 - call psb_bcast(icontxt,prec%thr1) ! Threshold for fact. 1 ILU(T) + call psb_bcast(icontxt,prec%fill) ! Fill-in for factorization + call psb_bcast(icontxt,prec%thr) ! Threshold for fact. ILU(T) if (psb_toupper(prec%prec) == 'ML') then call psb_bcast(icontxt,prec%nlev) ! Number of levels in multilevel prec. call psb_bcast(icontxt,prec%aggrkind) ! smoothed/raw aggregatin @@ -450,11 +450,11 @@ contains call psb_bcast(icontxt,prec%cmat) ! coarse mat call psb_bcast(icontxt,prec%csolve) ! Factorization type: ILU, SuperLU, UMFPACK. call psb_bcast(icontxt,prec%csbsolve) ! Factorization type: ILU, SuperLU, UMFPACK. - call psb_bcast(icontxt,prec%cfill) ! Fill-in for factorization 1 - call psb_bcast(icontxt,prec%cthres) ! Threshold for fact. 1 ILU(T) + call psb_bcast(icontxt,prec%cfill) ! Fill-in for factorization + call psb_bcast(icontxt,prec%cthres) ! Threshold for fact. ILU(T) call psb_bcast(icontxt,prec%cjswp) ! Jacobi sweeps call psb_bcast(icontxt,prec%omega) ! smoother omega - call psb_bcast(icontxt,prec%athres) ! smoother aggr thresh + call psb_bcast(icontxt,prec%athres) ! smoother aggr thresh end if end subroutine get_parms diff --git a/test/fileread/runs/cfs.inp b/test/fileread/runs/cfs.inp index 09bcc374..4bab85e9 100644 --- a/test/fileread/runs/cfs.inp +++ b/test/fileread/runs/cfs.inp @@ -1,32 +1,32 @@ -qc2534.mtx ! This (and others) from: http://math.nist.gov/MatrixMarket/ or -NONE ! http://www.cise.ufl.edu/research/sparse/matrices/index.html -MM ! File format: MM: Matrix Market HB: Harwell-Boeing. +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 +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: BLK 2: graph (with Metis) +CSR ! Storage format: CSR COO JAD +0 ! IPART (partition method): 0 (block) 2 (graph, with Metis) 2 ! ISTOPC 01000 ! ITMAX -1 ! ITRACE -30 ! IRST (restart for RGMRES and BiCGSTABL) +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 NONE DIAG BJAC AS ML -0 ! Number of overlap layers for AS preconditioner at finest level -HALO ! Restriction operator NONE HALO -NONE ! Prolongation operator NONE SUM AVG -ILU ! Subdomain solver ILU MILU ILUT UMF SLU -1 ! Level-set N for ILU(N) +ML ! Preconditioner type: NONE DIAG 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) 3 ! Number of levels in a multilevel preconditioner -SMOOTH ! Kind of aggregation: RAW, SMOOTH -DEC ! Type of aggregation DEC SYMDEC GLB +SMOOTH ! Type of aggregation: SMOOTH RAW +DEC ! Type of aggregation: DEC MULT ! Type of multilevel correction: ADD MULT POST ! Side of multiplicative correction PRE POST BOTH (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 -0 ! Coarse level: Level-set N for ILU(N) -1.d-4 ! Coarse level: Threshold T for ILU(T,P) -4 ! Coarse level: Number of Jacobi sweeps --1.0d0 ! Smoother Omega: if < 0 means library choice. -0.01d0 ! Smoother Aggregation Threshold: >= 0.0 \ No newline at end of file +DIST ! Coarsest-level matrix distribution: DIST REPL +BJAC ! Coarsest-level solver: BJAC 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 +-1.0d0 ! Damping parameter omega: if < 0 means library choice +0.10d0 ! Smoothed aggregation threshold: >= 0.0 diff --git a/test/fileread/runs/dfs.inp b/test/fileread/runs/dfs.inp index 347bdc6c..7b4745ce 100644 --- a/test/fileread/runs/dfs.inp +++ b/test/fileread/runs/dfs.inp @@ -1,32 +1,32 @@ -young1r.mtx ! This (and others) from: http://math.nist.gov/MatrixMarket/ or -NONE ! http://www.cise.ufl.edu/research/sparse/matrices/index.html -MM ! File format: MM: Matrix Market HB: Harwell-Boeing. +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 +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: BLK 2: graph (with Metis) +CSR ! Storage format: CSR COO JAD +0 ! IPART (partition method): 0 (block) 2 (graph, with Metis) 2 ! ISTOPC 01000 ! ITMAX -1 ! ITRACE -30 ! IRST (restart for RGMRES and BiCGSTABL) +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 NONE DIAG BJAC AS ML -0 ! Number of overlap layers for AS preconditioner at finest level -HALO ! Restriction operator NONE HALO -NONE ! Prolongation operator NONE SUM AVG -ILU ! Subdomain solver ILU MILU ILUT UMF SLU -1 ! Level-set N for ILU(N) +ML ! Preconditioner type: NONE DIAG 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) 3 ! Number of levels in a multilevel preconditioner -SMOOTH ! Kind of aggregation: RAW, SMOOTH -DEC ! Type of aggregation DEC SYMDEC GLB +SMOOTH ! Type of aggregation: SMOOTH RAW +DEC ! Type of aggregation: DEC MULT ! Type of multilevel correction: ADD MULT POST ! Side of multiplicative correction PRE POST BOTH (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 -0 ! Coarse level: Level-set N for ILU(N) -1.d-4 ! Coarse level: Threshold T for ILU(T,P) -4 ! Coarse level: Number of Jacobi sweeps --1.0d0 ! Smoother Omega: if < 0 means library choice. -0.10d0 ! Smoother Aggregation Threshold: >= 0.0 +DIST ! Coarsest-level matrix distribution: DIST REPL +BJAC ! Coarsest-level solver: BJAC 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 +-1.0d0 ! Damping parameter omega: if < 0 means library choice +0.10d0 ! Smoothed aggregation threshold: >= 0.0 diff --git a/test/fileread/runs/sfs.inp b/test/fileread/runs/sfs.inp index 347bdc6c..7b4745ce 100644 --- a/test/fileread/runs/sfs.inp +++ b/test/fileread/runs/sfs.inp @@ -1,32 +1,32 @@ -young1r.mtx ! This (and others) from: http://math.nist.gov/MatrixMarket/ or -NONE ! http://www.cise.ufl.edu/research/sparse/matrices/index.html -MM ! File format: MM: Matrix Market HB: Harwell-Boeing. +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 +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: BLK 2: graph (with Metis) +CSR ! Storage format: CSR COO JAD +0 ! IPART (partition method): 0 (block) 2 (graph, with Metis) 2 ! ISTOPC 01000 ! ITMAX -1 ! ITRACE -30 ! IRST (restart for RGMRES and BiCGSTABL) +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 NONE DIAG BJAC AS ML -0 ! Number of overlap layers for AS preconditioner at finest level -HALO ! Restriction operator NONE HALO -NONE ! Prolongation operator NONE SUM AVG -ILU ! Subdomain solver ILU MILU ILUT UMF SLU -1 ! Level-set N for ILU(N) +ML ! Preconditioner type: NONE DIAG 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) 3 ! Number of levels in a multilevel preconditioner -SMOOTH ! Kind of aggregation: RAW, SMOOTH -DEC ! Type of aggregation DEC SYMDEC GLB +SMOOTH ! Type of aggregation: SMOOTH RAW +DEC ! Type of aggregation: DEC MULT ! Type of multilevel correction: ADD MULT POST ! Side of multiplicative correction PRE POST BOTH (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 -0 ! Coarse level: Level-set N for ILU(N) -1.d-4 ! Coarse level: Threshold T for ILU(T,P) -4 ! Coarse level: Number of Jacobi sweeps --1.0d0 ! Smoother Omega: if < 0 means library choice. -0.10d0 ! Smoother Aggregation Threshold: >= 0.0 +DIST ! Coarsest-level matrix distribution: DIST REPL +BJAC ! Coarsest-level solver: BJAC 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 +-1.0d0 ! Damping parameter omega: if < 0 means library choice +0.10d0 ! Smoothed aggregation threshold: >= 0.0 diff --git a/test/fileread/runs/zfs.inp b/test/fileread/runs/zfs.inp index 09bcc374..4bab85e9 100644 --- a/test/fileread/runs/zfs.inp +++ b/test/fileread/runs/zfs.inp @@ -1,32 +1,32 @@ -qc2534.mtx ! This (and others) from: http://math.nist.gov/MatrixMarket/ or -NONE ! http://www.cise.ufl.edu/research/sparse/matrices/index.html -MM ! File format: MM: Matrix Market HB: Harwell-Boeing. +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 +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: BLK 2: graph (with Metis) +CSR ! Storage format: CSR COO JAD +0 ! IPART (partition method): 0 (block) 2 (graph, with Metis) 2 ! ISTOPC 01000 ! ITMAX -1 ! ITRACE -30 ! IRST (restart for RGMRES and BiCGSTABL) +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 NONE DIAG BJAC AS ML -0 ! Number of overlap layers for AS preconditioner at finest level -HALO ! Restriction operator NONE HALO -NONE ! Prolongation operator NONE SUM AVG -ILU ! Subdomain solver ILU MILU ILUT UMF SLU -1 ! Level-set N for ILU(N) +ML ! Preconditioner type: NONE DIAG 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) 3 ! Number of levels in a multilevel preconditioner -SMOOTH ! Kind of aggregation: RAW, SMOOTH -DEC ! Type of aggregation DEC SYMDEC GLB +SMOOTH ! Type of aggregation: SMOOTH RAW +DEC ! Type of aggregation: DEC MULT ! Type of multilevel correction: ADD MULT POST ! Side of multiplicative correction PRE POST BOTH (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 -0 ! Coarse level: Level-set N for ILU(N) -1.d-4 ! Coarse level: Threshold T for ILU(T,P) -4 ! Coarse level: Number of Jacobi sweeps --1.0d0 ! Smoother Omega: if < 0 means library choice. -0.01d0 ! Smoother Aggregation Threshold: >= 0.0 \ No newline at end of file +DIST ! Coarsest-level matrix distribution: DIST REPL +BJAC ! Coarsest-level solver: BJAC 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 +-1.0d0 ! Damping parameter omega: if < 0 means library choice +0.10d0 ! Smoothed aggregation threshold: >= 0.0