From 85ef57a5611a731d7f334d380cbd4f35c96902ff Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 15 Sep 2016 16:04:52 +0000 Subject: [PATCH] mld2p4: mlprec/impl/mld_ccprecset.F90 mlprec/impl/mld_cprecset.F90 mlprec/impl/mld_dcprecset.F90 mlprec/impl/mld_dprecset.F90 mlprec/impl/mld_scprecset.F90 mlprec/impl/mld_sprecset.F90 mlprec/impl/mld_zcprecset.F90 mlprec/impl/mld_zprecset.F90 Fix aggr_scale --- mlprec/impl/mld_ccprecset.F90 | 6 ++++++ mlprec/impl/mld_cprecset.F90 | 5 +++++ mlprec/impl/mld_dcprecset.F90 | 6 ++++++ mlprec/impl/mld_dprecset.F90 | 5 +++++ mlprec/impl/mld_scprecset.F90 | 6 ++++++ mlprec/impl/mld_sprecset.F90 | 5 +++++ mlprec/impl/mld_zcprecset.F90 | 6 ++++++ mlprec/impl/mld_zprecset.F90 | 5 +++++ 8 files changed, 44 insertions(+) diff --git a/mlprec/impl/mld_ccprecset.F90 b/mlprec/impl/mld_ccprecset.F90 index 783b4582..4551fd1e 100644 --- a/mlprec/impl/mld_ccprecset.F90 +++ b/mlprec/impl/mld_ccprecset.F90 @@ -519,6 +519,12 @@ subroutine mld_ccprecsetr(p,what,val,info,ilev,pos) ilev_=nlev_ call p%precv(ilev_)%set('SUB_ILUTHRS',val,info,pos=pos) + + case('AGGR_SCALE') + do ilev_ = 2, nlev_ + call p%precv(ilev_)%set('AGGR_SCALE',val,info,pos=pos) + end do + case('AGGR_THRESH') thr = val do ilev_ = 2, nlev_ diff --git a/mlprec/impl/mld_cprecset.F90 b/mlprec/impl/mld_cprecset.F90 index 38c1d791..02f32538 100644 --- a/mlprec/impl/mld_cprecset.F90 +++ b/mlprec/impl/mld_cprecset.F90 @@ -621,6 +621,11 @@ subroutine mld_cprecsetr(p,what,val,info,ilev,pos) ilev_=nlev_ call p%precv(ilev_)%set(mld_sub_iluthrs_,val,info,pos=pos) + case(mld_aggr_scale_) + do ilev_ = 2, nlev_ + call p%precv(ilev_)%set(mld_aggr_scale_,val,info,pos=pos) + end do + case(mld_aggr_thresh_) thr = val do ilev_ = 2, nlev_ diff --git a/mlprec/impl/mld_dcprecset.F90 b/mlprec/impl/mld_dcprecset.F90 index bb61822a..6d624a63 100644 --- a/mlprec/impl/mld_dcprecset.F90 +++ b/mlprec/impl/mld_dcprecset.F90 @@ -529,6 +529,12 @@ subroutine mld_dcprecsetr(p,what,val,info,ilev,pos) ilev_=nlev_ call p%precv(ilev_)%set('SUB_ILUTHRS',val,info,pos=pos) + + case('AGGR_SCALE') + do ilev_ = 2, nlev_ + call p%precv(ilev_)%set('AGGR_SCALE',val,info,pos=pos) + end do + case('AGGR_THRESH') thr = val do ilev_ = 2, nlev_ diff --git a/mlprec/impl/mld_dprecset.F90 b/mlprec/impl/mld_dprecset.F90 index 37236b03..6d868885 100644 --- a/mlprec/impl/mld_dprecset.F90 +++ b/mlprec/impl/mld_dprecset.F90 @@ -631,6 +631,11 @@ subroutine mld_dprecsetr(p,what,val,info,ilev,pos) ilev_=nlev_ call p%precv(ilev_)%set(mld_sub_iluthrs_,val,info,pos=pos) + case(mld_aggr_scale_) + do ilev_ = 2, nlev_ + call p%precv(ilev_)%set(mld_aggr_scale_,val,info,pos=pos) + end do + case(mld_aggr_thresh_) thr = val do ilev_ = 2, nlev_ diff --git a/mlprec/impl/mld_scprecset.F90 b/mlprec/impl/mld_scprecset.F90 index af641414..40c74d8a 100644 --- a/mlprec/impl/mld_scprecset.F90 +++ b/mlprec/impl/mld_scprecset.F90 @@ -519,6 +519,12 @@ subroutine mld_scprecsetr(p,what,val,info,ilev,pos) ilev_=nlev_ call p%precv(ilev_)%set('SUB_ILUTHRS',val,info,pos=pos) + + case('AGGR_SCALE') + do ilev_ = 2, nlev_ + call p%precv(ilev_)%set('AGGR_SCALE',val,info,pos=pos) + end do + case('AGGR_THRESH') thr = val do ilev_ = 2, nlev_ diff --git a/mlprec/impl/mld_sprecset.F90 b/mlprec/impl/mld_sprecset.F90 index a8b5c289..4bc463ca 100644 --- a/mlprec/impl/mld_sprecset.F90 +++ b/mlprec/impl/mld_sprecset.F90 @@ -621,6 +621,11 @@ subroutine mld_sprecsetr(p,what,val,info,ilev,pos) ilev_=nlev_ call p%precv(ilev_)%set(mld_sub_iluthrs_,val,info,pos=pos) + case(mld_aggr_scale_) + do ilev_ = 2, nlev_ + call p%precv(ilev_)%set(mld_aggr_scale_,val,info,pos=pos) + end do + case(mld_aggr_thresh_) thr = val do ilev_ = 2, nlev_ diff --git a/mlprec/impl/mld_zcprecset.F90 b/mlprec/impl/mld_zcprecset.F90 index 338616fb..9ecc4a92 100644 --- a/mlprec/impl/mld_zcprecset.F90 +++ b/mlprec/impl/mld_zcprecset.F90 @@ -529,6 +529,12 @@ subroutine mld_zcprecsetr(p,what,val,info,ilev,pos) ilev_=nlev_ call p%precv(ilev_)%set('SUB_ILUTHRS',val,info,pos=pos) + + case('AGGR_SCALE') + do ilev_ = 2, nlev_ + call p%precv(ilev_)%set('AGGR_SCALE',val,info,pos=pos) + end do + case('AGGR_THRESH') thr = val do ilev_ = 2, nlev_ diff --git a/mlprec/impl/mld_zprecset.F90 b/mlprec/impl/mld_zprecset.F90 index e57c4c38..ab1a3f9c 100644 --- a/mlprec/impl/mld_zprecset.F90 +++ b/mlprec/impl/mld_zprecset.F90 @@ -631,6 +631,11 @@ subroutine mld_zprecsetr(p,what,val,info,ilev,pos) ilev_=nlev_ call p%precv(ilev_)%set(mld_sub_iluthrs_,val,info,pos=pos) + case(mld_aggr_scale_) + do ilev_ = 2, nlev_ + call p%precv(ilev_)%set(mld_aggr_scale_,val,info,pos=pos) + end do + case(mld_aggr_thresh_) thr = val do ilev_ = 2, nlev_