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