From f493b7064e80bf0befcd1c1cf2e5b5df46e9a6aa Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 24 Oct 2017 08:34:13 +0100 Subject: [PATCH] Take out DEFLT from sample programs. --- tests/fileread/mld_cf_sample.f90 | 17 +++++++---------- tests/fileread/mld_df_sample.f90 | 17 +++++++---------- tests/fileread/mld_sf_sample.f90 | 17 +++++++---------- tests/fileread/mld_zf_sample.f90 | 17 +++++++---------- tests/fileread/runs/mld_cfs.inp | 6 +++--- tests/fileread/runs/mld_dfs.inp | 4 ++-- tests/fileread/runs/mld_sfs.inp | 6 +++--- tests/fileread/runs/mld_zfs.inp | 4 ++-- tests/pdegen/mld_d_pde2d.f90 | 17 +++++++---------- tests/pdegen/mld_d_pde3d.f90 | 17 +++++++---------- tests/pdegen/mld_s_pde2d.f90 | 17 +++++++---------- tests/pdegen/mld_s_pde3d.f90 | 17 +++++++---------- tests/pdegen/runs/mld_pde2d.inp | 4 ++-- tests/pdegen/runs/mld_pde3d.inp | 4 ++-- 14 files changed, 70 insertions(+), 94 deletions(-) diff --git a/tests/fileread/mld_cf_sample.f90 b/tests/fileread/mld_cf_sample.f90 index d0c7cbc2..904d6494 100644 --- a/tests/fileread/mld_cf_sample.f90 +++ b/tests/fileread/mld_cf_sample.f90 @@ -441,16 +441,13 @@ program mld_cf_sample end select end if - if (psb_toupper(p_choice%csolve) /= 'DEFLT') then - call prec%set('coarse_solve', p_choice%csolve, info) - if (psb_toupper(p_choice%csolve) == 'BJAC') & - & call prec%set('coarse_subsolve', p_choice%csbsolve, info) - if (psb_toupper(p_choice%cmat) /= 'DEFLT')& - & call prec%set('coarse_mat', p_choice%cmat, info) - call prec%set('coarse_fillin', p_choice%cfill, info) - call prec%set('coarse_iluthrs', p_choice%cthres, info) - call prec%set('coarse_sweeps', p_choice%cjswp, info) - end if + call prec%set('coarse_solve', p_choice%csolve, info) + if (psb_toupper(p_choice%csolve) == 'BJAC') & + & call prec%set('coarse_subsolve', p_choice%csbsolve, info) + call prec%set('coarse_mat', p_choice%cmat, info) + call prec%set('coarse_fillin', p_choice%cfill, info) + call prec%set('coarse_iluthrs', p_choice%cthres, info) + call prec%set('coarse_sweeps', p_choice%cjswp, info) end select diff --git a/tests/fileread/mld_df_sample.f90 b/tests/fileread/mld_df_sample.f90 index 2472317a..1779726a 100644 --- a/tests/fileread/mld_df_sample.f90 +++ b/tests/fileread/mld_df_sample.f90 @@ -441,16 +441,13 @@ program mld_df_sample end select end if - if (psb_toupper(p_choice%csolve) /= 'DEFLT') then - call prec%set('coarse_solve', p_choice%csolve, info) - if (psb_toupper(p_choice%csolve) == 'BJAC') & - & call prec%set('coarse_subsolve', p_choice%csbsolve, info) - if (psb_toupper(p_choice%cmat) /= 'DEFLT')& - & call prec%set('coarse_mat', p_choice%cmat, info) - call prec%set('coarse_fillin', p_choice%cfill, info) - call prec%set('coarse_iluthrs', p_choice%cthres, info) - call prec%set('coarse_sweeps', p_choice%cjswp, info) - end if + call prec%set('coarse_solve', p_choice%csolve, info) + if (psb_toupper(p_choice%csolve) == 'BJAC') & + & call prec%set('coarse_subsolve', p_choice%csbsolve, info) + call prec%set('coarse_mat', p_choice%cmat, info) + call prec%set('coarse_fillin', p_choice%cfill, info) + call prec%set('coarse_iluthrs', p_choice%cthres, info) + call prec%set('coarse_sweeps', p_choice%cjswp, info) end select diff --git a/tests/fileread/mld_sf_sample.f90 b/tests/fileread/mld_sf_sample.f90 index c9e631fb..8e6ec8db 100644 --- a/tests/fileread/mld_sf_sample.f90 +++ b/tests/fileread/mld_sf_sample.f90 @@ -441,16 +441,13 @@ program mld_sf_sample end select end if - if (psb_toupper(p_choice%csolve) /= 'DEFLT') then - call prec%set('coarse_solve', p_choice%csolve, info) - if (psb_toupper(p_choice%csolve) == 'BJAC') & - & call prec%set('coarse_subsolve', p_choice%csbsolve, info) - if (psb_toupper(p_choice%cmat) /= 'DEFLT')& - & call prec%set('coarse_mat', p_choice%cmat, info) - call prec%set('coarse_fillin', p_choice%cfill, info) - call prec%set('coarse_iluthrs', p_choice%cthres, info) - call prec%set('coarse_sweeps', p_choice%cjswp, info) - end if + call prec%set('coarse_solve', p_choice%csolve, info) + if (psb_toupper(p_choice%csolve) == 'BJAC') & + & call prec%set('coarse_subsolve', p_choice%csbsolve, info) + call prec%set('coarse_mat', p_choice%cmat, info) + call prec%set('coarse_fillin', p_choice%cfill, info) + call prec%set('coarse_iluthrs', p_choice%cthres, info) + call prec%set('coarse_sweeps', p_choice%cjswp, info) end select diff --git a/tests/fileread/mld_zf_sample.f90 b/tests/fileread/mld_zf_sample.f90 index 811b18f1..b89052ab 100644 --- a/tests/fileread/mld_zf_sample.f90 +++ b/tests/fileread/mld_zf_sample.f90 @@ -441,16 +441,13 @@ program mld_zf_sample end select end if - if (psb_toupper(p_choice%csolve) /= 'DEFLT') then - call prec%set('coarse_solve', p_choice%csolve, info) - if (psb_toupper(p_choice%csolve) == 'BJAC') & - & call prec%set('coarse_subsolve', p_choice%csbsolve, info) - if (psb_toupper(p_choice%cmat) /= 'DEFLT')& - & call prec%set('coarse_mat', p_choice%cmat, info) - call prec%set('coarse_fillin', p_choice%cfill, info) - call prec%set('coarse_iluthrs', p_choice%cthres, info) - call prec%set('coarse_sweeps', p_choice%cjswp, info) - end if + call prec%set('coarse_solve', p_choice%csolve, info) + if (psb_toupper(p_choice%csolve) == 'BJAC') & + & call prec%set('coarse_subsolve', p_choice%csbsolve, info) + call prec%set('coarse_mat', p_choice%cmat, info) + call prec%set('coarse_fillin', p_choice%cfill, info) + call prec%set('coarse_iluthrs', p_choice%cthres, info) + call prec%set('coarse_sweeps', p_choice%cjswp, info) end select diff --git a/tests/fileread/runs/mld_cfs.inp b/tests/fileread/runs/mld_cfs.inp index 0e15e87a..195be4a4 100644 --- a/tests/fileread/runs/mld_cfs.inp +++ b/tests/fileread/runs/mld_cfs.inp @@ -47,9 +47,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER 0.05 0.025 ! Thresholds -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 %%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% -DEFLT ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC DEFLT -UMF ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU -DEFLT ! Coarsest-level matrix distribution: DIST REPL, DEFLT +SLU ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC +SLU ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU +REPL ! Coarsest-level matrix distribution: DIST REPL 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 sweeps for JACOBI/GS/BJAC coarsest-level solver diff --git a/tests/fileread/runs/mld_dfs.inp b/tests/fileread/runs/mld_dfs.inp index ba7f67e8..221dfecd 100644 --- a/tests/fileread/runs/mld_dfs.inp +++ b/tests/fileread/runs/mld_dfs.inp @@ -47,9 +47,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER 0.05 0.025 ! Thresholds -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 %%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% -DEFLT ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC DEFLT +UMF ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC UMF ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU -DEFLT ! Coarsest-level matrix distribution: DIST REPL, DEFLT +REPL ! Coarsest-level matrix distribution: DIST REPL 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 sweeps for JACOBI/GS/BJAC coarsest-level solver diff --git a/tests/fileread/runs/mld_sfs.inp b/tests/fileread/runs/mld_sfs.inp index ba7f67e8..d7388521 100644 --- a/tests/fileread/runs/mld_sfs.inp +++ b/tests/fileread/runs/mld_sfs.inp @@ -47,9 +47,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER 0.05 0.025 ! Thresholds -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 %%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% -DEFLT ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC DEFLT -UMF ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU -DEFLT ! Coarsest-level matrix distribution: DIST REPL, DEFLT +SLU ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC +SLU ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU +REPL ! Coarsest-level matrix distribution: DIST REPL 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 sweeps for JACOBI/GS/BJAC coarsest-level solver diff --git a/tests/fileread/runs/mld_zfs.inp b/tests/fileread/runs/mld_zfs.inp index 0e15e87a..d0c48861 100644 --- a/tests/fileread/runs/mld_zfs.inp +++ b/tests/fileread/runs/mld_zfs.inp @@ -47,9 +47,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER 0.05 0.025 ! Thresholds -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 %%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% -DEFLT ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC DEFLT +UMF ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC UMF ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU -DEFLT ! Coarsest-level matrix distribution: DIST REPL, DEFLT +REPL ! Coarsest-level matrix distribution: DIST REPL, 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 sweeps for JACOBI/GS/BJAC coarsest-level solver diff --git a/tests/pdegen/mld_d_pde2d.f90 b/tests/pdegen/mld_d_pde2d.f90 index 5cf0fcfa..4b011f0c 100644 --- a/tests/pdegen/mld_d_pde2d.f90 +++ b/tests/pdegen/mld_d_pde2d.f90 @@ -653,16 +653,13 @@ program mld_d_pde2d end select end if - if (psb_toupper(p_choice%csolve) /= 'DEFLT') then - call prec%set('coarse_solve', p_choice%csolve, info) - if (psb_toupper(p_choice%csolve) == 'BJAC') & - & call prec%set('coarse_subsolve', p_choice%csbsolve, info) - if (psb_toupper(p_choice%cmat) /= 'DEFLT')& - & call prec%set('coarse_mat', p_choice%cmat, info) - call prec%set('coarse_fillin', p_choice%cfill, info) - call prec%set('coarse_iluthrs', p_choice%cthres, info) - call prec%set('coarse_sweeps', p_choice%cjswp, info) - end if + call prec%set('coarse_solve', p_choice%csolve, info) + if (psb_toupper(p_choice%csolve) == 'BJAC') & + & call prec%set('coarse_subsolve', p_choice%csbsolve, info) + call prec%set('coarse_mat', p_choice%cmat, info) + call prec%set('coarse_fillin', p_choice%cfill, info) + call prec%set('coarse_iluthrs', p_choice%cthres, info) + call prec%set('coarse_sweeps', p_choice%cjswp, info) end select diff --git a/tests/pdegen/mld_d_pde3d.f90 b/tests/pdegen/mld_d_pde3d.f90 index 38be9aa8..4fef2189 100644 --- a/tests/pdegen/mld_d_pde3d.f90 +++ b/tests/pdegen/mld_d_pde3d.f90 @@ -707,16 +707,13 @@ program mld_d_pde3d end select end if - if (psb_toupper(p_choice%csolve) /= 'DEFLT') then - call prec%set('coarse_solve', p_choice%csolve, info) - if (psb_toupper(p_choice%csolve) == 'BJAC') & - & call prec%set('coarse_subsolve', p_choice%csbsolve, info) - if (psb_toupper(p_choice%cmat) /= 'DEFLT')& - & call prec%set('coarse_mat', p_choice%cmat, info) - call prec%set('coarse_fillin', p_choice%cfill, info) - call prec%set('coarse_iluthrs', p_choice%cthres, info) - call prec%set('coarse_sweeps', p_choice%cjswp, info) - end if + call prec%set('coarse_solve', p_choice%csolve, info) + if (psb_toupper(p_choice%csolve) == 'BJAC') & + & call prec%set('coarse_subsolve', p_choice%csbsolve, info) + call prec%set('coarse_mat', p_choice%cmat, info) + call prec%set('coarse_fillin', p_choice%cfill, info) + call prec%set('coarse_iluthrs', p_choice%cthres, info) + call prec%set('coarse_sweeps', p_choice%cjswp, info) end select diff --git a/tests/pdegen/mld_s_pde2d.f90 b/tests/pdegen/mld_s_pde2d.f90 index e624936b..57af569f 100644 --- a/tests/pdegen/mld_s_pde2d.f90 +++ b/tests/pdegen/mld_s_pde2d.f90 @@ -653,16 +653,13 @@ program mld_s_pde2d end select end if - if (psb_toupper(p_choice%csolve) /= 'DEFLT') then - call prec%set('coarse_solve', p_choice%csolve, info) - if (psb_toupper(p_choice%csolve) == 'BJAC') & - & call prec%set('coarse_subsolve', p_choice%csbsolve, info) - if (psb_toupper(p_choice%cmat) /= 'DEFLT')& - & call prec%set('coarse_mat', p_choice%cmat, info) - call prec%set('coarse_fillin', p_choice%cfill, info) - call prec%set('coarse_iluthrs', p_choice%cthres, info) - call prec%set('coarse_sweeps', p_choice%cjswp, info) - end if + call prec%set('coarse_solve', p_choice%csolve, info) + if (psb_toupper(p_choice%csolve) == 'BJAC') & + & call prec%set('coarse_subsolve', p_choice%csbsolve, info) + call prec%set('coarse_mat', p_choice%cmat, info) + call prec%set('coarse_fillin', p_choice%cfill, info) + call prec%set('coarse_iluthrs', p_choice%cthres, info) + call prec%set('coarse_sweeps', p_choice%cjswp, info) end select diff --git a/tests/pdegen/mld_s_pde3d.f90 b/tests/pdegen/mld_s_pde3d.f90 index 854ba0ac..19ff5e86 100644 --- a/tests/pdegen/mld_s_pde3d.f90 +++ b/tests/pdegen/mld_s_pde3d.f90 @@ -707,16 +707,13 @@ program mld_s_pde3d end select end if - if (psb_toupper(p_choice%csolve) /= 'DEFLT') then - call prec%set('coarse_solve', p_choice%csolve, info) - if (psb_toupper(p_choice%csolve) == 'BJAC') & - & call prec%set('coarse_subsolve', p_choice%csbsolve, info) - if (psb_toupper(p_choice%cmat) /= 'DEFLT')& - & call prec%set('coarse_mat', p_choice%cmat, info) - call prec%set('coarse_fillin', p_choice%cfill, info) - call prec%set('coarse_iluthrs', p_choice%cthres, info) - call prec%set('coarse_sweeps', p_choice%cjswp, info) - end if + call prec%set('coarse_solve', p_choice%csolve, info) + if (psb_toupper(p_choice%csolve) == 'BJAC') & + & call prec%set('coarse_subsolve', p_choice%csbsolve, info) + call prec%set('coarse_mat', p_choice%cmat, info) + call prec%set('coarse_fillin', p_choice%cfill, info) + call prec%set('coarse_iluthrs', p_choice%cthres, info) + call prec%set('coarse_sweeps', p_choice%cjswp, info) end select diff --git a/tests/pdegen/runs/mld_pde2d.inp b/tests/pdegen/runs/mld_pde2d.inp index e6f0fbad..ce59195b 100644 --- a/tests/pdegen/runs/mld_pde2d.inp +++ b/tests/pdegen/runs/mld_pde2d.inp @@ -42,9 +42,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER 0.05 0.025 ! Thresholds -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 %%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% -DEFLT ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC DEFLT +UMF ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC UMF ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU -DEFLT ! Coarsest-level matrix distribution: DIST REPL, DEFLT +REPL ! Coarsest-level matrix distribution: DIST REPL 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 sweeps for JACOBI/GS/BJAC coarsest-level solver diff --git a/tests/pdegen/runs/mld_pde3d.inp b/tests/pdegen/runs/mld_pde3d.inp index 8d7bab52..316edc63 100644 --- a/tests/pdegen/runs/mld_pde3d.inp +++ b/tests/pdegen/runs/mld_pde3d.inp @@ -41,9 +41,9 @@ NOFILTER ! Filtering of matrix: FILTER NOFILTER 0.05 0.025 ! Thresholds -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 %%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% -DEFLT ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC DEFLT +UMF ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC UMF ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU -DEFLT ! Coarsest-level matrix distribution: DIST REPL, DEFLT +REPL ! Coarsest-level matrix distribution: DIST REPL 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 sweeps for JACOBI/GS/BJAC coarsest-level solver