fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-20 12:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix integer KIND for some temporaries.

Browse Source
This commit is contained in:
Salvatore Filippone
2020-02-16 18:21:01 +00:00
parent 01ffca76d2
commit 193682a5a5
4 changed files with 48 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/tools/psb_csphalo.F90
+12 -14
View File
@@ -506,8 +506,7 @@ Subroutine psb_lcsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
integer(psb_ipk_), intent(in), optional :: data
! ...local scalars....
integer(psb_ipk_) :: ictxt, np,me
integer(psb_ipk_) :: counter, proc, i, &
& n_el_send,n_el_recv,&
integer(psb_ipk_) :: counter, proc, i, n_el_send,n_el_recv, &
& n_elem, j, ipx,mat_recv, idxs,idxr,nz,&
& data_,totxch,nxs, nxr, ncg
integer(psb_lpk_) :: r, k, irmin, irmax, icmin, icmax, iszs, iszr, &
@@ -829,12 +828,11 @@ Subroutine psb_lc_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
type(psb_desc_type),Intent(in), optional, target :: col_desc
! ...local scalars....
integer(psb_ipk_) :: ictxt, np,me
integer(psb_ipk_) :: counter,proc,i, &
& n_el_send,k,n_el_recv,r,&
& n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
& irmin,icmin,data_,totxch,nxs, nxr,&
& err_act, nsnds, nrcvs
integer(psb_lpk_) :: ngtz,irmax,icmax,l1, lnr, lnc, lnnz, ncg, jpx, idx, tot_elem
integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,&
& n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
& data_,totxch,nxs, nxr, err_act, nsnds, nrcvs
integer(psb_lpk_) :: ngtz,irmax,icmax,irmin,icmin,l1, lnr, lnc, lnnz, &
& r, k, ncg, jpx, idx, tot_elem
integer(psb_mpk_) :: icomm, minfo
integer(psb_mpk_), allocatable :: brvindx(:), &
& rvsz(:), bsdindx(:),sdsz(:)
@@ -1067,9 +1065,9 @@ Subroutine psb_lc_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
#elif defined(SP_A2AV_XI)
call lc_my_a2av(valsnd,sdsz,bsdindx,&
& acoo%val,rvsz,brvindx,ictxt,info)
if (info == psb_success_) call i_my_a2av(iasnd,sdsz,bsdindx,&
if (info == psb_success_) call l_my_a2av(iasnd,sdsz,bsdindx,&
& acoo%ia,rvsz,brvindx,ictxt,info)
if (info == psb_success_) call i_my_a2av(jasnd,sdsz,bsdindx,&
if (info == psb_success_) call l_my_a2av(jasnd,sdsz,bsdindx,&
& acoo%ja,rvsz,brvindx,ictxt,info)
#elif defined(SP_A2AV_MAT)
call lc_coo_my_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
@@ -1308,10 +1306,10 @@ contains
end subroutine lc_my_a2av
subroutine i_my_a2av(valsnd,sdsz,bsdindx,&
subroutine l_my_a2av(valsnd,sdsz,bsdindx,&
& valrcv,rvsz,brvindx,ictxt,info)
integer(psb_ipk_), intent(in) :: valsnd(:)
integer(psb_ipk_), intent(out) :: valrcv(:)
integer(psb_lpk_), intent(in) :: valsnd(:)
integer(psb_lpk_), intent(out) :: valrcv(:)
integer(psb_mpk_), intent(in) :: bsdindx(:), brvindx(:), sdsz(:), rvsz(:)
integer(psb_ipk_), intent(in) :: ictxt
integer(psb_ipk_), intent(out) :: info
@@ -1341,7 +1339,7 @@ contains
end if
end do
end subroutine i_my_a2av
end subroutine l_my_a2av
#endif
#endif
End Subroutine psb_lc_csr_halo
base/tools/psb_dsphalo.F90
+12 -14
View File
@@ -506,8 +506,7 @@ Subroutine psb_ldsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
integer(psb_ipk_), intent(in), optional :: data
! ...local scalars....
integer(psb_ipk_) :: ictxt, np,me
integer(psb_ipk_) :: counter, proc, i, &
& n_el_send,n_el_recv,&
integer(psb_ipk_) :: counter, proc, i, n_el_send,n_el_recv, &
& n_elem, j, ipx,mat_recv, idxs,idxr,nz,&
& data_,totxch,nxs, nxr, ncg
integer(psb_lpk_) :: r, k, irmin, irmax, icmin, icmax, iszs, iszr, &
@@ -829,12 +828,11 @@ Subroutine psb_ld_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
type(psb_desc_type),Intent(in), optional, target :: col_desc
! ...local scalars....
integer(psb_ipk_) :: ictxt, np,me
integer(psb_ipk_) :: counter,proc,i, &
& n_el_send,k,n_el_recv,r,&
& n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
& irmin,icmin,data_,totxch,nxs, nxr,&
& err_act, nsnds, nrcvs
integer(psb_lpk_) :: ngtz,irmax,icmax,l1, lnr, lnc, lnnz, ncg, jpx, idx, tot_elem
integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,&
& n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
& data_,totxch,nxs, nxr, err_act, nsnds, nrcvs
integer(psb_lpk_) :: ngtz,irmax,icmax,irmin,icmin,l1, lnr, lnc, lnnz, &
& r, k, ncg, jpx, idx, tot_elem
integer(psb_mpk_) :: icomm, minfo
integer(psb_mpk_), allocatable :: brvindx(:), &
& rvsz(:), bsdindx(:),sdsz(:)
@@ -1067,9 +1065,9 @@ Subroutine psb_ld_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
#elif defined(SP_A2AV_XI)
call ld_my_a2av(valsnd,sdsz,bsdindx,&
& acoo%val,rvsz,brvindx,ictxt,info)
if (info == psb_success_) call i_my_a2av(iasnd,sdsz,bsdindx,&
if (info == psb_success_) call l_my_a2av(iasnd,sdsz,bsdindx,&
& acoo%ia,rvsz,brvindx,ictxt,info)
if (info == psb_success_) call i_my_a2av(jasnd,sdsz,bsdindx,&
if (info == psb_success_) call l_my_a2av(jasnd,sdsz,bsdindx,&
& acoo%ja,rvsz,brvindx,ictxt,info)
#elif defined(SP_A2AV_MAT)
call ld_coo_my_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
@@ -1308,10 +1306,10 @@ contains
end subroutine ld_my_a2av
subroutine i_my_a2av(valsnd,sdsz,bsdindx,&
subroutine l_my_a2av(valsnd,sdsz,bsdindx,&
& valrcv,rvsz,brvindx,ictxt,info)
integer(psb_ipk_), intent(in) :: valsnd(:)
integer(psb_ipk_), intent(out) :: valrcv(:)
integer(psb_lpk_), intent(in) :: valsnd(:)
integer(psb_lpk_), intent(out) :: valrcv(:)
integer(psb_mpk_), intent(in) :: bsdindx(:), brvindx(:), sdsz(:), rvsz(:)
integer(psb_ipk_), intent(in) :: ictxt
integer(psb_ipk_), intent(out) :: info
@@ -1341,7 +1339,7 @@ contains
end if
end do
end subroutine i_my_a2av
end subroutine l_my_a2av
#endif
#endif
End Subroutine psb_ld_csr_halo
base/tools/psb_ssphalo.F90
+12 -14
View File
@@ -506,8 +506,7 @@ Subroutine psb_lssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
integer(psb_ipk_), intent(in), optional :: data
! ...local scalars....
integer(psb_ipk_) :: ictxt, np,me
integer(psb_ipk_) :: counter, proc, i, &
& n_el_send,n_el_recv,&
integer(psb_ipk_) :: counter, proc, i, n_el_send,n_el_recv, &
& n_elem, j, ipx,mat_recv, idxs,idxr,nz,&
& data_,totxch,nxs, nxr, ncg
integer(psb_lpk_) :: r, k, irmin, irmax, icmin, icmax, iszs, iszr, &
@@ -829,12 +828,11 @@ Subroutine psb_ls_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
type(psb_desc_type),Intent(in), optional, target :: col_desc
! ...local scalars....
integer(psb_ipk_) :: ictxt, np,me
integer(psb_ipk_) :: counter,proc,i, &
& n_el_send,k,n_el_recv,r,&
& n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
& irmin,icmin,data_,totxch,nxs, nxr,&
& err_act, nsnds, nrcvs
integer(psb_lpk_) :: ngtz,irmax,icmax,l1, lnr, lnc, lnnz, ncg, jpx, idx, tot_elem
integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,&
& n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
& data_,totxch,nxs, nxr, err_act, nsnds, nrcvs
integer(psb_lpk_) :: ngtz,irmax,icmax,irmin,icmin,l1, lnr, lnc, lnnz, &
& r, k, ncg, jpx, idx, tot_elem
integer(psb_mpk_) :: icomm, minfo
integer(psb_mpk_), allocatable :: brvindx(:), &
& rvsz(:), bsdindx(:),sdsz(:)
@@ -1067,9 +1065,9 @@ Subroutine psb_ls_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
#elif defined(SP_A2AV_XI)
call ls_my_a2av(valsnd,sdsz,bsdindx,&
& acoo%val,rvsz,brvindx,ictxt,info)
if (info == psb_success_) call i_my_a2av(iasnd,sdsz,bsdindx,&
if (info == psb_success_) call l_my_a2av(iasnd,sdsz,bsdindx,&
& acoo%ia,rvsz,brvindx,ictxt,info)
if (info == psb_success_) call i_my_a2av(jasnd,sdsz,bsdindx,&
if (info == psb_success_) call l_my_a2av(jasnd,sdsz,bsdindx,&
& acoo%ja,rvsz,brvindx,ictxt,info)
#elif defined(SP_A2AV_MAT)
call ls_coo_my_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
@@ -1308,10 +1306,10 @@ contains
end subroutine ls_my_a2av
subroutine i_my_a2av(valsnd,sdsz,bsdindx,&
subroutine l_my_a2av(valsnd,sdsz,bsdindx,&
& valrcv,rvsz,brvindx,ictxt,info)
integer(psb_ipk_), intent(in) :: valsnd(:)
integer(psb_ipk_), intent(out) :: valrcv(:)
integer(psb_lpk_), intent(in) :: valsnd(:)
integer(psb_lpk_), intent(out) :: valrcv(:)
integer(psb_mpk_), intent(in) :: bsdindx(:), brvindx(:), sdsz(:), rvsz(:)
integer(psb_ipk_), intent(in) :: ictxt
integer(psb_ipk_), intent(out) :: info
@@ -1341,7 +1339,7 @@ contains
end if
end do
end subroutine i_my_a2av
end subroutine l_my_a2av
#endif
#endif
End Subroutine psb_ls_csr_halo
base/tools/psb_zsphalo.F90
+12 -14
View File
@@ -506,8 +506,7 @@ Subroutine psb_lzsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
integer(psb_ipk_), intent(in), optional :: data
! ...local scalars....
integer(psb_ipk_) :: ictxt, np,me
integer(psb_ipk_) :: counter, proc, i, &
& n_el_send,n_el_recv,&
integer(psb_ipk_) :: counter, proc, i, n_el_send,n_el_recv, &
& n_elem, j, ipx,mat_recv, idxs,idxr,nz,&
& data_,totxch,nxs, nxr, ncg
integer(psb_lpk_) :: r, k, irmin, irmax, icmin, icmax, iszs, iszr, &
@@ -829,12 +828,11 @@ Subroutine psb_lz_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
type(psb_desc_type),Intent(in), optional, target :: col_desc
! ...local scalars....
integer(psb_ipk_) :: ictxt, np,me
integer(psb_ipk_) :: counter,proc,i, &
& n_el_send,k,n_el_recv,r,&
& n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
& irmin,icmin,data_,totxch,nxs, nxr,&
& err_act, nsnds, nrcvs
integer(psb_lpk_) :: ngtz,irmax,icmax,l1, lnr, lnc, lnnz, ncg, jpx, idx, tot_elem
integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,&
& n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
& data_,totxch,nxs, nxr, err_act, nsnds, nrcvs
integer(psb_lpk_) :: ngtz,irmax,icmax,irmin,icmin,l1, lnr, lnc, lnnz, &
& r, k, ncg, jpx, idx, tot_elem
integer(psb_mpk_) :: icomm, minfo
integer(psb_mpk_), allocatable :: brvindx(:), &
& rvsz(:), bsdindx(:),sdsz(:)
@@ -1067,9 +1065,9 @@ Subroutine psb_lz_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
#elif defined(SP_A2AV_XI)
call lz_my_a2av(valsnd,sdsz,bsdindx,&
& acoo%val,rvsz,brvindx,ictxt,info)
if (info == psb_success_) call i_my_a2av(iasnd,sdsz,bsdindx,&
if (info == psb_success_) call l_my_a2av(iasnd,sdsz,bsdindx,&
& acoo%ia,rvsz,brvindx,ictxt,info)
if (info == psb_success_) call i_my_a2av(jasnd,sdsz,bsdindx,&
if (info == psb_success_) call l_my_a2av(jasnd,sdsz,bsdindx,&
& acoo%ja,rvsz,brvindx,ictxt,info)
#elif defined(SP_A2AV_MAT)
call lz_coo_my_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
@@ -1308,10 +1306,10 @@ contains
end subroutine lz_my_a2av
subroutine i_my_a2av(valsnd,sdsz,bsdindx,&
subroutine l_my_a2av(valsnd,sdsz,bsdindx,&
& valrcv,rvsz,brvindx,ictxt,info)
integer(psb_ipk_), intent(in) :: valsnd(:)
integer(psb_ipk_), intent(out) :: valrcv(:)
integer(psb_lpk_), intent(in) :: valsnd(:)
integer(psb_lpk_), intent(out) :: valrcv(:)
integer(psb_mpk_), intent(in) :: bsdindx(:), brvindx(:), sdsz(:), rvsz(:)
integer(psb_ipk_), intent(in) :: ictxt
integer(psb_ipk_), intent(out) :: info
@@ -1341,7 +1339,7 @@ contains
end if
end do
end subroutine i_my_a2av
end subroutine l_my_a2av
#endif
#endif
End Subroutine psb_lz_csr_halo