mld2p4;

mlprec/impl/mld_c_hierarchy_bld.f90
 mlprec/impl/mld_cprecbld.f90
 mlprec/impl/mld_d_hierarchy_bld.f90
 mlprec/impl/mld_dprecbld.f90
 mlprec/impl/mld_s_hierarchy_bld.f90
 mlprec/impl/mld_sprecbld.f90
 mlprec/impl/mld_z_hierarchy_bld.f90
 mlprec/impl/mld_zprecbld.f90
 mlprec/mld_c_prec_type.f90
 mlprec/mld_d_prec_type.f90
 mlprec/mld_s_prec_type.f90
 mlprec/mld_z_prec_type.f90

Fix operator complexity computation.

mlprec/impl/mld_c_hierarchy_bld.f90

@@ -403,6 +403,8 @@ subroutine mld_c_hierarchy_bld(a,desc_a,p,info)
 
   iszv = size(p%precv)
 
+  call p%cmp_complexity()
+
   if (debug_level >= psb_debug_outer_) &
        & write(debug_unit,*) me,' ',trim(name),&
        & 'Exiting with',iszv,' levels'

mlprec/impl/mld_cprecbld.f90

@@ -199,8 +199,6 @@ subroutine mld_cprecbld(a,desc_a,p,info,amold,vmold,imold)
     endif
   end if
   
-  call p%cmp_complexity()
-
   call psb_erractionrestore(err_act)
   return
 

mlprec/impl/mld_d_hierarchy_bld.f90

@@ -403,6 +403,8 @@ subroutine mld_d_hierarchy_bld(a,desc_a,p,info)
 
   iszv = size(p%precv)
 
+  call p%cmp_complexity()
+
   if (debug_level >= psb_debug_outer_) &
        & write(debug_unit,*) me,' ',trim(name),&
        & 'Exiting with',iszv,' levels'

mlprec/impl/mld_dprecbld.f90

@@ -199,8 +199,6 @@ subroutine mld_dprecbld(a,desc_a,p,info,amold,vmold,imold)
     endif
   end if
   
-  call p%cmp_complexity()
-
   call psb_erractionrestore(err_act)
   return
 

mlprec/impl/mld_s_hierarchy_bld.f90

@@ -403,6 +403,8 @@ subroutine mld_s_hierarchy_bld(a,desc_a,p,info)
 
   iszv = size(p%precv)
 
+  call p%cmp_complexity()
+
   if (debug_level >= psb_debug_outer_) &
        & write(debug_unit,*) me,' ',trim(name),&
        & 'Exiting with',iszv,' levels'

mlprec/impl/mld_sprecbld.f90

@@ -199,8 +199,6 @@ subroutine mld_sprecbld(a,desc_a,p,info,amold,vmold,imold)
     endif
   end if
   
-  call p%cmp_complexity()
-
   call psb_erractionrestore(err_act)
   return
 

mlprec/impl/mld_z_hierarchy_bld.f90

@@ -403,6 +403,8 @@ subroutine mld_z_hierarchy_bld(a,desc_a,p,info)
 
   iszv = size(p%precv)
 
+  call p%cmp_complexity()
+
   if (debug_level >= psb_debug_outer_) &
        & write(debug_unit,*) me,' ',trim(name),&
        & 'Exiting with',iszv,' levels'

mlprec/impl/mld_zprecbld.f90

@@ -199,8 +199,6 @@ subroutine mld_zprecbld(a,desc_a,p,info,amold,vmold,imold)
     endif
   end if
   
-  call p%cmp_complexity()
-
   call psb_erractionrestore(err_act)
   return
 

mlprec/mld_c_prec_type.f90

@@ -391,12 +391,12 @@ contains
     implicit none 
     class(mld_cprec_type), intent(inout) :: prec
     
-    real(psb_spk_) :: num,den
+    real(psb_spk_) :: num, den, nmin
     integer(psb_ipk_) :: ictxt 
     integer(psb_ipk_)  :: il 
 
-    num = -done
-    den = done
+    num = -sone
+    den = sone
     ictxt = prec%ictxt
     if (allocated(prec%precv)) then 
       il  = 1
@@ -408,9 +408,11 @@ contains
         end do
       end if
     end if
-    call psb_min(ictxt,num) 
-    if (num < szero) then 
-      den = done
+    nmin = num
+    call psb_min(ictxt,nmin) 
+    if (nmin < szero) then
+      num = szero
+      den = sone
     else
       call psb_sum(ictxt,num)
       call psb_sum(ictxt,den)

mlprec/mld_d_prec_type.f90

@@ -391,7 +391,7 @@ contains
     implicit none 
     class(mld_dprec_type), intent(inout) :: prec
     
-    real(psb_dpk_) :: num,den
+    real(psb_dpk_) :: num, den, nmin
     integer(psb_ipk_) :: ictxt 
     integer(psb_ipk_)  :: il 
 
@@ -408,8 +408,10 @@ contains
         end do
       end if
     end if
-    call psb_min(ictxt,num) 
-    if (num < dzero) then 
+    nmin = num
+    call psb_min(ictxt,nmin) 
+    if (nmin < dzero) then
+      num = dzero
       den = done
     else
       call psb_sum(ictxt,num)

mlprec/mld_s_prec_type.f90

@@ -391,12 +391,12 @@ contains
     implicit none 
     class(mld_sprec_type), intent(inout) :: prec
     
-    real(psb_spk_) :: num,den
+    real(psb_spk_) :: num, den, nmin
     integer(psb_ipk_) :: ictxt 
     integer(psb_ipk_)  :: il 
 
-    num = -done
-    den = done
+    num = -sone
+    den = sone
     ictxt = prec%ictxt
     if (allocated(prec%precv)) then 
       il  = 1
@@ -408,9 +408,11 @@ contains
         end do
       end if
     end if
-    call psb_min(ictxt,num) 
-    if (num < szero) then 
-      den = done
+    nmin = num
+    call psb_min(ictxt,nmin) 
+    if (nmin < szero) then
+      num = szero
+      den = sone
     else
       call psb_sum(ictxt,num)
       call psb_sum(ictxt,den)

mlprec/mld_z_prec_type.f90

@@ -391,7 +391,7 @@ contains
     implicit none 
     class(mld_zprec_type), intent(inout) :: prec
     
-    real(psb_dpk_) :: num,den
+    real(psb_dpk_) :: num, den, nmin
     integer(psb_ipk_) :: ictxt 
     integer(psb_ipk_)  :: il 
 
@@ -408,8 +408,10 @@ contains
         end do
       end if
     end if
-    call psb_min(ictxt,num) 
-    if (num < dzero) then 
+    nmin = num
+    call psb_min(ictxt,nmin) 
+    if (nmin < dzero) then
+      num = dzero
       den = done
     else
       call psb_sum(ictxt,num)