Move reading aggregation ratio above filtering option.

3 years ago · 45fabb5214
parent a9182021bb
commit 45fabb5214
14 changed files with 14 additions and 14 deletions
--- 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
--- 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
--- 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
--- 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
--- 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 
--- 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 
--- 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 
--- 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 
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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