Fix interface for index handling with 8-byte integers.
psblas3-final
Salvatore Filippone 13 years ago
parent 50cee5c003
commit e54af36c44

@ -61,7 +61,7 @@ subroutine psi_idx_ins_cnv1(nv,idxin,desc,info,mask,lidx)
type(psb_desc_type), intent(inout) :: desc type(psb_desc_type), intent(inout) :: desc
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: ictxt,mglob, nglob integer(psb_ipk_) :: ictxt,mglob, nglob
integer(psb_ipk_) :: np, me integer(psb_ipk_) :: np, me
integer(psb_ipk_) :: nrow,ncol, err_act integer(psb_ipk_) :: nrow,ncol, err_act
@ -198,7 +198,7 @@ subroutine psi_idx_ins_cnv2(nv,idxin,idxout,desc,info,mask,lidx)
type(psb_desc_type), intent(inout) :: desc type(psb_desc_type), intent(inout) :: desc
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: i,ictxt,k,mglob, nglob integer(psb_ipk_) :: i,ictxt,k,mglob, nglob
integer(psb_ipk_) :: np, me, isize integer(psb_ipk_) :: np, me, isize
@ -319,7 +319,7 @@ subroutine psi_idx_ins_cnvs2(idxin,idxout,desc,info,mask,lidx)
type(psb_desc_type), intent(inout) :: desc type(psb_desc_type), intent(inout) :: desc
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
integer(psb_ipk_) :: iout(1),lidxv(1) integer(psb_ipk_) :: iout(1),lidxv(1)
logical :: mask_(1) logical :: mask_(1)
@ -395,7 +395,7 @@ subroutine psi_idx_ins_cnvs1(idxin,desc,info,mask,lidx)
type(psb_desc_type), intent(inout) :: desc type(psb_desc_type), intent(inout) :: desc
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
integer(psb_ipk_) :: iout(1),lidxv(1) integer(psb_ipk_) :: iout(1),lidxv(1)
logical :: mask_(1) logical :: mask_(1)

@ -414,7 +414,7 @@ contains
integer(psb_ipk_), intent(inout) :: idx integer(psb_ipk_), intent(inout) :: idx
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
integer(psb_ipk_) :: idxv(1), lidxv(1) integer(psb_ipk_) :: idxv(1), lidxv(1)
@ -440,7 +440,7 @@ contains
integer(psb_ipk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: idxout
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
idxout = idxin idxout = idxin
call idxmap%g2lip_ins(idxout,info,mask=mask,lidx=lidx) call idxmap%g2lip_ins(idxout,info,mask=mask,lidx=lidx)
@ -456,7 +456,7 @@ contains
integer(psb_ipk_), intent(inout) :: idx(:) integer(psb_ipk_), intent(inout) :: idx(:)
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: i, nv, is, ix integer(psb_ipk_) :: i, nv, is, ix
integer(psb_ipk_) :: ip, lip, nxt integer(psb_ipk_) :: ip, lip, nxt
@ -652,7 +652,7 @@ contains
integer(psb_ipk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: idxout(:)
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: is, im integer(psb_ipk_) :: is, im

@ -447,7 +447,7 @@ contains
integer(psb_ipk_), intent(inout) :: idx integer(psb_ipk_), intent(inout) :: idx
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
integer(psb_ipk_) :: idxv(1), lidxv(1) integer(psb_ipk_) :: idxv(1), lidxv(1)
@ -474,7 +474,7 @@ contains
integer(psb_ipk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: idxout
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
idxout = idxin idxout = idxin
@ -493,7 +493,7 @@ contains
integer(psb_ipk_), intent(inout) :: idx(:) integer(psb_ipk_), intent(inout) :: idx(:)
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: i, is, mglob, ip, lip, nrow, ncol, & integer(psb_ipk_) :: i, is, mglob, ip, lip, nrow, ncol, &
& nxt, err_act & nxt, err_act
@ -733,7 +733,7 @@ contains
integer(psb_ipk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: idxout(:)
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: is, im integer(psb_ipk_) :: is, im

@ -357,7 +357,7 @@ contains
integer(psb_ipk_), intent(inout) :: idx integer(psb_ipk_), intent(inout) :: idx
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
integer(psb_ipk_) :: idxv(1), lidxv(1) integer(psb_ipk_) :: idxv(1), lidxv(1)
@ -384,7 +384,7 @@ contains
integer(psb_ipk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: idxout
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
idxout = idxin idxout = idxin
call idxmap%g2lip_ins(idxout,info,mask=mask,lidx=lidx) call idxmap%g2lip_ins(idxout,info,mask=mask,lidx=lidx)
@ -400,7 +400,7 @@ contains
integer(psb_ipk_), intent(inout) :: idx(:) integer(psb_ipk_), intent(inout) :: idx(:)
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: i, is, ix, lix integer(psb_ipk_) :: i, is, ix, lix
@ -538,7 +538,7 @@ contains
integer(psb_ipk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: idxout(:)
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: is, im integer(psb_ipk_) :: is, im

@ -350,7 +350,7 @@ contains
integer(psb_ipk_), intent(inout) :: idx integer(psb_ipk_), intent(inout) :: idx
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
integer(psb_ipk_) :: idxv(1),lidxv(1) integer(psb_ipk_) :: idxv(1),lidxv(1)
@ -376,7 +376,7 @@ contains
integer(psb_ipk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: idxout
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
idxout = idxin idxout = idxin
call idxmap%g2lip_ins(idxout,info,mask=mask,lidx=lidx) call idxmap%g2lip_ins(idxout,info,mask=mask,lidx=lidx)
@ -392,7 +392,7 @@ contains
integer(psb_ipk_), intent(inout) :: idx(:) integer(psb_ipk_), intent(inout) :: idx(:)
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: i, is integer(psb_ipk_) :: i, is
@ -477,7 +477,7 @@ contains
integer(psb_ipk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: idxout(:)
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
integer(psb_ipk_) :: is, im integer(psb_ipk_) :: is, im

@ -194,7 +194,7 @@ module psi_i_mod
type(psb_desc_type), intent(inout) :: desc type(psb_desc_type), intent(inout) :: desc
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
end subroutine psi_idx_ins_cnv1 end subroutine psi_idx_ins_cnv1
subroutine psi_idx_ins_cnv2(nv,idxin,idxout,desc,info,mask,lidx) subroutine psi_idx_ins_cnv2(nv,idxin,idxout,desc,info,mask,lidx)
import :: psb_desc_type, psb_ipk_ import :: psb_desc_type, psb_ipk_
@ -203,7 +203,7 @@ module psi_i_mod
type(psb_desc_type), intent(inout) :: desc type(psb_desc_type), intent(inout) :: desc
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask(:) logical, intent(in), optional :: mask(:)
integer, intent(in), optional :: lidx(:) integer(psb_ipk_), intent(in), optional :: lidx(:)
end subroutine psi_idx_ins_cnv2 end subroutine psi_idx_ins_cnv2
subroutine psi_idx_ins_cnvs2(idxin,idxout,desc,info,mask,lidx) subroutine psi_idx_ins_cnvs2(idxin,idxout,desc,info,mask,lidx)
import :: psb_desc_type, psb_ipk_ import :: psb_desc_type, psb_ipk_
@ -212,7 +212,7 @@ module psi_i_mod
type(psb_desc_type), intent(inout) :: desc type(psb_desc_type), intent(inout) :: desc
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
end subroutine psi_idx_ins_cnvs2 end subroutine psi_idx_ins_cnvs2
subroutine psi_idx_ins_cnvs1(idxin,desc,info,mask,lidx) subroutine psi_idx_ins_cnvs1(idxin,desc,info,mask,lidx)
import :: psb_desc_type, psb_ipk_ import :: psb_desc_type, psb_ipk_
@ -220,7 +220,7 @@ module psi_i_mod
type(psb_desc_type), intent(inout) :: desc type(psb_desc_type), intent(inout) :: desc
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: mask logical, intent(in), optional :: mask
integer, intent(in), optional :: lidx integer(psb_ipk_), intent(in), optional :: lidx
end subroutine psi_idx_ins_cnvs1 end subroutine psi_idx_ins_cnvs1
end interface end interface

Loading…
Cancel
Save