From a673bf8bf16d7db7c0c4f89eaf975602bca5961b Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 17 Jun 2021 10:45:31 -0400 Subject: [PATCH] Fix inconsistency in %csget --- base/modules/serial/psb_c_mat_mod.F90 | 4 ++-- base/modules/serial/psb_d_mat_mod.F90 | 4 ++-- base/modules/serial/psb_s_mat_mod.F90 | 4 ++-- base/modules/serial/psb_z_mat_mod.F90 | 4 ++-- base/serial/impl/psb_c_mat_impl.F90 | 13 ++++++++----- base/serial/impl/psb_d_mat_impl.F90 | 13 ++++++++----- base/serial/impl/psb_s_mat_impl.F90 | 13 ++++++++----- base/serial/impl/psb_z_mat_impl.F90 | 13 ++++++++----- 8 files changed, 40 insertions(+), 28 deletions(-) diff --git a/base/modules/serial/psb_c_mat_mod.F90 b/base/modules/serial/psb_c_mat_mod.F90 index 5e889da2..f221a8f8 100644 --- a/base/modules/serial/psb_c_mat_mod.F90 +++ b/base/modules/serial/psb_c_mat_mod.F90 @@ -681,7 +681,7 @@ module psb_c_mat_mod interface subroutine psb_c_csgetrow(imin,imax,a,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale) + & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) import :: psb_ipk_, psb_lpk_, psb_cspmat_type, psb_spk_ class(psb_cspmat_type), intent(in) :: a integer(psb_ipk_), intent(in) :: imin,imax @@ -692,7 +692,7 @@ module psb_c_mat_mod logical, intent(in), optional :: append integer(psb_ipk_), intent(in), optional :: iren(:) integer(psb_ipk_), intent(in), optional :: jmin,jmax, nzin - logical, intent(in), optional :: rscale,cscale + logical, intent(in), optional :: rscale,cscale,chksz end subroutine psb_c_csgetrow end interface diff --git a/base/modules/serial/psb_d_mat_mod.F90 b/base/modules/serial/psb_d_mat_mod.F90 index caf03994..db997b8f 100644 --- a/base/modules/serial/psb_d_mat_mod.F90 +++ b/base/modules/serial/psb_d_mat_mod.F90 @@ -681,7 +681,7 @@ module psb_d_mat_mod interface subroutine psb_d_csgetrow(imin,imax,a,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale) + & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) import :: psb_ipk_, psb_lpk_, psb_dspmat_type, psb_dpk_ class(psb_dspmat_type), intent(in) :: a integer(psb_ipk_), intent(in) :: imin,imax @@ -692,7 +692,7 @@ module psb_d_mat_mod logical, intent(in), optional :: append integer(psb_ipk_), intent(in), optional :: iren(:) integer(psb_ipk_), intent(in), optional :: jmin,jmax, nzin - logical, intent(in), optional :: rscale,cscale + logical, intent(in), optional :: rscale,cscale,chksz end subroutine psb_d_csgetrow end interface diff --git a/base/modules/serial/psb_s_mat_mod.F90 b/base/modules/serial/psb_s_mat_mod.F90 index 8e3934b8..9f5f418b 100644 --- a/base/modules/serial/psb_s_mat_mod.F90 +++ b/base/modules/serial/psb_s_mat_mod.F90 @@ -681,7 +681,7 @@ module psb_s_mat_mod interface subroutine psb_s_csgetrow(imin,imax,a,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale) + & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) import :: psb_ipk_, psb_lpk_, psb_sspmat_type, psb_spk_ class(psb_sspmat_type), intent(in) :: a integer(psb_ipk_), intent(in) :: imin,imax @@ -692,7 +692,7 @@ module psb_s_mat_mod logical, intent(in), optional :: append integer(psb_ipk_), intent(in), optional :: iren(:) integer(psb_ipk_), intent(in), optional :: jmin,jmax, nzin - logical, intent(in), optional :: rscale,cscale + logical, intent(in), optional :: rscale,cscale,chksz end subroutine psb_s_csgetrow end interface diff --git a/base/modules/serial/psb_z_mat_mod.F90 b/base/modules/serial/psb_z_mat_mod.F90 index ed3338f9..a6632412 100644 --- a/base/modules/serial/psb_z_mat_mod.F90 +++ b/base/modules/serial/psb_z_mat_mod.F90 @@ -681,7 +681,7 @@ module psb_z_mat_mod interface subroutine psb_z_csgetrow(imin,imax,a,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale) + & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) import :: psb_ipk_, psb_lpk_, psb_zspmat_type, psb_dpk_ class(psb_zspmat_type), intent(in) :: a integer(psb_ipk_), intent(in) :: imin,imax @@ -692,7 +692,7 @@ module psb_z_mat_mod logical, intent(in), optional :: append integer(psb_ipk_), intent(in), optional :: iren(:) integer(psb_ipk_), intent(in), optional :: jmin,jmax, nzin - logical, intent(in), optional :: rscale,cscale + logical, intent(in), optional :: rscale,cscale,chksz end subroutine psb_z_csgetrow end interface diff --git a/base/serial/impl/psb_c_mat_impl.F90 b/base/serial/impl/psb_c_mat_impl.F90 index cc112015..088b012d 100644 --- a/base/serial/impl/psb_c_mat_impl.F90 +++ b/base/serial/impl/psb_c_mat_impl.F90 @@ -820,7 +820,8 @@ subroutine psb_c_csgetptn(imin,imax,a,nz,ia,ja,info,& call a%a%csget(imin,imax,nz,ia,ja,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale) + & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& + & rscale=rscale,cscale=cscale) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -866,9 +867,10 @@ subroutine psb_c_csgetrow(imin,imax,a,nz,ia,ja,val,info,& goto 9999 endif - call a%a%csget(imin,imax,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) + & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& + & rscale=rscale,cscale=cscale,chksz=chksz) + if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -929,8 +931,9 @@ subroutine psb_c_csgetblk(imin,imax,a,b,info,& end if if (info == psb_success_) then - call a%a%csget(imin,imax,acoo,info,& - & jmin,jmax,iren,append,rscale,cscale) + call a%a%csget(imin,imax,acoo,info,& + & jmin=jmin,jmax=jmax,iren=iren,append=append,& + & rscale=rscale,cscale=cscale) else info = psb_err_alloc_dealloc_ end if diff --git a/base/serial/impl/psb_d_mat_impl.F90 b/base/serial/impl/psb_d_mat_impl.F90 index 7f4ac0c1..b21fa40f 100644 --- a/base/serial/impl/psb_d_mat_impl.F90 +++ b/base/serial/impl/psb_d_mat_impl.F90 @@ -820,7 +820,8 @@ subroutine psb_d_csgetptn(imin,imax,a,nz,ia,ja,info,& call a%a%csget(imin,imax,nz,ia,ja,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale) + & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& + & rscale=rscale,cscale=cscale) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -866,9 +867,10 @@ subroutine psb_d_csgetrow(imin,imax,a,nz,ia,ja,val,info,& goto 9999 endif - call a%a%csget(imin,imax,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) + & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& + & rscale=rscale,cscale=cscale,chksz=chksz) + if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -929,8 +931,9 @@ subroutine psb_d_csgetblk(imin,imax,a,b,info,& end if if (info == psb_success_) then - call a%a%csget(imin,imax,acoo,info,& - & jmin,jmax,iren,append,rscale,cscale) + call a%a%csget(imin,imax,acoo,info,& + & jmin=jmin,jmax=jmax,iren=iren,append=append,& + & rscale=rscale,cscale=cscale) else info = psb_err_alloc_dealloc_ end if diff --git a/base/serial/impl/psb_s_mat_impl.F90 b/base/serial/impl/psb_s_mat_impl.F90 index 806a08e3..c624dc2f 100644 --- a/base/serial/impl/psb_s_mat_impl.F90 +++ b/base/serial/impl/psb_s_mat_impl.F90 @@ -820,7 +820,8 @@ subroutine psb_s_csgetptn(imin,imax,a,nz,ia,ja,info,& call a%a%csget(imin,imax,nz,ia,ja,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale) + & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& + & rscale=rscale,cscale=cscale) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -866,9 +867,10 @@ subroutine psb_s_csgetrow(imin,imax,a,nz,ia,ja,val,info,& goto 9999 endif - call a%a%csget(imin,imax,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) + & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& + & rscale=rscale,cscale=cscale,chksz=chksz) + if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -929,8 +931,9 @@ subroutine psb_s_csgetblk(imin,imax,a,b,info,& end if if (info == psb_success_) then - call a%a%csget(imin,imax,acoo,info,& - & jmin,jmax,iren,append,rscale,cscale) + call a%a%csget(imin,imax,acoo,info,& + & jmin=jmin,jmax=jmax,iren=iren,append=append,& + & rscale=rscale,cscale=cscale) else info = psb_err_alloc_dealloc_ end if diff --git a/base/serial/impl/psb_z_mat_impl.F90 b/base/serial/impl/psb_z_mat_impl.F90 index 422a664d..e008dfdb 100644 --- a/base/serial/impl/psb_z_mat_impl.F90 +++ b/base/serial/impl/psb_z_mat_impl.F90 @@ -820,7 +820,8 @@ subroutine psb_z_csgetptn(imin,imax,a,nz,ia,ja,info,& call a%a%csget(imin,imax,nz,ia,ja,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale) + & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& + & rscale=rscale,cscale=cscale) if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -866,9 +867,10 @@ subroutine psb_z_csgetrow(imin,imax,a,nz,ia,ja,val,info,& goto 9999 endif - call a%a%csget(imin,imax,nz,ia,ja,val,info,& - & jmin,jmax,iren,append,nzin,rscale,cscale,chksz) + & jmin=jmin,jmax=jmax,iren=iren,append=append,nzin=nzin,& + & rscale=rscale,cscale=cscale,chksz=chksz) + if (info /= psb_success_) goto 9999 call psb_erractionrestore(err_act) @@ -929,8 +931,9 @@ subroutine psb_z_csgetblk(imin,imax,a,b,info,& end if if (info == psb_success_) then - call a%a%csget(imin,imax,acoo,info,& - & jmin,jmax,iren,append,rscale,cscale) + call a%a%csget(imin,imax,acoo,info,& + & jmin=jmin,jmax=jmax,iren=iren,append=append,& + & rscale=rscale,cscale=cscale) else info = psb_err_alloc_dealloc_ end if