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.
This commit is contained in:
Salvatore Filippone
2013-12-04 09:49:36 +00:00
parent 2e75193112
commit 38ff4f56dd
12 changed files with 76 additions and 128 deletions
+6 -11
View File
@@ -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