fdurastante
/
amg4psblas
mirror of https://github.com/sfilippone/amg4psblas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Take out DEFLT from sample programs.

Browse Source
stopcriterion
Salvatore Filippone 7 years ago
parent f0d6631473
commit f493b7064e
14 changed files with 70 additions and 94 deletions
Show Stats Download Patch File Download Diff File

17
tests/fileread/mld_cf_sample.f90
Unescape Escape View File

@ -441,16 +441,13 @@ program mld_cf_sample
end select end select
end if end if
if (psb_toupper(p_choice%csolve) /= 'DEFLT') then call prec%set('coarse_solve', p_choice%csolve, info)
call prec%set('coarse_solve', p_choice%csolve, info) if (psb_toupper(p_choice%csolve) == 'BJAC') &
if (psb_toupper(p_choice%csolve) == 'BJAC') & & call prec%set('coarse_subsolve', p_choice%csbsolve, info)
& call prec%set('coarse_subsolve', p_choice%csbsolve, info) call prec%set('coarse_mat', p_choice%cmat, info)
if (psb_toupper(p_choice%cmat) /= 'DEFLT')& call prec%set('coarse_fillin', p_choice%cfill, info)
& call prec%set('coarse_mat', p_choice%cmat, info) call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_fillin', p_choice%cfill, info) call prec%set('coarse_sweeps', p_choice%cjswp, info)
call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_sweeps', p_choice%cjswp, info)
end if
end select end select

17
tests/fileread/mld_df_sample.f90
Unescape Escape View File

@ -441,16 +441,13 @@ program mld_df_sample
end select end select
end if end if
if (psb_toupper(p_choice%csolve) /= 'DEFLT') then call prec%set('coarse_solve', p_choice%csolve, info)
call prec%set('coarse_solve', p_choice%csolve, info) if (psb_toupper(p_choice%csolve) == 'BJAC') &
if (psb_toupper(p_choice%csolve) == 'BJAC') & & call prec%set('coarse_subsolve', p_choice%csbsolve, info)
& call prec%set('coarse_subsolve', p_choice%csbsolve, info) call prec%set('coarse_mat', p_choice%cmat, info)
if (psb_toupper(p_choice%cmat) /= 'DEFLT')& call prec%set('coarse_fillin', p_choice%cfill, info)
& call prec%set('coarse_mat', p_choice%cmat, info) call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_fillin', p_choice%cfill, info) call prec%set('coarse_sweeps', p_choice%cjswp, info)
call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_sweeps', p_choice%cjswp, info)
end if
end select end select

17
tests/fileread/mld_sf_sample.f90
Unescape Escape View File

@ -441,16 +441,13 @@ program mld_sf_sample
end select end select
end if end if
if (psb_toupper(p_choice%csolve) /= 'DEFLT') then call prec%set('coarse_solve', p_choice%csolve, info)
call prec%set('coarse_solve', p_choice%csolve, info) if (psb_toupper(p_choice%csolve) == 'BJAC') &
if (psb_toupper(p_choice%csolve) == 'BJAC') & & call prec%set('coarse_subsolve', p_choice%csbsolve, info)
& call prec%set('coarse_subsolve', p_choice%csbsolve, info) call prec%set('coarse_mat', p_choice%cmat, info)
if (psb_toupper(p_choice%cmat) /= 'DEFLT')& call prec%set('coarse_fillin', p_choice%cfill, info)
& call prec%set('coarse_mat', p_choice%cmat, info) call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_fillin', p_choice%cfill, info) call prec%set('coarse_sweeps', p_choice%cjswp, info)
call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_sweeps', p_choice%cjswp, info)
end if
end select end select

17
tests/fileread/mld_zf_sample.f90
Unescape Escape View File

@ -441,16 +441,13 @@ program mld_zf_sample
end select end select
end if end if
if (psb_toupper(p_choice%csolve) /= 'DEFLT') then call prec%set('coarse_solve', p_choice%csolve, info)
call prec%set('coarse_solve', p_choice%csolve, info) if (psb_toupper(p_choice%csolve) == 'BJAC') &
if (psb_toupper(p_choice%csolve) == 'BJAC') & & call prec%set('coarse_subsolve', p_choice%csbsolve, info)
& call prec%set('coarse_subsolve', p_choice%csbsolve, info) call prec%set('coarse_mat', p_choice%cmat, info)
if (psb_toupper(p_choice%cmat) /= 'DEFLT')& call prec%set('coarse_fillin', p_choice%cfill, info)
& call prec%set('coarse_mat', p_choice%cmat, info) call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_fillin', p_choice%cfill, info) call prec%set('coarse_sweeps', p_choice%cjswp, info)
call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_sweeps', p_choice%cjswp, info)
end if
end select end select

6
tests/fileread/runs/mld_cfs.inp
Unescape Escape View File

@ -47,9 +47,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER
0.05 0.025 ! Thresholds 0.05 0.025 ! Thresholds
-0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0
%%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% %%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%%
DEFLT ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC DEFLT SLU ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC
UMF ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU SLU ! 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 ! Coarsest-level fillin P for ILU(P) and ILU(T,P)
1.d-4 ! Coarsest-level threshold T for 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 1 ! Number of sweeps for JACOBI/GS/BJAC coarsest-level solver

4
tests/fileread/runs/mld_dfs.inp
Unescape Escape View File

@ -47,9 +47,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER
0.05 0.025 ! Thresholds 0.05 0.025 ! Thresholds
-0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0
%%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% %%%%%%%%%%% 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 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 ! Coarsest-level fillin P for ILU(P) and ILU(T,P)
1.d-4 ! Coarsest-level threshold T for 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 1 ! Number of sweeps for JACOBI/GS/BJAC coarsest-level solver

6
tests/fileread/runs/mld_sfs.inp
Unescape Escape View File

@ -47,9 +47,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER
0.05 0.025 ! Thresholds 0.05 0.025 ! Thresholds
-0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0
%%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% %%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%%
DEFLT ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC DEFLT SLU ! Coarsest-level solver: MUMPS UMF SLU SLUDIST JACOBI GS BJAC
UMF ! Coarsest-level subsolver for BJAC: ILU ILUT MILU UMF MUMPS SLU SLU ! 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 ! Coarsest-level fillin P for ILU(P) and ILU(T,P)
1.d-4 ! Coarsest-level threshold T for 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 1 ! Number of sweeps for JACOBI/GS/BJAC coarsest-level solver

4
tests/fileread/runs/mld_zfs.inp
Unescape Escape View File

@ -47,9 +47,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER
0.05 0.025 ! Thresholds 0.05 0.025 ! Thresholds
-0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0
%%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% %%%%%%%%%%% 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 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 ! Coarsest-level fillin P for ILU(P) and ILU(T,P)
1.d-4 ! Coarsest-level threshold T for 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 1 ! Number of sweeps for JACOBI/GS/BJAC coarsest-level solver

17
tests/pdegen/mld_d_pde2d.f90
Unescape Escape View File

@ -653,16 +653,13 @@ program mld_d_pde2d
end select end select
end if end if
if (psb_toupper(p_choice%csolve) /= 'DEFLT') then call prec%set('coarse_solve', p_choice%csolve, info)
call prec%set('coarse_solve', p_choice%csolve, info) if (psb_toupper(p_choice%csolve) == 'BJAC') &
if (psb_toupper(p_choice%csolve) == 'BJAC') & & call prec%set('coarse_subsolve', p_choice%csbsolve, info)
& call prec%set('coarse_subsolve', p_choice%csbsolve, info) call prec%set('coarse_mat', p_choice%cmat, info)
if (psb_toupper(p_choice%cmat) /= 'DEFLT')& call prec%set('coarse_fillin', p_choice%cfill, info)
& call prec%set('coarse_mat', p_choice%cmat, info) call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_fillin', p_choice%cfill, info) call prec%set('coarse_sweeps', p_choice%cjswp, info)
call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_sweeps', p_choice%cjswp, info)
end if
end select end select

17
tests/pdegen/mld_d_pde3d.f90
Unescape Escape View File

@ -707,16 +707,13 @@ program mld_d_pde3d
end select end select
end if end if
if (psb_toupper(p_choice%csolve) /= 'DEFLT') then call prec%set('coarse_solve', p_choice%csolve, info)
call prec%set('coarse_solve', p_choice%csolve, info) if (psb_toupper(p_choice%csolve) == 'BJAC') &
if (psb_toupper(p_choice%csolve) == 'BJAC') & & call prec%set('coarse_subsolve', p_choice%csbsolve, info)
& call prec%set('coarse_subsolve', p_choice%csbsolve, info) call prec%set('coarse_mat', p_choice%cmat, info)
if (psb_toupper(p_choice%cmat) /= 'DEFLT')& call prec%set('coarse_fillin', p_choice%cfill, info)
& call prec%set('coarse_mat', p_choice%cmat, info) call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_fillin', p_choice%cfill, info) call prec%set('coarse_sweeps', p_choice%cjswp, info)
call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_sweeps', p_choice%cjswp, info)
end if
end select end select

17
tests/pdegen/mld_s_pde2d.f90
Unescape Escape View File

@ -653,16 +653,13 @@ program mld_s_pde2d
end select end select
end if end if
if (psb_toupper(p_choice%csolve) /= 'DEFLT') then call prec%set('coarse_solve', p_choice%csolve, info)
call prec%set('coarse_solve', p_choice%csolve, info) if (psb_toupper(p_choice%csolve) == 'BJAC') &
if (psb_toupper(p_choice%csolve) == 'BJAC') & & call prec%set('coarse_subsolve', p_choice%csbsolve, info)
& call prec%set('coarse_subsolve', p_choice%csbsolve, info) call prec%set('coarse_mat', p_choice%cmat, info)
if (psb_toupper(p_choice%cmat) /= 'DEFLT')& call prec%set('coarse_fillin', p_choice%cfill, info)
& call prec%set('coarse_mat', p_choice%cmat, info) call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_fillin', p_choice%cfill, info) call prec%set('coarse_sweeps', p_choice%cjswp, info)
call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_sweeps', p_choice%cjswp, info)
end if
end select end select

17
tests/pdegen/mld_s_pde3d.f90
Unescape Escape View File

@ -707,16 +707,13 @@ program mld_s_pde3d
end select end select
end if end if
if (psb_toupper(p_choice%csolve) /= 'DEFLT') then call prec%set('coarse_solve', p_choice%csolve, info)
call prec%set('coarse_solve', p_choice%csolve, info) if (psb_toupper(p_choice%csolve) == 'BJAC') &
if (psb_toupper(p_choice%csolve) == 'BJAC') & & call prec%set('coarse_subsolve', p_choice%csbsolve, info)
& call prec%set('coarse_subsolve', p_choice%csbsolve, info) call prec%set('coarse_mat', p_choice%cmat, info)
if (psb_toupper(p_choice%cmat) /= 'DEFLT')& call prec%set('coarse_fillin', p_choice%cfill, info)
& call prec%set('coarse_mat', p_choice%cmat, info) call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_fillin', p_choice%cfill, info) call prec%set('coarse_sweeps', p_choice%cjswp, info)
call prec%set('coarse_iluthrs', p_choice%cthres, info)
call prec%set('coarse_sweeps', p_choice%cjswp, info)
end if
end select end select

4
tests/pdegen/runs/mld_pde2d.inp
Unescape Escape View File

@ -42,9 +42,9 @@ FILTER ! Filtering of matrix: FILTER NOFILTER
0.05 0.025 ! Thresholds 0.05 0.025 ! Thresholds
-0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0
%%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% %%%%%%%%%%% 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 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 ! Coarsest-level fillin P for ILU(P) and ILU(T,P)
1.d-4 ! Coarsest-level threshold T for 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 1 ! Number of sweeps for JACOBI/GS/BJAC coarsest-level solver

4
tests/pdegen/runs/mld_pde3d.inp
Unescape Escape View File

@ -41,9 +41,9 @@ NOFILTER ! Filtering of matrix: FILTER NOFILTER
0.05 0.025 ! Thresholds 0.05 0.025 ! Thresholds
-0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0
%%%%%%%%%%% Coarse level solver %%%%%%%%%%%%%%%% %%%%%%%%%%% 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 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 ! Coarsest-level fillin P for ILU(P) and ILU(T,P)
1.d-4 ! Coarsest-level threshold T for 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 1 ! Number of sweeps for JACOBI/GS/BJAC coarsest-level solver

Write Preview
Loading…
Cancel
Save