From 38ff4f56dd27aa60c40b8684dee05da174a08bea Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Wed, 4 Dec 2013 09:49:36 +0000
Subject: [PATCH] psblas3:  base/serial/impl/psb_c_coo_impl.f90 
 base/serial/impl/psb_c_csc_impl.f90  base/serial/impl/psb_c_csr_impl.f90 
 base/serial/impl/psb_d_coo_impl.f90  base/serial/impl/psb_d_csc_impl.f90 
 base/serial/impl/psb_d_csr_impl.f90  base/serial/impl/psb_s_coo_impl.f90 
 base/serial/impl/psb_s_csc_impl.f90  base/serial/impl/psb_s_csr_impl.f90 
 base/serial/impl/psb_z_coo_impl.f90  base/serial/impl/psb_z_csc_impl.f90 
 base/serial/impl/psb_z_csr_impl.f90

Cleaner fix for early return from getptn and getrow.
---
 base/serial/impl/psb_c_coo_impl.f90 | 17 ++++++-----------
 base/serial/impl/psb_c_csc_impl.f90 | 18 +++++++-----------
 base/serial/impl/psb_c_csr_impl.f90 | 16 ++++++----------
 base/serial/impl/psb_d_coo_impl.f90 | 17 ++++++-----------
 base/serial/impl/psb_d_csc_impl.f90 | 18 +++++++-----------
 base/serial/impl/psb_d_csr_impl.f90 | 16 ++++++----------
 base/serial/impl/psb_s_coo_impl.f90 | 17 ++++++-----------
 base/serial/impl/psb_s_csc_impl.f90 | 18 +++++++-----------
 base/serial/impl/psb_s_csr_impl.f90 | 16 ++++++----------
 base/serial/impl/psb_z_coo_impl.f90 | 17 ++++++-----------
 base/serial/impl/psb_z_csc_impl.f90 | 18 +++++++-----------
 base/serial/impl/psb_z_csr_impl.f90 | 16 ++++++----------
 12 files changed, 76 insertions(+), 128 deletions(-)

diff --git a/base/serial/impl/psb_c_coo_impl.f90 b/base/serial/impl/psb_c_coo_impl.f90
index aed944c1..cc8a78f0 100644
--- a/base/serial/impl/psb_c_coo_impl.f90
+++ b/base/serial/impl/psb_c_coo_impl.f90
@@ -2036,6 +2036,7 @@ subroutine psb_c_coo_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -2048,10 +2049,7 @@ subroutine psb_c_coo_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2120,7 +2118,7 @@ contains
 
     class(psb_c_coo_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -2316,7 +2314,7 @@ subroutine psb_c_coo_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
-
+  nz = 0
   if (present(jmin)) then
     jmin_ = jmin
   else
@@ -2328,10 +2326,7 @@ subroutine psb_c_coo_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_))  return
 
   if (present(append)) then
     append_=append
@@ -2401,7 +2396,7 @@ contains
 
     class(psb_c_coo_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     complex(psb_spk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_c_csc_impl.f90 b/base/serial/impl/psb_c_csc_impl.f90
index f3de12a8..db8511a4 100644
--- a/base/serial/impl/psb_c_csc_impl.f90
+++ b/base/serial/impl/psb_c_csc_impl.f90
@@ -1603,6 +1603,7 @@ subroutine psb_c_csc_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -1615,10 +1616,7 @@ subroutine psb_c_csc_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -1686,7 +1684,7 @@ contains
 
     class(psb_c_csc_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -1796,7 +1794,8 @@ subroutine psb_c_csc_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
-
+  nz = 0
+    
   if (present(jmin)) then
     jmin_ = jmin
   else
@@ -1809,10 +1808,7 @@ subroutine psb_c_csc_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
   endif
 
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -1881,7 +1877,7 @@ contains
 
     class(psb_c_csc_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     complex(psb_spk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_c_csr_impl.f90 b/base/serial/impl/psb_c_csr_impl.f90
index aa1d1374..aa23c0cc 100644
--- a/base/serial/impl/psb_c_csr_impl.f90
+++ b/base/serial/impl/psb_c_csr_impl.f90
@@ -1942,6 +1942,7 @@ subroutine psb_c_csr_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -1954,10 +1955,7 @@ subroutine psb_c_csr_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2025,7 +2023,7 @@ contains
 
     class(psb_c_csr_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -2119,6 +2117,7 @@ subroutine psb_c_csr_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
   
   if (present(jmin)) then
     jmin_ = jmin
@@ -2131,10 +2130,7 @@ subroutine psb_c_csr_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2203,7 +2199,7 @@ contains
 
     class(psb_c_csr_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     complex(psb_spk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_d_coo_impl.f90 b/base/serial/impl/psb_d_coo_impl.f90
index bba7207c..74de0868 100644
--- a/base/serial/impl/psb_d_coo_impl.f90
+++ b/base/serial/impl/psb_d_coo_impl.f90
@@ -2036,6 +2036,7 @@ subroutine psb_d_coo_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -2048,10 +2049,7 @@ subroutine psb_d_coo_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2120,7 +2118,7 @@ contains
 
     class(psb_d_coo_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -2316,7 +2314,7 @@ subroutine psb_d_coo_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
-
+  nz = 0
   if (present(jmin)) then
     jmin_ = jmin
   else
@@ -2328,10 +2326,7 @@ subroutine psb_d_coo_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_))  return
 
   if (present(append)) then
     append_=append
@@ -2401,7 +2396,7 @@ contains
 
     class(psb_d_coo_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     real(psb_dpk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_d_csc_impl.f90 b/base/serial/impl/psb_d_csc_impl.f90
index c6b390ae..4963da5c 100644
--- a/base/serial/impl/psb_d_csc_impl.f90
+++ b/base/serial/impl/psb_d_csc_impl.f90
@@ -1603,6 +1603,7 @@ subroutine psb_d_csc_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -1615,10 +1616,7 @@ subroutine psb_d_csc_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -1686,7 +1684,7 @@ contains
 
     class(psb_d_csc_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -1796,7 +1794,8 @@ subroutine psb_d_csc_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
-
+  nz = 0
+    
   if (present(jmin)) then
     jmin_ = jmin
   else
@@ -1809,10 +1808,7 @@ subroutine psb_d_csc_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
   endif
 
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -1881,7 +1877,7 @@ contains
 
     class(psb_d_csc_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     real(psb_dpk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_d_csr_impl.f90 b/base/serial/impl/psb_d_csr_impl.f90
index feed133c..6f8ba028 100644
--- a/base/serial/impl/psb_d_csr_impl.f90
+++ b/base/serial/impl/psb_d_csr_impl.f90
@@ -1942,6 +1942,7 @@ subroutine psb_d_csr_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -1954,10 +1955,7 @@ subroutine psb_d_csr_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2025,7 +2023,7 @@ contains
 
     class(psb_d_csr_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -2119,6 +2117,7 @@ subroutine psb_d_csr_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
   
   if (present(jmin)) then
     jmin_ = jmin
@@ -2131,10 +2130,7 @@ subroutine psb_d_csr_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2203,7 +2199,7 @@ contains
 
     class(psb_d_csr_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     real(psb_dpk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_s_coo_impl.f90 b/base/serial/impl/psb_s_coo_impl.f90
index f7ff7067..5ec73188 100644
--- a/base/serial/impl/psb_s_coo_impl.f90
+++ b/base/serial/impl/psb_s_coo_impl.f90
@@ -2036,6 +2036,7 @@ subroutine psb_s_coo_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -2048,10 +2049,7 @@ subroutine psb_s_coo_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2120,7 +2118,7 @@ contains
 
     class(psb_s_coo_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -2316,7 +2314,7 @@ subroutine psb_s_coo_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
-
+  nz = 0
   if (present(jmin)) then
     jmin_ = jmin
   else
@@ -2328,10 +2326,7 @@ subroutine psb_s_coo_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_))  return
 
   if (present(append)) then
     append_=append
@@ -2401,7 +2396,7 @@ contains
 
     class(psb_s_coo_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     real(psb_spk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_s_csc_impl.f90 b/base/serial/impl/psb_s_csc_impl.f90
index 5fefa575..61aa799f 100644
--- a/base/serial/impl/psb_s_csc_impl.f90
+++ b/base/serial/impl/psb_s_csc_impl.f90
@@ -1603,6 +1603,7 @@ subroutine psb_s_csc_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -1615,10 +1616,7 @@ subroutine psb_s_csc_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -1686,7 +1684,7 @@ contains
 
     class(psb_s_csc_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -1796,7 +1794,8 @@ subroutine psb_s_csc_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
-
+  nz = 0
+    
   if (present(jmin)) then
     jmin_ = jmin
   else
@@ -1809,10 +1808,7 @@ subroutine psb_s_csc_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
   endif
 
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -1881,7 +1877,7 @@ contains
 
     class(psb_s_csc_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     real(psb_spk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_s_csr_impl.f90 b/base/serial/impl/psb_s_csr_impl.f90
index b6d6ed43..5a725a65 100644
--- a/base/serial/impl/psb_s_csr_impl.f90
+++ b/base/serial/impl/psb_s_csr_impl.f90
@@ -1942,6 +1942,7 @@ subroutine psb_s_csr_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -1954,10 +1955,7 @@ subroutine psb_s_csr_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2025,7 +2023,7 @@ contains
 
     class(psb_s_csr_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -2119,6 +2117,7 @@ subroutine psb_s_csr_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
   
   if (present(jmin)) then
     jmin_ = jmin
@@ -2131,10 +2130,7 @@ subroutine psb_s_csr_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2203,7 +2199,7 @@ contains
 
     class(psb_s_csr_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     real(psb_spk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_z_coo_impl.f90 b/base/serial/impl/psb_z_coo_impl.f90
index 742ee0bb..8e02dc05 100644
--- a/base/serial/impl/psb_z_coo_impl.f90
+++ b/base/serial/impl/psb_z_coo_impl.f90
@@ -2036,6 +2036,7 @@ subroutine psb_z_coo_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -2048,10 +2049,7 @@ subroutine psb_z_coo_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2120,7 +2118,7 @@ contains
 
     class(psb_z_coo_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -2316,7 +2314,7 @@ subroutine psb_z_coo_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
-
+  nz = 0
   if (present(jmin)) then
     jmin_ = jmin
   else
@@ -2328,10 +2326,7 @@ subroutine psb_z_coo_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_))  return
 
   if (present(append)) then
     append_=append
@@ -2401,7 +2396,7 @@ contains
 
     class(psb_z_coo_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     complex(psb_dpk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_z_csc_impl.f90 b/base/serial/impl/psb_z_csc_impl.f90
index 7ffcf8fb..e3ccd104 100644
--- a/base/serial/impl/psb_z_csc_impl.f90
+++ b/base/serial/impl/psb_z_csc_impl.f90
@@ -1603,6 +1603,7 @@ subroutine psb_z_csc_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -1615,10 +1616,7 @@ subroutine psb_z_csc_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -1686,7 +1684,7 @@ contains
 
     class(psb_z_csc_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -1796,7 +1794,8 @@ subroutine psb_z_csc_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
-
+  nz = 0
+    
   if (present(jmin)) then
     jmin_ = jmin
   else
@@ -1809,10 +1808,7 @@ subroutine psb_z_csc_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
   endif
 
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -1881,7 +1877,7 @@ contains
 
     class(psb_z_csc_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     complex(psb_dpk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin
diff --git a/base/serial/impl/psb_z_csr_impl.f90 b/base/serial/impl/psb_z_csr_impl.f90
index 482ef039..bfa472a8 100644
--- a/base/serial/impl/psb_z_csr_impl.f90
+++ b/base/serial/impl/psb_z_csr_impl.f90
@@ -1942,6 +1942,7 @@ subroutine psb_z_csr_csgetptn(imin,imax,a,nz,ia,ja,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
 
   if (present(jmin)) then
     jmin_ = jmin
@@ -1954,10 +1955,7 @@ subroutine psb_z_csr_csgetptn(imin,imax,a,nz,ia,ja,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2025,7 +2023,7 @@ contains
 
     class(psb_z_csr_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     integer(psb_ipk_), intent(in)                  :: nzin
     logical, intent(in)                  :: append
@@ -2119,6 +2117,7 @@ subroutine psb_z_csr_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
 
   call psb_erractionsave(err_act)
   info = psb_success_
+  nz = 0
   
   if (present(jmin)) then
     jmin_ = jmin
@@ -2131,10 +2130,7 @@ subroutine psb_z_csr_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
     jmax_ = a%get_ncols()
   endif
 
-  if ((imax<imin).or.(jmax_<jmin_)) then 
-    nz = 0
-    return
-  end if
+  if ((imax<imin).or.(jmax_<jmin_)) return
 
   if (present(append)) then
     append_=append
@@ -2203,7 +2199,7 @@ contains
 
     class(psb_z_csr_sparse_mat), intent(in)    :: a
     integer(psb_ipk_) :: imin,imax,jmin,jmax
-    integer(psb_ipk_), intent(out)                 :: nz
+    integer(psb_ipk_), intent(inout)               :: nz
     integer(psb_ipk_), allocatable, intent(inout)  :: ia(:), ja(:)
     complex(psb_dpk_), allocatable,  intent(inout)    :: val(:)
     integer(psb_ipk_), intent(in)                  :: nzin