From 45fabb5214b27d6c67cdf8f6a82277374a059e34 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 25 Oct 2021 14:46:43 +0200 Subject: [PATCH] Move reading aggregation ratio above filtering option. --- samples/advanced/fileread/amg_cf_sample.f90 | 2 +- samples/advanced/fileread/amg_df_sample.f90 | 2 +- samples/advanced/fileread/amg_sf_sample.f90 | 2 +- samples/advanced/fileread/amg_zf_sample.f90 | 2 +- samples/advanced/fileread/runs/amg_cfs.inp | 2 +- samples/advanced/fileread/runs/amg_dfs.inp | 2 +- samples/advanced/fileread/runs/amg_sfs.inp | 2 +- samples/advanced/fileread/runs/amg_zfs.inp | 2 +- samples/advanced/pdegen/amg_d_pde2d.f90 | 2 +- samples/advanced/pdegen/amg_d_pde3d.f90 | 2 +- samples/advanced/pdegen/amg_s_pde2d.f90 | 2 +- samples/advanced/pdegen/amg_s_pde3d.f90 | 2 +- samples/advanced/pdegen/runs/amg_pde2d.inp | 2 +- samples/advanced/pdegen/runs/amg_pde3d.inp | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/samples/advanced/fileread/amg_cf_sample.f90 b/samples/advanced/fileread/amg_cf_sample.f90 index 0077a4af..e18079ae 100644 --- a/samples/advanced/fileread/amg_cf_sample.f90 +++ b/samples/advanced/fileread/amg_cf_sample.f90 @@ -676,8 +676,8 @@ contains call read_data(prec%aggr_prol,inp_unit) ! aggregation type call read_data(prec%par_aggr_alg,inp_unit) ! parallel aggregation alg call read_data(prec%aggr_ord,inp_unit) ! ordering for aggregation - call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%mncrratio,inp_unit) ! minimum aggregation ratio + call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%athres,inp_unit) ! smoothed aggr thresh call read_data(prec%thrvsz,inp_unit) ! size of aggr thresh vector if (prec%thrvsz > 0) then diff --git a/samples/advanced/fileread/amg_df_sample.f90 b/samples/advanced/fileread/amg_df_sample.f90 index eb4d9e46..8c29eff8 100644 --- a/samples/advanced/fileread/amg_df_sample.f90 +++ b/samples/advanced/fileread/amg_df_sample.f90 @@ -676,8 +676,8 @@ contains call read_data(prec%aggr_prol,inp_unit) ! aggregation type call read_data(prec%par_aggr_alg,inp_unit) ! parallel aggregation alg call read_data(prec%aggr_ord,inp_unit) ! ordering for aggregation - call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%mncrratio,inp_unit) ! minimum aggregation ratio + call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%athres,inp_unit) ! smoothed aggr thresh call read_data(prec%thrvsz,inp_unit) ! size of aggr thresh vector if (prec%thrvsz > 0) then diff --git a/samples/advanced/fileread/amg_sf_sample.f90 b/samples/advanced/fileread/amg_sf_sample.f90 index e0a1c3c3..e195d4ff 100644 --- a/samples/advanced/fileread/amg_sf_sample.f90 +++ b/samples/advanced/fileread/amg_sf_sample.f90 @@ -676,8 +676,8 @@ contains call read_data(prec%aggr_prol,inp_unit) ! aggregation type call read_data(prec%par_aggr_alg,inp_unit) ! parallel aggregation alg call read_data(prec%aggr_ord,inp_unit) ! ordering for aggregation - call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%mncrratio,inp_unit) ! minimum aggregation ratio + call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%athres,inp_unit) ! smoothed aggr thresh call read_data(prec%thrvsz,inp_unit) ! size of aggr thresh vector if (prec%thrvsz > 0) then diff --git a/samples/advanced/fileread/amg_zf_sample.f90 b/samples/advanced/fileread/amg_zf_sample.f90 index 28703f25..6d7e6f9c 100644 --- a/samples/advanced/fileread/amg_zf_sample.f90 +++ b/samples/advanced/fileread/amg_zf_sample.f90 @@ -676,8 +676,8 @@ contains call read_data(prec%aggr_prol,inp_unit) ! aggregation type call read_data(prec%par_aggr_alg,inp_unit) ! parallel aggregation alg call read_data(prec%aggr_ord,inp_unit) ! ordering for aggregation - call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%mncrratio,inp_unit) ! minimum aggregation ratio + call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%athres,inp_unit) ! smoothed aggr thresh call read_data(prec%thrvsz,inp_unit) ! size of aggr thresh vector if (prec%thrvsz > 0) then diff --git a/samples/advanced/fileread/runs/amg_cfs.inp b/samples/advanced/fileread/runs/amg_cfs.inp index b41704a0..44ca86bf 100644 --- a/samples/advanced/fileread/runs/amg_cfs.inp +++ b/samples/advanced/fileread/runs/amg_cfs.inp @@ -41,8 +41,8 @@ VCYCLE ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MUL SMOOTHED ! Type of aggregation: SMOOTHED UNSMOOTHED DEC ! Parallel aggregation: DEC, SYMDEC NATURAL ! Ordering of aggregation NATURAL DEGREE -FILTER ! Filtering of matrix: FILTER NOFILTER -1.5 ! Coarsening ratio, if < 0 use library default +FILTER ! Filtering of matrix: FILTER NOFILTER -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -2 ! Number of thresholds in vector, next line ignored if <= 0 0.05 0.025 ! Thresholds diff --git a/samples/advanced/fileread/runs/amg_dfs.inp b/samples/advanced/fileread/runs/amg_dfs.inp index 68210fa4..9e0606b2 100644 --- a/samples/advanced/fileread/runs/amg_dfs.inp +++ b/samples/advanced/fileread/runs/amg_dfs.inp @@ -41,8 +41,8 @@ VCYCLE ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MUL SMOOTHED ! Type of aggregation: SMOOTHED UNSMOOTHED DEC ! Parallel aggregation: DEC, SYMDEC NATURAL ! Ordering of aggregation NATURAL DEGREE -FILTER ! Filtering of matrix: FILTER NOFILTER -1.5 ! Coarsening ratio, if < 0 use library default +FILTER ! Filtering of matrix: FILTER NOFILTER -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -2 ! Number of thresholds in vector, next line ignored if <= 0 0.05 0.025 ! Thresholds diff --git a/samples/advanced/fileread/runs/amg_sfs.inp b/samples/advanced/fileread/runs/amg_sfs.inp index 6301d925..a73415ab 100644 --- a/samples/advanced/fileread/runs/amg_sfs.inp +++ b/samples/advanced/fileread/runs/amg_sfs.inp @@ -41,8 +41,8 @@ VCYCLE ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MUL SMOOTHED ! Type of aggregation: SMOOTHED UNSMOOTHED DEC ! Parallel aggregation: DEC, SYMDEC NATURAL ! Ordering of aggregation NATURAL DEGREE -FILTER ! Filtering of matrix: FILTER NOFILTER -1.5 ! Coarsening ratio, if < 0 use library default +FILTER ! Filtering of matrix: FILTER NOFILTER -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -2 ! Number of thresholds in vector, next line ignored if <= 0 0.05 0.025 ! Thresholds diff --git a/samples/advanced/fileread/runs/amg_zfs.inp b/samples/advanced/fileread/runs/amg_zfs.inp index f37407e7..1868d64c 100644 --- a/samples/advanced/fileread/runs/amg_zfs.inp +++ b/samples/advanced/fileread/runs/amg_zfs.inp @@ -41,8 +41,8 @@ VCYCLE ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MUL SMOOTHED ! Type of aggregation: SMOOTHED UNSMOOTHED DEC ! Parallel aggregation: DEC, SYMDEC NATURAL ! Ordering of aggregation NATURAL DEGREE -FILTER ! Filtering of matrix: FILTER NOFILTER -1.5 ! Coarsening ratio, if < 0 use library default +FILTER ! Filtering of matrix: FILTER NOFILTER -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -2 ! Number of thresholds in vector, next line ignored if <= 0 0.05 0.025 ! Thresholds diff --git a/samples/advanced/pdegen/amg_d_pde2d.f90 b/samples/advanced/pdegen/amg_d_pde2d.f90 index dbbd1303..c036aa6d 100644 --- a/samples/advanced/pdegen/amg_d_pde2d.f90 +++ b/samples/advanced/pdegen/amg_d_pde2d.f90 @@ -581,8 +581,8 @@ contains call read_data(prec%aggr_type,inp_unit) ! type of aggregation call read_data(prec%aggr_size,inp_unit) ! Requested size of the aggregates for MATCHBOXP call read_data(prec%aggr_ord,inp_unit) ! ordering for aggregation - call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%mncrratio,inp_unit) ! minimum aggregation ratio + call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%athres,inp_unit) ! smoothed aggr thresh call read_data(prec%thrvsz,inp_unit) ! size of aggr thresh vector if (prec%thrvsz > 0) then diff --git a/samples/advanced/pdegen/amg_d_pde3d.f90 b/samples/advanced/pdegen/amg_d_pde3d.f90 index 0db43766..1f6118ca 100644 --- a/samples/advanced/pdegen/amg_d_pde3d.f90 +++ b/samples/advanced/pdegen/amg_d_pde3d.f90 @@ -585,8 +585,8 @@ contains call read_data(prec%aggr_type,inp_unit) ! type of aggregation call read_data(prec%aggr_size,inp_unit) ! Requested size of the aggregates for MATCHBOXP call read_data(prec%aggr_ord,inp_unit) ! ordering for aggregation - call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%mncrratio,inp_unit) ! minimum aggregation ratio + call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%athres,inp_unit) ! smoothed aggr thresh call read_data(prec%thrvsz,inp_unit) ! size of aggr thresh vector if (prec%thrvsz > 0) then diff --git a/samples/advanced/pdegen/amg_s_pde2d.f90 b/samples/advanced/pdegen/amg_s_pde2d.f90 index a86dd415..a81d16ff 100644 --- a/samples/advanced/pdegen/amg_s_pde2d.f90 +++ b/samples/advanced/pdegen/amg_s_pde2d.f90 @@ -581,8 +581,8 @@ contains call read_data(prec%aggr_type,inp_unit) ! type of aggregation call read_data(prec%aggr_size,inp_unit) ! Requested size of the aggregates for MATCHBOXP call read_data(prec%aggr_ord,inp_unit) ! ordering for aggregation - call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%mncrratio,inp_unit) ! minimum aggregation ratio + call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%athres,inp_unit) ! smoothed aggr thresh call read_data(prec%thrvsz,inp_unit) ! size of aggr thresh vector if (prec%thrvsz > 0) then diff --git a/samples/advanced/pdegen/amg_s_pde3d.f90 b/samples/advanced/pdegen/amg_s_pde3d.f90 index 322a84c8..7542c3a2 100644 --- a/samples/advanced/pdegen/amg_s_pde3d.f90 +++ b/samples/advanced/pdegen/amg_s_pde3d.f90 @@ -585,8 +585,8 @@ contains call read_data(prec%aggr_type,inp_unit) ! type of aggregation call read_data(prec%aggr_size,inp_unit) ! Requested size of the aggregates for MATCHBOXP call read_data(prec%aggr_ord,inp_unit) ! ordering for aggregation - call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%mncrratio,inp_unit) ! minimum aggregation ratio + call read_data(prec%aggr_filter,inp_unit) ! filtering call read_data(prec%athres,inp_unit) ! smoothed aggr thresh call read_data(prec%thrvsz,inp_unit) ! size of aggr thresh vector if (prec%thrvsz > 0) then diff --git a/samples/advanced/pdegen/runs/amg_pde2d.inp b/samples/advanced/pdegen/runs/amg_pde2d.inp index d1281e7e..c3fc58e1 100644 --- a/samples/advanced/pdegen/runs/amg_pde2d.inp +++ b/samples/advanced/pdegen/runs/amg_pde2d.inp @@ -43,8 +43,8 @@ COUPLED ! Parallel aggregation: DEC, SYMDEC, COUPLED MATCHBOXP ! aggregation measure SOC1, MATCHBOXP 8 ! Requested size of the aggregates for MATCHBOXP NATURAL ! Ordering of aggregation NATURAL DEGREE -FILTER ! Filtering of matrix: FILTER NOFILTER -1.5 ! Coarsening ratio, if < 0 use library default +FILTER ! Filtering of matrix: FILTER NOFILTER -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -2 ! Number of thresholds in vector, next line ignored if <= 0 0.05 0.025 ! Thresholds diff --git a/samples/advanced/pdegen/runs/amg_pde3d.inp b/samples/advanced/pdegen/runs/amg_pde3d.inp index 62ca9b2d..eb254780 100644 --- a/samples/advanced/pdegen/runs/amg_pde3d.inp +++ b/samples/advanced/pdegen/runs/amg_pde3d.inp @@ -43,8 +43,8 @@ COUPLED ! Parallel aggregation: DEC, SYMDEC, COUPLED MATCHBOXP ! aggregation measure SOC1, MATCHBOXP 8 ! Requested size of the aggregates for MATCHBOXP NATURAL ! Ordering of aggregation NATURAL DEGREE -FILTER ! Filtering of matrix: FILTER NOFILTER -1.5 ! Coarsening ratio, if < 0 use library default +FILTER ! Filtering of matrix: FILTER NOFILTER -0.0100d0 ! Smoothed aggregation threshold, ignored if < 0 -2 ! Number of thresholds in vector, next line ignored if <= 0 0.05 0.025 ! Thresholds