From e54af36c446d13aeb532b171d900a31065109892 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 13 Jul 2012 09:35:58 +0000 Subject: [PATCH] psblas3: Fix interface for index handling with 8-byte integers. --- base/internals/psi_idx_ins_cnv.f90 | 8 ++++---- base/modules/psb_gen_block_map_mod.f90 | 8 ++++---- base/modules/psb_hash_map_mod.f90 | 8 ++++---- base/modules/psb_list_map_mod.f90 | 8 ++++---- base/modules/psb_repl_map_mod.f90 | 8 ++++---- base/modules/psi_i_mod.f90 | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/base/internals/psi_idx_ins_cnv.f90 b/base/internals/psi_idx_ins_cnv.f90 index f156e0b6..d47aacb5 100644 --- a/base/internals/psi_idx_ins_cnv.f90 +++ b/base/internals/psi_idx_ins_cnv.f90 @@ -61,7 +61,7 @@ subroutine psi_idx_ins_cnv1(nv,idxin,desc,info,mask,lidx) type(psb_desc_type), intent(inout) :: desc integer(psb_ipk_), intent(out) :: info 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_) :: np, me 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 integer(psb_ipk_), intent(out) :: info 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_) :: 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 integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx integer(psb_ipk_) :: iout(1),lidxv(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 integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx integer(psb_ipk_) :: iout(1),lidxv(1) logical :: mask_(1) diff --git a/base/modules/psb_gen_block_map_mod.f90 b/base/modules/psb_gen_block_map_mod.f90 index b7898d5a..9fd98dcb 100644 --- a/base/modules/psb_gen_block_map_mod.f90 +++ b/base/modules/psb_gen_block_map_mod.f90 @@ -414,7 +414,7 @@ contains integer(psb_ipk_), intent(inout) :: idx integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx integer(psb_ipk_) :: idxv(1), lidxv(1) @@ -440,7 +440,7 @@ contains integer(psb_ipk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx idxout = idxin 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(out) :: info 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_) :: ip, lip, nxt @@ -652,7 +652,7 @@ contains integer(psb_ipk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask(:) - integer, intent(in), optional :: lidx(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) integer(psb_ipk_) :: is, im diff --git a/base/modules/psb_hash_map_mod.f90 b/base/modules/psb_hash_map_mod.f90 index 91cfef4c..5d9fd0e4 100644 --- a/base/modules/psb_hash_map_mod.f90 +++ b/base/modules/psb_hash_map_mod.f90 @@ -447,7 +447,7 @@ contains integer(psb_ipk_), intent(inout) :: idx integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx integer(psb_ipk_) :: idxv(1), lidxv(1) @@ -474,7 +474,7 @@ contains integer(psb_ipk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx idxout = idxin @@ -493,7 +493,7 @@ contains integer(psb_ipk_), intent(inout) :: idx(:) integer(psb_ipk_), intent(out) :: info 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, & & nxt, err_act @@ -733,7 +733,7 @@ contains integer(psb_ipk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask(:) - integer, intent(in), optional :: lidx(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) integer(psb_ipk_) :: is, im diff --git a/base/modules/psb_list_map_mod.f90 b/base/modules/psb_list_map_mod.f90 index edbb07c8..ed9ea3ad 100644 --- a/base/modules/psb_list_map_mod.f90 +++ b/base/modules/psb_list_map_mod.f90 @@ -357,7 +357,7 @@ contains integer(psb_ipk_), intent(inout) :: idx integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx integer(psb_ipk_) :: idxv(1), lidxv(1) @@ -384,7 +384,7 @@ contains integer(psb_ipk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx idxout = idxin 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(out) :: info logical, intent(in), optional :: mask(:) - integer, intent(in), optional :: lidx(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) integer(psb_ipk_) :: i, is, ix, lix @@ -538,7 +538,7 @@ contains integer(psb_ipk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask(:) - integer, intent(in), optional :: lidx(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) integer(psb_ipk_) :: is, im diff --git a/base/modules/psb_repl_map_mod.f90 b/base/modules/psb_repl_map_mod.f90 index 27f90b2f..fae39b2a 100644 --- a/base/modules/psb_repl_map_mod.f90 +++ b/base/modules/psb_repl_map_mod.f90 @@ -350,7 +350,7 @@ contains integer(psb_ipk_), intent(inout) :: idx integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx integer(psb_ipk_) :: idxv(1),lidxv(1) @@ -376,7 +376,7 @@ contains integer(psb_ipk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx idxout = idxin 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(out) :: info logical, intent(in), optional :: mask(:) - integer, intent(in), optional :: lidx(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) integer(psb_ipk_) :: i, is @@ -477,7 +477,7 @@ contains integer(psb_ipk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask(:) - integer, intent(in), optional :: lidx(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) integer(psb_ipk_) :: is, im diff --git a/base/modules/psi_i_mod.f90 b/base/modules/psi_i_mod.f90 index 4bc9ca8c..84c6b6f8 100644 --- a/base/modules/psi_i_mod.f90 +++ b/base/modules/psi_i_mod.f90 @@ -194,7 +194,7 @@ module psi_i_mod type(psb_desc_type), intent(inout) :: desc integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask(:) - integer, intent(in), optional :: lidx(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) end subroutine psi_idx_ins_cnv1 subroutine psi_idx_ins_cnv2(nv,idxin,idxout,desc,info,mask,lidx) import :: psb_desc_type, psb_ipk_ @@ -203,7 +203,7 @@ module psi_i_mod type(psb_desc_type), intent(inout) :: desc integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask(:) - integer, intent(in), optional :: lidx(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) end subroutine psi_idx_ins_cnv2 subroutine psi_idx_ins_cnvs2(idxin,idxout,desc,info,mask,lidx) import :: psb_desc_type, psb_ipk_ @@ -212,7 +212,7 @@ module psi_i_mod type(psb_desc_type), intent(inout) :: desc integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx end subroutine psi_idx_ins_cnvs2 subroutine psi_idx_ins_cnvs1(idxin,desc,info,mask,lidx) import :: psb_desc_type, psb_ipk_ @@ -220,7 +220,7 @@ module psi_i_mod type(psb_desc_type), intent(inout) :: desc integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: mask - integer, intent(in), optional :: lidx + integer(psb_ipk_), intent(in), optional :: lidx end subroutine psi_idx_ins_cnvs1 end interface