fdurastante/amg4psblas
1
0
Fork 0
mirror of https://github.com/sfilippone/amg4psblas.git synced 2026-10-06 14:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test programs to use min_coarse_size_per_processor

Browse Source
This commit is contained in:
Salvatore Filippone
2021-03-12 09:33:07 +01:00
parent d644f8f76e
commit f23df4cb48
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/pdegen/amg_d_pde2d.f90
+5 -5
View File
@@ -133,7 +133,7 @@ program amg_d_pde2d
real(psb_dpk_), allocatable :: athresv(:) ! smoothed aggregation threshold vector
integer(psb_ipk_) :: thrvsz ! size of threshold vector
real(psb_dpk_) :: athres ! smoothed aggregation threshold
integer(psb_ipk_) :: csize ! minimum size of coarsest matrix
integer(psb_ipk_) :: csizepp ! minimum size of coarsest matrix per process
! AMG smoother or pre-smoother; also 1-lev preconditioner
character(len=16) :: smther ! (pre-)smoother type: BJAC, AS
@@ -274,8 +274,8 @@ program amg_d_pde2d
call prec%set('ml_cycle', p_choice%mlcycle, info)
call prec%set('outer_sweeps', p_choice%outer_sweeps,info)
if (p_choice%csize>0)&
& call prec%set('min_coarse_size', p_choice%csize, info)
if (p_choice%csizepp>0)&
& call prec%set('min_coarse_size_per_process', p_choice%csizepp, info)
if (p_choice%mncrratio>1)&
& call prec%set('min_cr_ratio', p_choice%mncrratio, info)
if (p_choice%maxlevs>0)&
@@ -551,7 +551,7 @@ contains
call read_data(prec%mlcycle,inp_unit) ! AMG cycle type
call read_data(prec%outer_sweeps,inp_unit) ! number of 1lev/outer sweeps
call read_data(prec%maxlevs,inp_unit) ! max number of levels in AMG prec
call read_data(prec%csize,inp_unit) ! min size coarsest mat
call read_data(prec%csizepp,inp_unit) ! min size coarsest mat
! aggregation
call read_data(prec%aggr_prol,inp_unit) ! aggregation type
call read_data(prec%par_aggr_alg,inp_unit) ! parallel aggregation alg
@@ -632,7 +632,7 @@ contains
end if
call psb_bcast(ctxt,prec%athres)
call psb_bcast(ctxt,prec%csize)
call psb_bcast(ctxt,prec%csizepp)
call psb_bcast(ctxt,prec%cmat)
call psb_bcast(ctxt,prec%csolve)
call psb_bcast(ctxt,prec%csbsolve)
tests/pdegen/amg_d_pde3d.f90
+5 -5
View File
@@ -134,7 +134,7 @@ program amg_d_pde3d
real(psb_dpk_), allocatable :: athresv(:) ! smoothed aggregation threshold vector
integer(psb_ipk_) :: thrvsz ! size of threshold vector
real(psb_dpk_) :: athres ! smoothed aggregation threshold
integer(psb_ipk_) :: csize ! minimum size of coarsest matrix
integer(psb_ipk_) :: csizepp ! minimum size of coarsest matrix per process
! AMG smoother or pre-smoother; also 1-lev preconditioner
character(len=16) :: smther ! (pre-)smoother type: BJAC, AS
@@ -278,8 +278,8 @@ program amg_d_pde3d
call prec%set('ml_cycle', p_choice%mlcycle, info)
call prec%set('outer_sweeps', p_choice%outer_sweeps,info)
if (p_choice%csize>0)&
& call prec%set('min_coarse_size', p_choice%csize, info)
if (p_choice%csizepp>0)&
& call prec%set('min_coarse_size_per_process', p_choice%csizepp, info)
if (p_choice%mncrratio>1)&
& call prec%set('min_cr_ratio', p_choice%mncrratio, info)
if (p_choice%maxlevs>0)&
@@ -555,7 +555,7 @@ contains
call read_data(prec%mlcycle,inp_unit) ! AMG cycle type
call read_data(prec%outer_sweeps,inp_unit) ! number of 1lev/outer sweeps
call read_data(prec%maxlevs,inp_unit) ! max number of levels in AMG prec
call read_data(prec%csize,inp_unit) ! min size coarsest mat
call read_data(prec%csizepp,inp_unit) ! min size coarsest mat
! aggregation
call read_data(prec%aggr_prol,inp_unit) ! aggregation type
call read_data(prec%par_aggr_alg,inp_unit) ! parallel aggregation alg
@@ -636,7 +636,7 @@ contains
end if
call psb_bcast(ctxt,prec%athres)
call psb_bcast(ctxt,prec%csize)
call psb_bcast(ctxt,prec%csizepp)
call psb_bcast(ctxt,prec%cmat)
call psb_bcast(ctxt,prec%csolve)
call psb_bcast(ctxt,prec%csbsolve)
tests/pdegen/amg_s_pde2d.f90
+5 -5
View File
@@ -133,7 +133,7 @@ program amg_s_pde2d
real(psb_spk_), allocatable :: athresv(:) ! smoothed aggregation threshold vector
integer(psb_ipk_) :: thrvsz ! size of threshold vector
real(psb_spk_) :: athres ! smoothed aggregation threshold
integer(psb_ipk_) :: csize ! minimum size of coarsest matrix
integer(psb_ipk_) :: csizepp ! minimum size of coarsest matrix per process
! AMG smoother or pre-smoother; also 1-lev preconditioner
character(len=16) :: smther ! (pre-)smoother type: BJAC, AS
@@ -274,8 +274,8 @@ program amg_s_pde2d
call prec%set('ml_cycle', p_choice%mlcycle, info)
call prec%set('outer_sweeps', p_choice%outer_sweeps,info)
if (p_choice%csize>0)&
& call prec%set('min_coarse_size', p_choice%csize, info)
if (p_choice%csizepp>0)&
& call prec%set('min_coarse_size_per_process', p_choice%csizepp, info)
if (p_choice%mncrratio>1)&
& call prec%set('min_cr_ratio', p_choice%mncrratio, info)
if (p_choice%maxlevs>0)&
@@ -551,7 +551,7 @@ contains
call read_data(prec%mlcycle,inp_unit) ! AMG cycle type
call read_data(prec%outer_sweeps,inp_unit) ! number of 1lev/outer sweeps
call read_data(prec%maxlevs,inp_unit) ! max number of levels in AMG prec
call read_data(prec%csize,inp_unit) ! min size coarsest mat
call read_data(prec%csizepp,inp_unit) ! min size coarsest mat
! aggregation
call read_data(prec%aggr_prol,inp_unit) ! aggregation type
call read_data(prec%par_aggr_alg,inp_unit) ! parallel aggregation alg
@@ -632,7 +632,7 @@ contains
end if
call psb_bcast(ctxt,prec%athres)
call psb_bcast(ctxt,prec%csize)
call psb_bcast(ctxt,prec%csizepp)
call psb_bcast(ctxt,prec%cmat)
call psb_bcast(ctxt,prec%csolve)
call psb_bcast(ctxt,prec%csbsolve)
tests/pdegen/amg_s_pde3d.f90
+5 -5
View File
@@ -134,7 +134,7 @@ program amg_s_pde3d
real(psb_spk_), allocatable :: athresv(:) ! smoothed aggregation threshold vector
integer(psb_ipk_) :: thrvsz ! size of threshold vector
real(psb_spk_) :: athres ! smoothed aggregation threshold
integer(psb_ipk_) :: csize ! minimum size of coarsest matrix
integer(psb_ipk_) :: csizepp ! minimum size of coarsest matrix per process
! AMG smoother or pre-smoother; also 1-lev preconditioner
character(len=16) :: smther ! (pre-)smoother type: BJAC, AS
@@ -278,8 +278,8 @@ program amg_s_pde3d
call prec%set('ml_cycle', p_choice%mlcycle, info)
call prec%set('outer_sweeps', p_choice%outer_sweeps,info)
if (p_choice%csize>0)&
& call prec%set('min_coarse_size', p_choice%csize, info)
if (p_choice%csizepp>0)&
& call prec%set('min_coarse_size_per_process', p_choice%csizepp, info)
if (p_choice%mncrratio>1)&
& call prec%set('min_cr_ratio', p_choice%mncrratio, info)
if (p_choice%maxlevs>0)&
@@ -555,7 +555,7 @@ contains
call read_data(prec%mlcycle,inp_unit) ! AMG cycle type
call read_data(prec%outer_sweeps,inp_unit) ! number of 1lev/outer sweeps
call read_data(prec%maxlevs,inp_unit) ! max number of levels in AMG prec
call read_data(prec%csize,inp_unit) ! min size coarsest mat
call read_data(prec%csizepp,inp_unit) ! min size coarsest mat
! aggregation
call read_data(prec%aggr_prol,inp_unit) ! aggregation type
call read_data(prec%par_aggr_alg,inp_unit) ! parallel aggregation alg
@@ -636,7 +636,7 @@ contains
end if
call psb_bcast(ctxt,prec%athres)
call psb_bcast(ctxt,prec%csize)
call psb_bcast(ctxt,prec%csizepp)
call psb_bcast(ctxt,prec%cmat)
call psb_bcast(ctxt,prec%csolve)
call psb_bcast(ctxt,prec%csbsolve)
tests/pdegen/runs/amg_pde2d.inp
+1 -1
View File
@@ -37,7 +37,7 @@ LLK ! AINV variant, ignored otherwise
VCYCLE ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MULT ADD
4 ! Number of outer sweeps for ML
-3 ! Max Number of levels in a multilevel preconditioner; if <0, lib default
-3 ! Target coarse matrix size; if <0, lib default
-3 ! Target coarse matrix size per process; if <0, lib default
SMOOTHED ! Type of aggregation: SMOOTHED UNSMOOTHED
DEC ! Parallel aggregation: DEC, SYMDEC
NATURAL ! Ordering of aggregation NATURAL DEGREE
tests/pdegen/runs/amg_pde3d.inp
+1 -1
View File
@@ -37,7 +37,7 @@ LLK ! AINV variant
VCYCLE ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MULT ADD
4 ! Number of outer sweeps for ML
-3 ! Max Number of levels in a multilevel preconditioner; if <0, lib default
-3 ! Target coarse matrix size; if <0, lib default
-3 ! Target coarse matrix size per process; if <0, lib default
SMOOTHED ! Type of aggregation: SMOOTHED UNSMOOTHED
DEC ! Parallel aggregation: DEC, SYMDEC
NATURAL ! Ordering of aggregation NATURAL DEGREE