Improve coo and merge development

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

@@ -790,7 +790,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:) = vin(:)
+        !$omp end workshare
       endif
     endif
 
@@ -836,7 +838,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:,:) = vin(:,:)
+        !$omp end workshare
       endif
     endif
 
@@ -1009,18 +1013,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 +1036,18 @@ Contains
 	goto 9999
       end if
 #else
+      if (len > isz) then
         if (present(newsz)) then
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+          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))
-        endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         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 +1089,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    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)

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

@@ -790,7 +790,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:) = vin(:)
+        !$omp end workshare
       endif
     endif
 
@@ -836,7 +838,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:,:) = vin(:,:)
+        !$omp end workshare
       endif
     endif
 
@@ -1009,18 +1013,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 +1036,18 @@ Contains
 	goto 9999
       end if
 #else
+      if (len > isz) then
         if (present(newsz)) then
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+          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))
-        endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         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 +1089,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    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)

base/modules/auxil/psb_e_realloc_mod.F90

@@ -790,7 +790,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:) = vin(:)
+        !$omp end workshare
       endif
     endif
 
@@ -836,7 +838,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:,:) = vin(:,:)
+        !$omp end workshare
       endif
     endif
 
@@ -1009,18 +1013,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 +1036,18 @@ Contains
 	goto 9999
       end if
 #else
+      if (len > isz) then
         if (present(newsz)) then
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+          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))
-        endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         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 +1089,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    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)

base/modules/auxil/psb_i2_realloc_mod.F90

@@ -790,7 +790,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:) = vin(:)
+        !$omp end workshare
       endif
     endif
 
@@ -836,7 +838,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:,:) = vin(:,:)
+        !$omp end workshare
       endif
     endif
 
@@ -1009,18 +1013,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 +1036,18 @@ Contains
 	goto 9999
       end if
 #else
+      if (len > isz) then
         if (present(newsz)) then
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+          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))
-        endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         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 +1089,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    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)

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

@@ -790,7 +790,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:) = vin(:)
+        !$omp end workshare
       endif
     endif
 
@@ -836,7 +838,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:,:) = vin(:,:)
+        !$omp end workshare
       endif
     endif
 
@@ -1009,18 +1013,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 +1036,18 @@ Contains
 	goto 9999
       end if
 #else
+      if (len > isz) then
         if (present(newsz)) then
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+          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))
-        endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         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 +1089,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    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)

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

@@ -790,7 +790,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:) = vin(:)
+        !$omp end workshare
       endif
     endif
 
@@ -836,7 +838,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:,:) = vin(:,:)
+        !$omp end workshare
       endif
     endif
 
@@ -1009,18 +1013,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 +1036,18 @@ Contains
 	goto 9999
       end if
 #else
+      if (len > isz) then
         if (present(newsz)) then
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+          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))
-        endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         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 +1089,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    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)

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

@@ -790,7 +790,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:) = vin(:)
+        !$omp end workshare
       endif
     endif
 
@@ -836,7 +838,9 @@ Contains
         call psb_errpush(info,name,a_err=char_err)
         goto 9999
       else
+        !$omp workshare
         vout(:,:) = vin(:,:)
+        !$omp end workshare
       endif
     endif
 
@@ -1009,18 +1013,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 +1036,18 @@ Contains
 	goto 9999
       end if
 #else
+      if (len > isz) then
         if (present(newsz)) then
-        isz = (max(len+1,newsz))
-      else
-        if (present(addsz)) then 
-          isz = len+max(1,addsz)
+          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))
-        endif
+          isz = max(len,1,int(1.25*isz))
         endif
 
         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 +1089,14 @@ Contains
       info=psb_err_from_subroutine_
       goto 9999
     end if
-
-    If (len > psb_size(v)) Then
+    isz = psb_size(v)
+    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)

base/serial/impl/psb_c_coo_impl.F90

@@ -4563,7 +4563,7 @@ function psb_lc_coo_maxval(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, nnz
       res = max(res,abs(a%val(i)))
     end do
@@ -4630,7 +4630,7 @@ function psb_lc_coo_csnmi(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, m
       res = max(res,abs(vt(i)))
     end do
@@ -4680,7 +4680,7 @@ function psb_lc_coo_csnm1(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, n
       res = max(res,abs(vt(i)))
     end do

base/serial/impl/psb_d_coo_impl.F90

@@ -4563,7 +4563,7 @@ function psb_ld_coo_maxval(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, nnz
       res = max(res,abs(a%val(i)))
     end do
@@ -4630,7 +4630,7 @@ function psb_ld_coo_csnmi(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, m
       res = max(res,abs(vt(i)))
     end do
@@ -4680,7 +4680,7 @@ function psb_ld_coo_csnm1(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, n
       res = max(res,abs(vt(i)))
     end do

base/serial/impl/psb_s_coo_impl.F90

@@ -4563,7 +4563,7 @@ function psb_ls_coo_maxval(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, nnz
       res = max(res,abs(a%val(i)))
     end do
@@ -4630,7 +4630,7 @@ function psb_ls_coo_csnmi(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, m
       res = max(res,abs(vt(i)))
     end do
@@ -4680,7 +4680,7 @@ function psb_ls_coo_csnm1(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, n
       res = max(res,abs(vt(i)))
     end do

base/serial/impl/psb_z_coo_impl.F90

@@ -4563,7 +4563,7 @@ function psb_lz_coo_maxval(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, nnz
       res = max(res,abs(a%val(i)))
     end do
@@ -4630,7 +4630,7 @@ function psb_lz_coo_csnmi(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, m
       res = max(res,abs(vt(i)))
     end do
@@ -4680,7 +4680,7 @@ function psb_lz_coo_csnm1(a) result(res)
 #if defined(OPENMP)
   block
     integer(psb_ipk_) :: i
-    !$omp parallel do private(i)
+    !$omp parallel do private(i) reduction(max:res)
     do i=1, n
       res = max(res,abs(vt(i)))
     end do