Stop criterion for aggregation.

5 years ago · d2264f5f11
parent 8e2af97a35
commit d2264f5f11
4 changed files with 12 additions and 12 deletions
--- 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
--- 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
--- 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
--- 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