Limit reallocation to NR or NC

6 years ago · fcc8a88112
parent 5ae90a0dae
commit fcc8a88112
8 changed files with 12 additions and 12 deletions
--- a/base/serial/impl/psb_c_csc_impl.f90
+++ b/base/serial/impl/psb_c_csc_impl.f90
@ -2298,7 +2298,7 @@ subroutine psb_c_mv_csc_from_coo(a,b,info)
  call move_alloc(b%ja,itemp)
  call move_alloc(b%ia,a%ia)
  call move_alloc(b%val,a%val)
-  call psb_realloc(max(nr+1,nc+1),a%icp,info)
+  call psb_realloc(nc+1,a%icp,info)
  call b%free()

  a%icp(:) = 0
--- a/base/serial/impl/psb_c_csr_impl.f90
+++ b/base/serial/impl/psb_c_csr_impl.f90
@ -2960,7 +2960,7 @@ subroutine psb_c_cp_csr_from_coo(a,b,info)
    call move_alloc(tmp%ia,itemp)
    call move_alloc(tmp%ja,a%ja)
    call move_alloc(tmp%val,a%val)
-    call psb_realloc(max(nr+1,nc+1),a%irp,info)
+    call psb_realloc(nr+1,a%irp,info)
    call tmp%free()

  else
@ -3129,7 +3129,7 @@ subroutine psb_c_mv_csr_from_coo(a,b,info)
  call move_alloc(b%ia,itemp)
  call move_alloc(b%ja,a%ja)
  call move_alloc(b%val,a%val)
-  call psb_realloc(max(nr+1,nc+1),a%irp,info)
+  call psb_realloc(nr+1,a%irp,info)
  call b%free()


--- a/base/serial/impl/psb_d_csc_impl.f90
+++ b/base/serial/impl/psb_d_csc_impl.f90
@ -2298,7 +2298,7 @@ subroutine psb_d_mv_csc_from_coo(a,b,info)
  call move_alloc(b%ja,itemp)
  call move_alloc(b%ia,a%ia)
  call move_alloc(b%val,a%val)
-  call psb_realloc(max(nr+1,nc+1),a%icp,info)
+  call psb_realloc(nc+1,a%icp,info)
  call b%free()

  a%icp(:) = 0
--- a/base/serial/impl/psb_d_csr_impl.f90
+++ b/base/serial/impl/psb_d_csr_impl.f90
@ -2960,7 +2960,7 @@ subroutine psb_d_cp_csr_from_coo(a,b,info)
    call move_alloc(tmp%ia,itemp)
    call move_alloc(tmp%ja,a%ja)
    call move_alloc(tmp%val,a%val)
-    call psb_realloc(max(nr+1,nc+1),a%irp,info)
+    call psb_realloc(nr+1,a%irp,info)
    call tmp%free()

  else
@ -3129,7 +3129,7 @@ subroutine psb_d_mv_csr_from_coo(a,b,info)
  call move_alloc(b%ia,itemp)
  call move_alloc(b%ja,a%ja)
  call move_alloc(b%val,a%val)
-  call psb_realloc(max(nr+1,nc+1),a%irp,info)
+  call psb_realloc(nr+1,a%irp,info)
  call b%free()


--- a/base/serial/impl/psb_s_csc_impl.f90
+++ b/base/serial/impl/psb_s_csc_impl.f90
@ -2298,7 +2298,7 @@ subroutine psb_s_mv_csc_from_coo(a,b,info)
  call move_alloc(b%ja,itemp)
  call move_alloc(b%ia,a%ia)
  call move_alloc(b%val,a%val)
-  call psb_realloc(max(nr+1,nc+1),a%icp,info)
+  call psb_realloc(nc+1,a%icp,info)
  call b%free()

  a%icp(:) = 0
--- a/base/serial/impl/psb_s_csr_impl.f90
+++ b/base/serial/impl/psb_s_csr_impl.f90
@ -2960,7 +2960,7 @@ subroutine psb_s_cp_csr_from_coo(a,b,info)
    call move_alloc(tmp%ia,itemp)
    call move_alloc(tmp%ja,a%ja)
    call move_alloc(tmp%val,a%val)
-    call psb_realloc(max(nr+1,nc+1),a%irp,info)
+    call psb_realloc(nr+1,a%irp,info)
    call tmp%free()

  else
@ -3129,7 +3129,7 @@ subroutine psb_s_mv_csr_from_coo(a,b,info)
  call move_alloc(b%ia,itemp)
  call move_alloc(b%ja,a%ja)
  call move_alloc(b%val,a%val)
-  call psb_realloc(max(nr+1,nc+1),a%irp,info)
+  call psb_realloc(nr+1,a%irp,info)
  call b%free()


--- a/base/serial/impl/psb_z_csc_impl.f90
+++ b/base/serial/impl/psb_z_csc_impl.f90
@ -2298,7 +2298,7 @@ subroutine psb_z_mv_csc_from_coo(a,b,info)
  call move_alloc(b%ja,itemp)
  call move_alloc(b%ia,a%ia)
  call move_alloc(b%val,a%val)
-  call psb_realloc(max(nr+1,nc+1),a%icp,info)
+  call psb_realloc(nc+1,a%icp,info)
  call b%free()

  a%icp(:) = 0
--- a/base/serial/impl/psb_z_csr_impl.f90
+++ b/base/serial/impl/psb_z_csr_impl.f90
@ -2960,7 +2960,7 @@ subroutine psb_z_cp_csr_from_coo(a,b,info)
    call move_alloc(tmp%ia,itemp)
    call move_alloc(tmp%ja,a%ja)
    call move_alloc(tmp%val,a%val)
-    call psb_realloc(max(nr+1,nc+1),a%irp,info)
+    call psb_realloc(nr+1,a%irp,info)
    call tmp%free()

  else
@ -3129,7 +3129,7 @@ subroutine psb_z_mv_csr_from_coo(a,b,info)
  call move_alloc(b%ia,itemp)
  call move_alloc(b%ja,a%ja)
  call move_alloc(b%val,a%val)
-  call psb_realloc(max(nr+1,nc+1),a%irp,info)
+  call psb_realloc(nr+1,a%irp,info)
  call b%free()