From 4930923b17236626863692cc4a5aedcbfe850826 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 7 Feb 2018 17:47:40 +0000 Subject: [PATCH 1/2] Introduced L2G and G2L method signatures for long integers. --- base/modules/desc/psb_indx_map_mod.f90 | 362 +++++++++++++++++++++++-- 1 file changed, 340 insertions(+), 22 deletions(-) diff --git a/base/modules/desc/psb_indx_map_mod.f90 b/base/modules/desc/psb_indx_map_mod.f90 index 2ac03d65..17d970e1 100644 --- a/base/modules/desc/psb_indx_map_mod.f90 +++ b/base/modules/desc/psb_indx_map_mod.f90 @@ -167,26 +167,38 @@ module psb_indx_map_mod procedure, pass(idxmap) :: clone => base_clone procedure, pass(idxmap) :: reinit => base_reinit - procedure, pass(idxmap) :: l2gs1 => base_l2gs1 - procedure, pass(idxmap) :: l2gs2 => base_l2gs2 - procedure, pass(idxmap) :: l2gv1 => base_l2gv1 - procedure, pass(idxmap) :: l2gv2 => base_l2gv2 - generic, public :: l2g => l2gs2, l2gv2 - generic, public :: l2gip => l2gs1, l2gv1 - - procedure, pass(idxmap) :: g2ls1 => base_g2ls1 - procedure, pass(idxmap) :: g2ls2 => base_g2ls2 - procedure, pass(idxmap) :: g2lv1 => base_g2lv1 - procedure, pass(idxmap) :: g2lv2 => base_g2lv2 - generic, public :: g2l => g2ls2, g2lv2 - generic, public :: g2lip => g2ls1, g2lv1 - - procedure, pass(idxmap) :: g2ls1_ins => base_g2ls1_ins - procedure, pass(idxmap) :: g2ls2_ins => base_g2ls2_ins - procedure, pass(idxmap) :: g2lv1_ins => base_g2lv1_ins - procedure, pass(idxmap) :: g2lv2_ins => base_g2lv2_ins - generic, public :: g2l_ins => g2ls2_ins, g2lv2_ins - generic, public :: g2lip_ins => g2ls1_ins, g2lv1_ins + procedure, pass(idxmap) :: l2gs1 => base_l2gs1 + procedure, pass(idxmap) :: l2gs2 => base_l2gs2 + procedure, pass(idxmap) :: l2gv1 => base_l2gv1 + procedure, pass(idxmap) :: l2gv2 => base_l2gv2 + procedure, pass(idxmap) :: ll2gs1 => base_ll2gs1 + procedure, pass(idxmap) :: ll2gs2 => base_ll2gs2 + procedure, pass(idxmap) :: ll2gv1 => base_ll2gv1 + procedure, pass(idxmap) :: ll2gv2 => base_ll2gv2 + generic, public :: l2g => l2gs2, l2gv2, ll2gs2, ll2gv2 + generic, public :: l2gip => l2gs1, l2gv1, ll2gs1, ll2gv1 + + procedure, pass(idxmap) :: g2ls1 => base_g2ls1 + procedure, pass(idxmap) :: g2ls2 => base_g2ls2 + procedure, pass(idxmap) :: g2lv1 => base_g2lv1 + procedure, pass(idxmap) :: g2lv2 => base_g2lv2 + procedure, pass(idxmap) :: lg2ls1 => base_lg2ls1 + procedure, pass(idxmap) :: lg2ls2 => base_lg2ls2 + procedure, pass(idxmap) :: lg2lv1 => base_lg2lv1 + procedure, pass(idxmap) :: lg2lv2 => base_lg2lv2 + generic, public :: g2l => g2ls2, g2lv2, lg2ls2, lg2lv2 + generic, public :: g2lip => g2ls1, g2lv1, lg2ls1, lg2lv1 + + procedure, pass(idxmap) :: g2ls1_ins => base_g2ls1_ins + procedure, pass(idxmap) :: g2ls2_ins => base_g2ls2_ins + procedure, pass(idxmap) :: g2lv1_ins => base_g2lv1_ins + procedure, pass(idxmap) :: g2lv2_ins => base_g2lv2_ins + procedure, pass(idxmap) :: lg2ls1_ins => base_lg2ls1_ins + procedure, pass(idxmap) :: lg2ls2_ins => base_lg2ls2_ins + procedure, pass(idxmap) :: lg2lv1_ins => base_lg2lv1_ins + procedure, pass(idxmap) :: lg2lv2_ins => base_lg2lv2_ins + generic, public :: g2l_ins => g2ls2_ins, g2lv2_ins, lg2ls2_ins, lg2lv2_ins + generic, public :: g2lip_ins => g2ls1_ins, g2lv1_ins, lg2ls1_ins, lg2lv1_ins procedure, pass(idxmap) :: fnd_owner => psb_indx_map_fnd_owner procedure, pass(idxmap) :: init_vl => base_init_vl @@ -203,8 +215,11 @@ module psb_indx_map_mod & base_set_mpic, base_get_fmt, base_asb, base_free,& & base_l2gs1, base_l2gs2, base_l2gv1, base_l2gv2,& & base_g2ls1, base_g2ls2, base_g2lv1, base_g2lv2,& - & base_g2ls1_ins, base_g2ls2_ins, base_g2lv1_ins,& - & base_g2lv2_ins, base_init_vl, base_is_null,& + & base_g2ls1_ins, base_g2ls2_ins, base_g2lv1_ins, base_g2lv2_ins, & + & base_ll2gs1, base_ll2gs2, base_ll2gv1, base_ll2gv2,& + & base_lg2ls1, base_lg2ls2, base_lg2lv1, base_lg2lv2,& + & base_lg2ls1_ins, base_lg2ls2_ins, base_lg2lv1_ins,& + & base_lg2lv2_ins, base_init_vl, base_is_null,& & base_row_extendable, base_clone, base_reinit !> Function: psb_indx_map_fnd_owner @@ -564,6 +579,107 @@ contains end subroutine base_l2gv2 + !> + !! \memberof psb_indx_map + !! \brief Local to global, scalar, in place + subroutine base_ll2gs1(idx,idxmap,info,mask,owned) + use psb_error_mod + implicit none + class(psb_indx_map), intent(in) :: idxmap + integer(psb_lpk_), intent(inout) :: idx + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask + logical, intent(in), optional :: owned + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_ll2g' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_ll2gs1 + + subroutine base_ll2gs2(idxin,idxout,idxmap,info,mask,owned) + use psb_error_mod + implicit none + class(psb_indx_map), intent(in) :: idxmap + integer(psb_ipk_), intent(in) :: idxin + integer(psb_lpk_), intent(out) :: idxout + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask + logical, intent(in), optional :: owned + + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_ll2g' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + + end subroutine base_ll2gs2 + + + subroutine base_ll2gv1(idx,idxmap,info,mask,owned) + use psb_error_mod + implicit none + class(psb_indx_map), intent(in) :: idxmap + integer(psb_lpk_), intent(inout) :: idx(:) + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask(:) + logical, intent(in), optional :: owned + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_ll2g' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + end subroutine base_ll2gv1 + + subroutine base_ll2gv2(idxin,idxout,idxmap,info,mask,owned) + use psb_error_mod + implicit none + class(psb_indx_map), intent(in) :: idxmap + integer(psb_ipk_), intent(in) :: idxin(:) + integer(psb_lpk_), intent(out) :: idxout(:) + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask(:) + logical, intent(in), optional :: owned + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_ll2g' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_ll2gv2 + subroutine base_g2ls1(idx,idxmap,info,mask,owned) use psb_error_mod @@ -667,6 +783,106 @@ contains end subroutine base_g2lv2 + subroutine base_lg2ls1(idx,idxmap,info,mask,owned) + use psb_error_mod + implicit none + class(psb_indx_map), intent(in) :: idxmap + integer(psb_lpk_), intent(inout) :: idx + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask + logical, intent(in), optional :: owned + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_lg2l' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_lg2ls1 + + subroutine base_lg2ls2(idxin,idxout,idxmap,info,mask,owned) + use psb_error_mod + implicit none + class(psb_indx_map), intent(in) :: idxmap + integer(psb_lpk_), intent(in) :: idxin + integer(psb_ipk_), intent(out) :: idxout + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask + logical, intent(in), optional :: owned + + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_lg2l' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_lg2ls2 + + + subroutine base_lg2lv1(idx,idxmap,info,mask,owned) + use psb_error_mod + implicit none + class(psb_indx_map), intent(in) :: idxmap + integer(psb_lpk_), intent(inout) :: idx(:) + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask(:) + logical, intent(in), optional :: owned + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_lg2l' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_lg2lv1 + + subroutine base_lg2lv2(idxin,idxout,idxmap,info,mask,owned) + use psb_error_mod + implicit none + class(psb_indx_map), intent(in) :: idxmap + integer(psb_lpk_), intent(in) :: idxin(:) + integer(psb_ipk_), intent(out) :: idxout(:) + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask(:) + logical, intent(in), optional :: owned + + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_lg2l' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_lg2lv2 subroutine base_g2ls1_ins(idx,idxmap,info,mask, lidx) @@ -772,6 +988,108 @@ contains end subroutine base_g2lv2_ins + subroutine base_lg2ls1_ins(idx,idxmap,info,mask, lidx) + use psb_error_mod + implicit none + class(psb_indx_map), intent(inout) :: idxmap + integer(psb_lpk_), intent(inout) :: idx + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask + integer(psb_ipk_), intent(in), optional :: lidx + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_lg2l_ins' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_lg2ls1_ins + + subroutine base_lg2ls2_ins(idxin,idxout,idxmap,info,mask, lidx) + use psb_error_mod + implicit none + class(psb_indx_map), intent(inout) :: idxmap + integer(psb_lpk_), intent(in) :: idxin + integer(psb_ipk_), intent(out) :: idxout + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask + integer(psb_ipk_), intent(in), optional :: lidx + + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_lg2l_ins' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_lg2ls2_ins + + + subroutine base_lg2lv1_ins(idx,idxmap,info,mask, lidx) + use psb_error_mod + implicit none + class(psb_indx_map), intent(inout) :: idxmap + integer(psb_lpk_), intent(inout) :: idx(:) + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) + + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_lg2l_ins' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_lg2lv1_ins + + subroutine base_lg2lv2_ins(idxin,idxout,idxmap,info,mask,lidx) + use psb_error_mod + implicit none + class(psb_indx_map), intent(inout) :: idxmap + integer(psb_lpk_), intent(in) :: idxin(:) + integer(psb_ipk_), intent(out) :: idxout(:) + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask(:) + integer(psb_ipk_), intent(in), optional :: lidx(:) + + integer(psb_ipk_) :: err_act + character(len=20) :: name='base_lg2l_ins' + logical, parameter :: debug=.false. + + call psb_get_erraction(err_act) + ! This is the base version. If we get here + ! it means the derived class is incomplete, + ! so we throw an error. + call psb_errpush(psb_err_missing_override_method_,& + & name,a_err=idxmap%get_fmt()) + + call psb_error_handler(err_act) + return + + end subroutine base_lg2lv2_ins + subroutine base_asb(idxmap,info) use psb_error_mod implicit none From 32f4e7ad28c1b56634853a8d3e7f4617959da1e1 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sun, 18 Feb 2018 08:49:37 +0000 Subject: [PATCH 2/2] Revert "Merge branch 'MixedI8' into development" This reverts commit a4bb89df8ba56d46a2ee9d9e8b17cd530480f1e6, reversing changes made to 273fd7ac44e1fdddd51bc04acfa70d637186ef08. --- base/modules/desc/psb_indx_map_mod.f90 | 419 +++---------------------- base/modules/psb_const_mod.F90 | 5 - 2 files changed, 39 insertions(+), 385 deletions(-) diff --git a/base/modules/desc/psb_indx_map_mod.f90 b/base/modules/desc/psb_indx_map_mod.f90 index 17d970e1..fcfb666b 100644 --- a/base/modules/desc/psb_indx_map_mod.f90 +++ b/base/modules/desc/psb_indx_map_mod.f90 @@ -112,9 +112,9 @@ module psb_indx_map_mod !> MPI communicator integer(psb_mpik_) :: mpic = -1 !> Number of global rows - integer(psb_lpk_) :: global_rows = -1 + integer(psb_ipk_) :: global_rows = -1 !> Number of global columns - integer(psb_lpk_) :: global_cols = -1 + integer(psb_ipk_) :: global_cols = -1 !> Number of local rows integer(psb_ipk_) :: local_rows = -1 !> Number of local columns @@ -141,25 +141,19 @@ module psb_indx_map_mod procedure, pass(idxmap) :: get_gc => base_get_gc procedure, pass(idxmap) :: get_lr => base_get_lr procedure, pass(idxmap) :: get_lc => base_get_lc - - procedure, pass(idxmap) :: set_gri => base_set_gri - procedure, pass(idxmap) :: set_gci => base_set_gci - procedure, pass(idxmap) :: set_grl => base_set_grl - procedure, pass(idxmap) :: set_gcl => base_set_gcl - generic, public :: set_gr => set_gri, set_grl - generic, public :: set_gc => set_gci, set_gcl - - procedure, pass(idxmap) :: set_lr => base_set_lr - procedure, pass(idxmap) :: set_lc => base_set_lc - - procedure, pass(idxmap) :: set_ctxt => base_set_ctxt - procedure, pass(idxmap) :: set_mpic => base_set_mpic procedure, pass(idxmap) :: get_ctxt => base_get_ctxt procedure, pass(idxmap) :: get_mpic => base_get_mpic procedure, pass(idxmap) :: sizeof => base_sizeof procedure, pass(idxmap) :: set_null => base_set_null procedure, nopass :: row_extendable => base_row_extendable + procedure, pass(idxmap) :: set_gr => base_set_gr + procedure, pass(idxmap) :: set_gc => base_set_gc + procedure, pass(idxmap) :: set_lr => base_set_lr + procedure, pass(idxmap) :: set_lc => base_set_lc + procedure, pass(idxmap) :: set_ctxt => base_set_ctxt + procedure, pass(idxmap) :: set_mpic => base_set_mpic + procedure, nopass :: get_fmt => base_get_fmt procedure, pass(idxmap) :: asb => base_asb @@ -167,38 +161,26 @@ module psb_indx_map_mod procedure, pass(idxmap) :: clone => base_clone procedure, pass(idxmap) :: reinit => base_reinit - procedure, pass(idxmap) :: l2gs1 => base_l2gs1 - procedure, pass(idxmap) :: l2gs2 => base_l2gs2 - procedure, pass(idxmap) :: l2gv1 => base_l2gv1 - procedure, pass(idxmap) :: l2gv2 => base_l2gv2 - procedure, pass(idxmap) :: ll2gs1 => base_ll2gs1 - procedure, pass(idxmap) :: ll2gs2 => base_ll2gs2 - procedure, pass(idxmap) :: ll2gv1 => base_ll2gv1 - procedure, pass(idxmap) :: ll2gv2 => base_ll2gv2 - generic, public :: l2g => l2gs2, l2gv2, ll2gs2, ll2gv2 - generic, public :: l2gip => l2gs1, l2gv1, ll2gs1, ll2gv1 - - procedure, pass(idxmap) :: g2ls1 => base_g2ls1 - procedure, pass(idxmap) :: g2ls2 => base_g2ls2 - procedure, pass(idxmap) :: g2lv1 => base_g2lv1 - procedure, pass(idxmap) :: g2lv2 => base_g2lv2 - procedure, pass(idxmap) :: lg2ls1 => base_lg2ls1 - procedure, pass(idxmap) :: lg2ls2 => base_lg2ls2 - procedure, pass(idxmap) :: lg2lv1 => base_lg2lv1 - procedure, pass(idxmap) :: lg2lv2 => base_lg2lv2 - generic, public :: g2l => g2ls2, g2lv2, lg2ls2, lg2lv2 - generic, public :: g2lip => g2ls1, g2lv1, lg2ls1, lg2lv1 - - procedure, pass(idxmap) :: g2ls1_ins => base_g2ls1_ins - procedure, pass(idxmap) :: g2ls2_ins => base_g2ls2_ins - procedure, pass(idxmap) :: g2lv1_ins => base_g2lv1_ins - procedure, pass(idxmap) :: g2lv2_ins => base_g2lv2_ins - procedure, pass(idxmap) :: lg2ls1_ins => base_lg2ls1_ins - procedure, pass(idxmap) :: lg2ls2_ins => base_lg2ls2_ins - procedure, pass(idxmap) :: lg2lv1_ins => base_lg2lv1_ins - procedure, pass(idxmap) :: lg2lv2_ins => base_lg2lv2_ins - generic, public :: g2l_ins => g2ls2_ins, g2lv2_ins, lg2ls2_ins, lg2lv2_ins - generic, public :: g2lip_ins => g2ls1_ins, g2lv1_ins, lg2ls1_ins, lg2lv1_ins + procedure, pass(idxmap) :: l2gs1 => base_l2gs1 + procedure, pass(idxmap) :: l2gs2 => base_l2gs2 + procedure, pass(idxmap) :: l2gv1 => base_l2gv1 + procedure, pass(idxmap) :: l2gv2 => base_l2gv2 + generic, public :: l2g => l2gs2, l2gv2 + generic, public :: l2gip => l2gs1, l2gv1 + + procedure, pass(idxmap) :: g2ls1 => base_g2ls1 + procedure, pass(idxmap) :: g2ls2 => base_g2ls2 + procedure, pass(idxmap) :: g2lv1 => base_g2lv1 + procedure, pass(idxmap) :: g2lv2 => base_g2lv2 + generic, public :: g2l => g2ls2, g2lv2 + generic, public :: g2lip => g2ls1, g2lv1 + + procedure, pass(idxmap) :: g2ls1_ins => base_g2ls1_ins + procedure, pass(idxmap) :: g2ls2_ins => base_g2ls2_ins + procedure, pass(idxmap) :: g2lv1_ins => base_g2lv1_ins + procedure, pass(idxmap) :: g2lv2_ins => base_g2lv2_ins + generic, public :: g2l_ins => g2ls2_ins, g2lv2_ins + generic, public :: g2lip_ins => g2ls1_ins, g2lv1_ins procedure, pass(idxmap) :: fnd_owner => psb_indx_map_fnd_owner procedure, pass(idxmap) :: init_vl => base_init_vl @@ -209,17 +191,13 @@ module psb_indx_map_mod private :: base_get_state, base_set_state, base_is_repl, base_is_bld,& & base_is_upd, base_is_asb, base_is_valid, base_is_ovl,& & base_get_gr, base_get_gc, base_get_lr, base_get_lc, base_get_ctxt,& - & base_get_mpic, base_sizeof, base_set_null, & - & base_set_gri, base_set_gci, base_set_grl, base_set_gcl, & - & base_set_lr, base_set_lc, base_set_ctxt,& + & base_get_mpic, base_sizeof, base_set_null, base_set_gr,& + & base_set_gc, base_set_lr, base_set_lc, base_set_ctxt,& & base_set_mpic, base_get_fmt, base_asb, base_free,& & base_l2gs1, base_l2gs2, base_l2gv1, base_l2gv2,& & base_g2ls1, base_g2ls2, base_g2lv1, base_g2lv2,& - & base_g2ls1_ins, base_g2ls2_ins, base_g2lv1_ins, base_g2lv2_ins, & - & base_ll2gs1, base_ll2gs2, base_ll2gv1, base_ll2gv2,& - & base_lg2ls1, base_lg2ls2, base_lg2lv1, base_lg2lv2,& - & base_lg2ls1_ins, base_lg2ls2_ins, base_lg2lv1_ins,& - & base_lg2lv2_ins, base_init_vl, base_is_null,& + & base_g2ls1_ins, base_g2ls2_ins, base_g2lv1_ins,& + & base_g2lv2_ins, base_init_vl, base_is_null,& & base_row_extendable, base_clone, base_reinit !> Function: psb_indx_map_fnd_owner @@ -277,7 +255,7 @@ contains function base_get_gr(idxmap) result(val) implicit none class(psb_indx_map), intent(in) :: idxmap - integer(psb_lpk_) :: val + integer(psb_ipk_) :: val val = idxmap%global_rows @@ -287,7 +265,7 @@ contains function base_get_gc(idxmap) result(val) implicit none class(psb_indx_map), intent(in) :: idxmap - integer(psb_lpk_) :: val + integer(psb_ipk_) :: val val = idxmap%global_cols @@ -350,37 +328,21 @@ contains idxmap%ictxt = val end subroutine base_set_ctxt - subroutine base_set_gri(idxmap,val) + subroutine base_set_gr(idxmap,val) implicit none class(psb_indx_map), intent(inout) :: idxmap integer(psb_ipk_), intent(in) :: val idxmap%global_rows = val - end subroutine base_set_gri + end subroutine base_set_gr - subroutine base_set_gci(idxmap,val) + subroutine base_set_gc(idxmap,val) implicit none class(psb_indx_map), intent(inout) :: idxmap integer(psb_ipk_), intent(in) :: val idxmap%global_cols = val - end subroutine base_set_gci - - subroutine base_set_grl(idxmap,val) - implicit none - class(psb_indx_map), intent(inout) :: idxmap - integer(psb_lpk_), intent(in) :: val - - idxmap%global_rows = val - end subroutine base_set_grl - - subroutine base_set_gcl(idxmap,val) - implicit none - class(psb_indx_map), intent(inout) :: idxmap - integer(psb_lpk_), intent(in) :: val - - idxmap%global_cols = val - end subroutine base_set_gcl + end subroutine base_set_gc subroutine base_set_lr(idxmap,val) implicit none @@ -579,107 +541,6 @@ contains end subroutine base_l2gv2 - !> - !! \memberof psb_indx_map - !! \brief Local to global, scalar, in place - subroutine base_ll2gs1(idx,idxmap,info,mask,owned) - use psb_error_mod - implicit none - class(psb_indx_map), intent(in) :: idxmap - integer(psb_lpk_), intent(inout) :: idx - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask - logical, intent(in), optional :: owned - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_ll2g' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_ll2gs1 - - subroutine base_ll2gs2(idxin,idxout,idxmap,info,mask,owned) - use psb_error_mod - implicit none - class(psb_indx_map), intent(in) :: idxmap - integer(psb_ipk_), intent(in) :: idxin - integer(psb_lpk_), intent(out) :: idxout - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask - logical, intent(in), optional :: owned - - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_ll2g' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - - end subroutine base_ll2gs2 - - - subroutine base_ll2gv1(idx,idxmap,info,mask,owned) - use psb_error_mod - implicit none - class(psb_indx_map), intent(in) :: idxmap - integer(psb_lpk_), intent(inout) :: idx(:) - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - logical, intent(in), optional :: owned - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_ll2g' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - end subroutine base_ll2gv1 - - subroutine base_ll2gv2(idxin,idxout,idxmap,info,mask,owned) - use psb_error_mod - implicit none - class(psb_indx_map), intent(in) :: idxmap - integer(psb_ipk_), intent(in) :: idxin(:) - integer(psb_lpk_), intent(out) :: idxout(:) - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - logical, intent(in), optional :: owned - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_ll2g' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_ll2gv2 - subroutine base_g2ls1(idx,idxmap,info,mask,owned) use psb_error_mod @@ -783,106 +644,6 @@ contains end subroutine base_g2lv2 - subroutine base_lg2ls1(idx,idxmap,info,mask,owned) - use psb_error_mod - implicit none - class(psb_indx_map), intent(in) :: idxmap - integer(psb_lpk_), intent(inout) :: idx - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask - logical, intent(in), optional :: owned - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_lg2l' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_lg2ls1 - - subroutine base_lg2ls2(idxin,idxout,idxmap,info,mask,owned) - use psb_error_mod - implicit none - class(psb_indx_map), intent(in) :: idxmap - integer(psb_lpk_), intent(in) :: idxin - integer(psb_ipk_), intent(out) :: idxout - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask - logical, intent(in), optional :: owned - - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_lg2l' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_lg2ls2 - - - subroutine base_lg2lv1(idx,idxmap,info,mask,owned) - use psb_error_mod - implicit none - class(psb_indx_map), intent(in) :: idxmap - integer(psb_lpk_), intent(inout) :: idx(:) - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - logical, intent(in), optional :: owned - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_lg2l' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_lg2lv1 - - subroutine base_lg2lv2(idxin,idxout,idxmap,info,mask,owned) - use psb_error_mod - implicit none - class(psb_indx_map), intent(in) :: idxmap - integer(psb_lpk_), intent(in) :: idxin(:) - integer(psb_ipk_), intent(out) :: idxout(:) - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - logical, intent(in), optional :: owned - - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_lg2l' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_lg2lv2 subroutine base_g2ls1_ins(idx,idxmap,info,mask, lidx) @@ -988,108 +749,6 @@ contains end subroutine base_g2lv2_ins - subroutine base_lg2ls1_ins(idx,idxmap,info,mask, lidx) - use psb_error_mod - implicit none - class(psb_indx_map), intent(inout) :: idxmap - integer(psb_lpk_), intent(inout) :: idx - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask - integer(psb_ipk_), intent(in), optional :: lidx - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_lg2l_ins' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_lg2ls1_ins - - subroutine base_lg2ls2_ins(idxin,idxout,idxmap,info,mask, lidx) - use psb_error_mod - implicit none - class(psb_indx_map), intent(inout) :: idxmap - integer(psb_lpk_), intent(in) :: idxin - integer(psb_ipk_), intent(out) :: idxout - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask - integer(psb_ipk_), intent(in), optional :: lidx - - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_lg2l_ins' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_lg2ls2_ins - - - subroutine base_lg2lv1_ins(idx,idxmap,info,mask, lidx) - use psb_error_mod - implicit none - class(psb_indx_map), intent(inout) :: idxmap - integer(psb_lpk_), intent(inout) :: idx(:) - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - integer(psb_ipk_), intent(in), optional :: lidx(:) - - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_lg2l_ins' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_lg2lv1_ins - - subroutine base_lg2lv2_ins(idxin,idxout,idxmap,info,mask,lidx) - use psb_error_mod - implicit none - class(psb_indx_map), intent(inout) :: idxmap - integer(psb_lpk_), intent(in) :: idxin(:) - integer(psb_ipk_), intent(out) :: idxout(:) - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - integer(psb_ipk_), intent(in), optional :: lidx(:) - - integer(psb_ipk_) :: err_act - character(len=20) :: name='base_lg2l_ins' - logical, parameter :: debug=.false. - - call psb_get_erraction(err_act) - ! This is the base version. If we get here - ! it means the derived class is incomplete, - ! so we throw an error. - call psb_errpush(psb_err_missing_override_method_,& - & name,a_err=idxmap%get_fmt()) - - call psb_error_handler(err_act) - return - - end subroutine base_lg2lv2_ins - subroutine base_asb(idxmap,info) use psb_error_mod implicit none diff --git a/base/modules/psb_const_mod.F90 b/base/modules/psb_const_mod.F90 index fa9a4cea..80b88ef4 100644 --- a/base/modules/psb_const_mod.F90 +++ b/base/modules/psb_const_mod.F90 @@ -41,7 +41,6 @@ module psb_const_mod #endif ! This is always an 8-byte integer. integer, parameter :: psb_long_int_k_ = int64 - integer, parameter :: psb_lpk_ = psb_long_int_k_ ! This is always a 4-byte integer, for MPI-related stuff integer, parameter :: psb_mpik_ = int32 ! @@ -61,7 +60,6 @@ module psb_const_mod ! This is always an 8-byte integer. integer, parameter :: longndig=12 integer, parameter :: psb_long_int_k_ = selected_int_kind(longndig) - integer, parameter :: psb_lpk_ = psb_long_int_k_ ! This is always a 4-byte integer, for MPI-related stuff integer, parameter :: psb_mpik_ = kind(1) ! @@ -76,9 +74,6 @@ module psb_const_mod integer(psb_mpik_), parameter :: psb_dpk_ = selected_real_kind(psb_dpk_p_,psb_dpk_r_) #endif - ! - ! These variables will be populated at initialization time. - ! integer(psb_ipk_), save :: psb_sizeof_dp, psb_sizeof_sp integer(psb_ipk_), save :: psb_sizeof_int, psb_sizeof_long_int !