From 58059aaa9fc99732bf563e2ebc242490057d7a7f Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 31 May 2016 17:18:49 +0000 Subject: [PATCH] psblas3: base/modules/psb_c_base_mat_mod.f90 base/modules/psb_c_csc_mat_mod.f90 base/modules/psb_c_csr_mat_mod.f90 base/modules/psb_d_base_mat_mod.f90 base/modules/psb_d_csc_mat_mod.f90 base/modules/psb_d_csr_mat_mod.f90 base/modules/psb_s_base_mat_mod.f90 base/modules/psb_s_csc_mat_mod.f90 base/modules/psb_s_csr_mat_mod.f90 base/modules/psb_z_base_mat_mod.f90 base/modules/psb_z_csc_mat_mod.f90 base/modules/psb_z_csr_mat_mod.f90 Use psb_size to guard against unallocated ALLOCATABLE components. --- base/modules/psb_c_base_mat_mod.f90 | 6 +++--- base/modules/psb_c_csc_mat_mod.f90 | 6 +++--- base/modules/psb_c_csr_mat_mod.f90 | 6 +++--- base/modules/psb_d_base_mat_mod.f90 | 6 +++--- base/modules/psb_d_csc_mat_mod.f90 | 6 +++--- base/modules/psb_d_csr_mat_mod.f90 | 6 +++--- base/modules/psb_s_base_mat_mod.f90 | 6 +++--- base/modules/psb_s_csc_mat_mod.f90 | 6 +++--- base/modules/psb_s_csr_mat_mod.f90 | 6 +++--- base/modules/psb_z_base_mat_mod.f90 | 6 +++--- base/modules/psb_z_csc_mat_mod.f90 | 6 +++--- base/modules/psb_z_csr_mat_mod.f90 | 6 +++--- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/base/modules/psb_c_base_mat_mod.f90 b/base/modules/psb_c_base_mat_mod.f90 index 21f1a133..2959bc45 100644 --- a/base/modules/psb_c_base_mat_mod.f90 +++ b/base/modules/psb_c_base_mat_mod.f90 @@ -1752,9 +1752,9 @@ contains class(psb_c_coo_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 + 1 - res = res + (2*psb_sizeof_sp) * size(a%val) - res = res + psb_sizeof_int * size(a%ia) - res = res + psb_sizeof_int * size(a%ja) + res = res + (2*psb_sizeof_sp) * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%ia) + res = res + psb_sizeof_int * psb_size(a%ja) end function c_coo_sizeof diff --git a/base/modules/psb_c_csc_mat_mod.f90 b/base/modules/psb_c_csc_mat_mod.f90 index d1015938..5819fe3e 100644 --- a/base/modules/psb_c_csc_mat_mod.f90 +++ b/base/modules/psb_c_csc_mat_mod.f90 @@ -521,9 +521,9 @@ contains class(psb_c_csc_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 - res = res + (2*psb_sizeof_sp) * size(a%val) - res = res + psb_sizeof_int * size(a%icp) - res = res + psb_sizeof_int * size(a%ia) + res = res + (2*psb_sizeof_sp) * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%icp) + res = res + psb_sizeof_int * psb_size(a%ia) end function c_csc_sizeof diff --git a/base/modules/psb_c_csr_mat_mod.f90 b/base/modules/psb_c_csr_mat_mod.f90 index bf1dd8eb..ee7c210d 100644 --- a/base/modules/psb_c_csr_mat_mod.f90 +++ b/base/modules/psb_c_csr_mat_mod.f90 @@ -526,9 +526,9 @@ contains class(psb_c_csr_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 - res = res + (2*psb_sizeof_sp) * size(a%val) - res = res + psb_sizeof_int * size(a%irp) - res = res + psb_sizeof_int * size(a%ja) + res = res + (2*psb_sizeof_sp) * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%irp) + res = res + psb_sizeof_int * psb_size(a%ja) end function c_csr_sizeof diff --git a/base/modules/psb_d_base_mat_mod.f90 b/base/modules/psb_d_base_mat_mod.f90 index 67125d23..639755f6 100644 --- a/base/modules/psb_d_base_mat_mod.f90 +++ b/base/modules/psb_d_base_mat_mod.f90 @@ -1752,9 +1752,9 @@ contains class(psb_d_coo_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 + 1 - res = res + psb_sizeof_dp * size(a%val) - res = res + psb_sizeof_int * size(a%ia) - res = res + psb_sizeof_int * size(a%ja) + res = res + psb_sizeof_dp * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%ia) + res = res + psb_sizeof_int * psb_size(a%ja) end function d_coo_sizeof diff --git a/base/modules/psb_d_csc_mat_mod.f90 b/base/modules/psb_d_csc_mat_mod.f90 index 0bc62a62..cbbd82c6 100644 --- a/base/modules/psb_d_csc_mat_mod.f90 +++ b/base/modules/psb_d_csc_mat_mod.f90 @@ -521,9 +521,9 @@ contains class(psb_d_csc_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 - res = res + psb_sizeof_dp * size(a%val) - res = res + psb_sizeof_int * size(a%icp) - res = res + psb_sizeof_int * size(a%ia) + res = res + psb_sizeof_dp * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%icp) + res = res + psb_sizeof_int * psb_size(a%ia) end function d_csc_sizeof diff --git a/base/modules/psb_d_csr_mat_mod.f90 b/base/modules/psb_d_csr_mat_mod.f90 index a6c573b8..f6a954b3 100644 --- a/base/modules/psb_d_csr_mat_mod.f90 +++ b/base/modules/psb_d_csr_mat_mod.f90 @@ -526,9 +526,9 @@ contains class(psb_d_csr_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 - res = res + psb_sizeof_dp * size(a%val) - res = res + psb_sizeof_int * size(a%irp) - res = res + psb_sizeof_int * size(a%ja) + res = res + psb_sizeof_dp * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%irp) + res = res + psb_sizeof_int * psb_size(a%ja) end function d_csr_sizeof diff --git a/base/modules/psb_s_base_mat_mod.f90 b/base/modules/psb_s_base_mat_mod.f90 index 4b48415e..7f3dbd83 100644 --- a/base/modules/psb_s_base_mat_mod.f90 +++ b/base/modules/psb_s_base_mat_mod.f90 @@ -1752,9 +1752,9 @@ contains class(psb_s_coo_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 + 1 - res = res + psb_sizeof_sp * size(a%val) - res = res + psb_sizeof_int * size(a%ia) - res = res + psb_sizeof_int * size(a%ja) + res = res + psb_sizeof_sp * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%ia) + res = res + psb_sizeof_int * psb_size(a%ja) end function s_coo_sizeof diff --git a/base/modules/psb_s_csc_mat_mod.f90 b/base/modules/psb_s_csc_mat_mod.f90 index e9effe27..121b03b6 100644 --- a/base/modules/psb_s_csc_mat_mod.f90 +++ b/base/modules/psb_s_csc_mat_mod.f90 @@ -521,9 +521,9 @@ contains class(psb_s_csc_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 - res = res + psb_sizeof_sp * size(a%val) - res = res + psb_sizeof_int * size(a%icp) - res = res + psb_sizeof_int * size(a%ia) + res = res + psb_sizeof_sp * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%icp) + res = res + psb_sizeof_int * psb_size(a%ia) end function s_csc_sizeof diff --git a/base/modules/psb_s_csr_mat_mod.f90 b/base/modules/psb_s_csr_mat_mod.f90 index 87b305d1..1d65b484 100644 --- a/base/modules/psb_s_csr_mat_mod.f90 +++ b/base/modules/psb_s_csr_mat_mod.f90 @@ -526,9 +526,9 @@ contains class(psb_s_csr_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 - res = res + psb_sizeof_sp * size(a%val) - res = res + psb_sizeof_int * size(a%irp) - res = res + psb_sizeof_int * size(a%ja) + res = res + psb_sizeof_sp * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%irp) + res = res + psb_sizeof_int * psb_size(a%ja) end function s_csr_sizeof diff --git a/base/modules/psb_z_base_mat_mod.f90 b/base/modules/psb_z_base_mat_mod.f90 index cd63ba2a..5b3cbcfa 100644 --- a/base/modules/psb_z_base_mat_mod.f90 +++ b/base/modules/psb_z_base_mat_mod.f90 @@ -1752,9 +1752,9 @@ contains class(psb_z_coo_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 + 1 - res = res + (2*psb_sizeof_dp) * size(a%val) - res = res + psb_sizeof_int * size(a%ia) - res = res + psb_sizeof_int * size(a%ja) + res = res + (2*psb_sizeof_dp) * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%ia) + res = res + psb_sizeof_int * psb_size(a%ja) end function z_coo_sizeof diff --git a/base/modules/psb_z_csc_mat_mod.f90 b/base/modules/psb_z_csc_mat_mod.f90 index 027cab63..1c737134 100644 --- a/base/modules/psb_z_csc_mat_mod.f90 +++ b/base/modules/psb_z_csc_mat_mod.f90 @@ -521,9 +521,9 @@ contains class(psb_z_csc_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 - res = res + (2*psb_sizeof_dp) * size(a%val) - res = res + psb_sizeof_int * size(a%icp) - res = res + psb_sizeof_int * size(a%ia) + res = res + (2*psb_sizeof_dp) * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%icp) + res = res + psb_sizeof_int * psb_size(a%ia) end function z_csc_sizeof diff --git a/base/modules/psb_z_csr_mat_mod.f90 b/base/modules/psb_z_csr_mat_mod.f90 index 604b0e7c..5819f180 100644 --- a/base/modules/psb_z_csr_mat_mod.f90 +++ b/base/modules/psb_z_csr_mat_mod.f90 @@ -526,9 +526,9 @@ contains class(psb_z_csr_sparse_mat), intent(in) :: a integer(psb_long_int_k_) :: res res = 8 - res = res + (2*psb_sizeof_dp) * size(a%val) - res = res + psb_sizeof_int * size(a%irp) - res = res + psb_sizeof_int * size(a%ja) + res = res + (2*psb_sizeof_dp) * psb_size(a%val) + res = res + psb_sizeof_int * psb_size(a%irp) + res = res + psb_sizeof_int * psb_size(a%ja) end function z_csr_sizeof