Reworked ensure_size

base/modules/auxil/psb_c_hsort_x_mod.f90

@@ -123,7 +123,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -236,9 +236,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5

base/modules/auxil/psb_c_realloc_mod.F90

@@ -1009,18 +1009,17 @@ Contains
 !!$        goto 9999
 !!$      End If
 !!$    end If
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    If (len > isz) Then
 #if defined(OPENMP)
       !$OMP CRITICAL
-      if (len > psb_size(v)) then
+      if (len > isz) then
         if (present(newsz)) then
-          isz = (max(len+1,newsz))
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz))
         else
-          if (present(addsz)) then
-            isz = len+max(1,addsz)
-          else
-            isz = max(len+10, int(1.25*len))
-          endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         call psb_realloc(isz,v,info,pad=pad)
@@ -1033,17 +1032,18 @@ Contains
 	goto 9999
       end if
 #else
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+      if (len > isz) then
+        if (present(newsz)) then
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz)
         else
-          isz = max(len+10, int(1.25*len))
+          isz = max(len,1,int(1.25*isz))
         endif
-      endif
 
-      call psb_realloc(isz,v,info,pad=pad)
+        call psb_realloc(isz,v,info,pad=pad)
+      end if
+
       if (info /= psb_success_) then
         info=psb_err_from_subroutine_
         call psb_errpush(info,name,a_err='psb_realloc')
@@ -1085,16 +1085,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
+    isz = psb_size(v)
+    If (len > isz) Then
+      if (present(newsz)) then
+        isz = max(len+1,1,newsz)
+      else if (present(addsz)) then
+        isz = max(len,1,isz+addsz)
       else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
-        else
-          isz = max(len+10, int(1.25*len))
-        endif
+        isz = max(len,1,int(1.25*isz))
       endif
 
       call psb_realloc(isz,v,info,pad=pad)

base/modules/auxil/psb_d_hsort_x_mod.f90

@@ -123,7 +123,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -236,9 +236,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5

base/modules/auxil/psb_d_realloc_mod.F90

@@ -1009,18 +1009,17 @@ Contains
 !!$        goto 9999
 !!$      End If
 !!$    end If
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    If (len > isz) Then
 #if defined(OPENMP)
       !$OMP CRITICAL
-      if (len > psb_size(v)) then
+      if (len > isz) then
         if (present(newsz)) then
-          isz = (max(len+1,newsz))
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz))
         else
-          if (present(addsz)) then
-            isz = len+max(1,addsz)
-          else
-            isz = max(len+10, int(1.25*len))
-          endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         call psb_realloc(isz,v,info,pad=pad)
@@ -1033,17 +1032,18 @@ Contains
 	goto 9999
       end if
 #else
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+      if (len > isz) then
+        if (present(newsz)) then
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz)
         else
-          isz = max(len+10, int(1.25*len))
+          isz = max(len,1,int(1.25*isz))
         endif
-      endif
 
-      call psb_realloc(isz,v,info,pad=pad)
+        call psb_realloc(isz,v,info,pad=pad)
+      end if
+
       if (info /= psb_success_) then
         info=psb_err_from_subroutine_
         call psb_errpush(info,name,a_err='psb_realloc')
@@ -1085,16 +1085,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
+    isz = psb_size(v)
+    If (len > isz) Then
+      if (present(newsz)) then
+        isz = max(len+1,1,newsz)
+      else if (present(addsz)) then
+        isz = max(len,1,isz+addsz)
       else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
-        else
-          isz = max(len+10, int(1.25*len))
-        endif
+        isz = max(len,1,int(1.25*isz))
       endif
 
       call psb_realloc(isz,v,info,pad=pad)

base/modules/auxil/psb_e_realloc_mod.F90

@@ -1009,18 +1009,17 @@ Contains
 !!$        goto 9999
 !!$      End If
 !!$    end If
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    If (len > isz) Then
 #if defined(OPENMP)
       !$OMP CRITICAL
-      if (len > psb_size(v)) then
+      if (len > isz) then
         if (present(newsz)) then
-          isz = (max(len+1,newsz))
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz))
         else
-          if (present(addsz)) then
-            isz = len+max(1,addsz)
-          else
-            isz = max(len+10, int(1.25*len))
-          endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         call psb_realloc(isz,v,info,pad=pad)
@@ -1033,17 +1032,18 @@ Contains
 	goto 9999
       end if
 #else
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+      if (len > isz) then
+        if (present(newsz)) then
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz)
         else
-          isz = max(len+10, int(1.25*len))
+          isz = max(len,1,int(1.25*isz))
         endif
-      endif
 
-      call psb_realloc(isz,v,info,pad=pad)
+        call psb_realloc(isz,v,info,pad=pad)
+      end if
+
       if (info /= psb_success_) then
         info=psb_err_from_subroutine_
         call psb_errpush(info,name,a_err='psb_realloc')
@@ -1085,16 +1085,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
+    isz = psb_size(v)
+    If (len > isz) Then
+      if (present(newsz)) then
+        isz = max(len+1,1,newsz)
+      else if (present(addsz)) then
+        isz = max(len,1,isz+addsz)
       else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
-        else
-          isz = max(len+10, int(1.25*len))
-        endif
+        isz = max(len,1,int(1.25*isz))
       endif
 
       call psb_realloc(isz,v,info,pad=pad)

base/modules/auxil/psb_i2_realloc_mod.F90

@@ -1009,18 +1009,17 @@ Contains
 !!$        goto 9999
 !!$      End If
 !!$    end If
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    If (len > isz) Then
 #if defined(OPENMP)
       !$OMP CRITICAL
-      if (len > psb_size(v)) then
+      if (len > isz) then
         if (present(newsz)) then
-          isz = (max(len+1,newsz))
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz))
         else
-          if (present(addsz)) then
-            isz = len+max(1,addsz)
-          else
-            isz = max(len+10, int(1.25*len))
-          endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         call psb_realloc(isz,v,info,pad=pad)
@@ -1033,17 +1032,18 @@ Contains
 	goto 9999
       end if
 #else
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+      if (len > isz) then
+        if (present(newsz)) then
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz)
         else
-          isz = max(len+10, int(1.25*len))
+          isz = max(len,1,int(1.25*isz))
         endif
-      endif
 
-      call psb_realloc(isz,v,info,pad=pad)
+        call psb_realloc(isz,v,info,pad=pad)
+      end if
+
       if (info /= psb_success_) then
         info=psb_err_from_subroutine_
         call psb_errpush(info,name,a_err='psb_realloc')
@@ -1085,16 +1085,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
+    isz = psb_size(v)
+    If (len > isz) Then
+      if (present(newsz)) then
+        isz = max(len+1,1,newsz)
+      else if (present(addsz)) then
+        isz = max(len,1,isz+addsz)
       else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
-        else
-          isz = max(len+10, int(1.25*len))
-        endif
+        isz = max(len,1,int(1.25*isz))
       endif
 
       call psb_realloc(isz,v,info,pad=pad)

base/modules/auxil/psb_i_hsort_x_mod.f90

@@ -124,7 +124,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -237,9 +237,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5

base/modules/auxil/psb_l_hsort_x_mod.f90

@@ -124,7 +124,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_lpk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -237,9 +237,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_lpk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_lpk_)*psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5

base/modules/auxil/psb_m_realloc_mod.F90

@@ -1009,18 +1009,17 @@ Contains
 !!$        goto 9999
 !!$      End If
 !!$    end If
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    If (len > isz) Then
 #if defined(OPENMP)
       !$OMP CRITICAL
-      if (len > psb_size(v)) then
+      if (len > isz) then
         if (present(newsz)) then
-          isz = (max(len+1,newsz))
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz))
         else
-          if (present(addsz)) then
-            isz = len+max(1,addsz)
-          else
-            isz = max(len+10, int(1.25*len))
-          endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         call psb_realloc(isz,v,info,pad=pad)
@@ -1033,17 +1032,18 @@ Contains
 	goto 9999
       end if
 #else
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+      if (len > isz) then
+        if (present(newsz)) then
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz)
         else
-          isz = max(len+10, int(1.25*len))
+          isz = max(len,1,int(1.25*isz))
         endif
-      endif
 
-      call psb_realloc(isz,v,info,pad=pad)
+        call psb_realloc(isz,v,info,pad=pad)
+      end if
+
       if (info /= psb_success_) then
         info=psb_err_from_subroutine_
         call psb_errpush(info,name,a_err='psb_realloc')
@@ -1085,16 +1085,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
+    isz = psb_size(v)
+    If (len > isz) Then
+      if (present(newsz)) then
+        isz = max(len+1,1,newsz)
+      else if (present(addsz)) then
+        isz = max(len,1,isz+addsz)
       else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
-        else
-          isz = max(len+10, int(1.25*len))
-        endif
+        isz = max(len,1,int(1.25*isz))
       endif
 
       call psb_realloc(isz,v,info,pad=pad)

base/modules/auxil/psb_s_hsort_x_mod.f90

@@ -123,7 +123,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -236,9 +236,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5

base/modules/auxil/psb_s_realloc_mod.F90

@@ -1009,18 +1009,17 @@ Contains
 !!$        goto 9999
 !!$      End If
 !!$    end If
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    If (len > isz) Then
 #if defined(OPENMP)
       !$OMP CRITICAL
-      if (len > psb_size(v)) then
+      if (len > isz) then
         if (present(newsz)) then
-          isz = (max(len+1,newsz))
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz))
         else
-          if (present(addsz)) then
-            isz = len+max(1,addsz)
-          else
-            isz = max(len+10, int(1.25*len))
-          endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         call psb_realloc(isz,v,info,pad=pad)
@@ -1033,17 +1032,18 @@ Contains
 	goto 9999
       end if
 #else
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+      if (len > isz) then
+        if (present(newsz)) then
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz)
         else
-          isz = max(len+10, int(1.25*len))
+          isz = max(len,1,int(1.25*isz))
         endif
-      endif
 
-      call psb_realloc(isz,v,info,pad=pad)
+        call psb_realloc(isz,v,info,pad=pad)
+      end if
+
       if (info /= psb_success_) then
         info=psb_err_from_subroutine_
         call psb_errpush(info,name,a_err='psb_realloc')
@@ -1085,16 +1085,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
+    isz = psb_size(v)
+    If (len > isz) Then
+      if (present(newsz)) then
+        isz = max(len+1,1,newsz)
+      else if (present(addsz)) then
+        isz = max(len,1,isz+addsz)
       else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
-        else
-          isz = max(len+10, int(1.25*len))
-        endif
+        isz = max(len,1,int(1.25*isz))
       endif
 
       call psb_realloc(isz,v,info,pad=pad)

base/modules/auxil/psb_z_hsort_x_mod.f90

@@ -123,7 +123,7 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5
@@ -236,9 +236,9 @@ contains
       return
     endif
 
-    call psb_ensure_size(heap%last+1,heap%keys,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+    call psb_ensure_size(heap%last+1,heap%keys,info)
     if (info == psb_success_) &
-         & call psb_ensure_size(heap%last+1,heap%idxs,info,addsz=(1_psb_ipk_)*psb_heap_resize)
+         & call psb_ensure_size(heap%last+1,heap%idxs,info)
     if (info /= psb_success_) then 
       write(psb_err_unit,*) 'Memory allocation failure in heap_insert'
       info = -5

base/modules/auxil/psb_z_realloc_mod.F90

@@ -1009,18 +1009,17 @@ Contains
 !!$        goto 9999
 !!$      End If
 !!$    end If
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    If (len > isz) Then
 #if defined(OPENMP)
       !$OMP CRITICAL
-      if (len > psb_size(v)) then
+      if (len > isz) then
         if (present(newsz)) then
-          isz = (max(len+1,newsz))
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz))
         else
-          if (present(addsz)) then
-            isz = len+max(1,addsz)
-          else
-            isz = max(len+10, int(1.25*len))
-          endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         call psb_realloc(isz,v,info,pad=pad)
@@ -1033,17 +1032,18 @@ Contains
 	goto 9999
       end if
 #else
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+      if (len > isz) then
+        if (present(newsz)) then
+          isz = max(len+1,1,newsz)
+        else if (present(addsz)) then
+          isz = max(len,1,isz+addsz)
         else
-          isz = max(len+10, int(1.25*len))
+          isz = max(len,1,int(1.25*isz))
         endif
-      endif
 
-      call psb_realloc(isz,v,info,pad=pad)
+        call psb_realloc(isz,v,info,pad=pad)
+      end if
+
       if (info /= psb_success_) then
         info=psb_err_from_subroutine_
         call psb_errpush(info,name,a_err='psb_realloc')
@@ -1085,16 +1085,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
-      if (present(newsz)) then 
-        isz = (max(len+1,newsz))
+    isz = psb_size(v)
+    If (len > isz) Then
+      if (present(newsz)) then
+        isz = max(len+1,1,newsz)
+      else if (present(addsz)) then
+        isz = max(len,1,isz+addsz)
       else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
-        else
-          isz = max(len+10, int(1.25*len))
-        endif
+        isz = max(len,1,int(1.25*isz))
       endif
 
       call psb_realloc(isz,v,info,pad=pad)