From d2264f5f117777feb58d9142ad828f2a36383ad3 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 25 May 2020 14:59:38 +0200 Subject: [PATCH] Stop criterion for aggregation. --- mlprec/impl/mld_c_hierarchy_bld.f90 | 6 +++--- mlprec/impl/mld_d_hierarchy_bld.f90 | 6 +++--- mlprec/impl/mld_s_hierarchy_bld.f90 | 6 +++--- mlprec/impl/mld_z_hierarchy_bld.f90 | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mlprec/impl/mld_c_hierarchy_bld.f90 b/mlprec/impl/mld_c_hierarchy_bld.f90 index 42c77c36..8cc25fa5 100644 --- a/mlprec/impl/mld_c_hierarchy_bld.f90 +++ b/mlprec/impl/mld_c_hierarchy_bld.f90 @@ -334,9 +334,9 @@ subroutine mld_c_hierarchy_bld(a,desc_a,prec,info) sizeratio = sum(prec%precv(i-1)%map%naggr)/sizeratio end if prec%precv(i)%szratio = sizeratio - if (iaggsize <= casize) then - newsz = i - end if + + if (iaggsize <= casize) newsz = i + if (i == iszv) newsz = i if (i>2) then if (sizeratio < mnaggratio) then diff --git a/mlprec/impl/mld_d_hierarchy_bld.f90 b/mlprec/impl/mld_d_hierarchy_bld.f90 index e0114543..2aa00c25 100644 --- a/mlprec/impl/mld_d_hierarchy_bld.f90 +++ b/mlprec/impl/mld_d_hierarchy_bld.f90 @@ -334,9 +334,9 @@ subroutine mld_d_hierarchy_bld(a,desc_a,prec,info) sizeratio = sum(prec%precv(i-1)%map%naggr)/sizeratio end if prec%precv(i)%szratio = sizeratio - if (iaggsize <= casize) then - newsz = i - end if + + if (iaggsize <= casize) newsz = i + if (i == iszv) newsz = i if (i>2) then if (sizeratio < mnaggratio) then diff --git a/mlprec/impl/mld_s_hierarchy_bld.f90 b/mlprec/impl/mld_s_hierarchy_bld.f90 index 05116b21..ca547e04 100644 --- a/mlprec/impl/mld_s_hierarchy_bld.f90 +++ b/mlprec/impl/mld_s_hierarchy_bld.f90 @@ -334,9 +334,9 @@ subroutine mld_s_hierarchy_bld(a,desc_a,prec,info) sizeratio = sum(prec%precv(i-1)%map%naggr)/sizeratio end if prec%precv(i)%szratio = sizeratio - if (iaggsize <= casize) then - newsz = i - end if + + if (iaggsize <= casize) newsz = i + if (i == iszv) newsz = i if (i>2) then if (sizeratio < mnaggratio) then diff --git a/mlprec/impl/mld_z_hierarchy_bld.f90 b/mlprec/impl/mld_z_hierarchy_bld.f90 index 66000a3e..ba2cf516 100644 --- a/mlprec/impl/mld_z_hierarchy_bld.f90 +++ b/mlprec/impl/mld_z_hierarchy_bld.f90 @@ -334,9 +334,9 @@ subroutine mld_z_hierarchy_bld(a,desc_a,prec,info) sizeratio = sum(prec%precv(i-1)%map%naggr)/sizeratio end if prec%precv(i)%szratio = sizeratio - if (iaggsize <= casize) then - newsz = i - end if + + if (iaggsize <= casize) newsz = i + if (i == iszv) newsz = i if (i>2) then if (sizeratio < mnaggratio) then