diff --git a/tests/pdegen/amg_d_pde2d.f90 b/tests/pdegen/amg_d_pde2d.f90 index 14989737..d47728b5 100644 --- a/tests/pdegen/amg_d_pde2d.f90 +++ b/tests/pdegen/amg_d_pde2d.f90 @@ -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) diff --git a/tests/pdegen/amg_d_pde3d.f90 b/tests/pdegen/amg_d_pde3d.f90 index 6e118514..58f6baa2 100644 --- a/tests/pdegen/amg_d_pde3d.f90 +++ b/tests/pdegen/amg_d_pde3d.f90 @@ -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) diff --git a/tests/pdegen/amg_s_pde2d.f90 b/tests/pdegen/amg_s_pde2d.f90 index 65065864..972f0fce 100644 --- a/tests/pdegen/amg_s_pde2d.f90 +++ b/tests/pdegen/amg_s_pde2d.f90 @@ -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) diff --git a/tests/pdegen/amg_s_pde3d.f90 b/tests/pdegen/amg_s_pde3d.f90 index b63f9bf1..06de11df 100644 --- a/tests/pdegen/amg_s_pde3d.f90 +++ b/tests/pdegen/amg_s_pde3d.f90 @@ -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) diff --git a/tests/pdegen/runs/amg_pde2d.inp b/tests/pdegen/runs/amg_pde2d.inp index 61d0bcec..7f16a56d 100644 --- a/tests/pdegen/runs/amg_pde2d.inp +++ b/tests/pdegen/runs/amg_pde2d.inp @@ -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 diff --git a/tests/pdegen/runs/amg_pde3d.inp b/tests/pdegen/runs/amg_pde3d.inp index 26e3d719..7c413af1 100644 --- a/tests/pdegen/runs/amg_pde3d.inp +++ b/tests/pdegen/runs/amg_pde3d.inp @@ -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