From 31d74c235f3e92801fbfacea9c8fea3971352736 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 23 Jul 2015 12:00:29 +0000 Subject: [PATCH] psblas: base/modules/psb_desc_mod.F90 base/tools/psb_ccdbldext.F90 base/tools/psb_cd_set_bld.f90 base/tools/psb_dcdbldext.F90 base/tools/psb_scdbldext.F90 base/tools/psb_zcdbldext.F90 Move reinit to set_bld, take it out from BLDEXT. --- base/modules/psb_desc_mod.F90 | 1 + base/tools/psb_ccdbldext.F90 | 1 - base/tools/psb_cd_set_bld.f90 | 5 +---- base/tools/psb_dcdbldext.F90 | 1 - base/tools/psb_scdbldext.F90 | 1 - base/tools/psb_zcdbldext.F90 | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/base/modules/psb_desc_mod.F90 b/base/modules/psb_desc_mod.F90 index 3bb6b829..df0639ca 100644 --- a/base/modules/psb_desc_mod.F90 +++ b/base/modules/psb_desc_mod.F90 @@ -1070,6 +1070,7 @@ contains end subroutine psb_cd_clone + Subroutine psb_cd_get_recv_idx(tmp,desc,data,info,toglob) use psb_error_mod diff --git a/base/tools/psb_ccdbldext.F90 b/base/tools/psb_ccdbldext.F90 index fa4d9934..13b83225 100644 --- a/base/tools/psb_ccdbldext.F90 +++ b/base/tools/psb_ccdbldext.F90 @@ -177,7 +177,6 @@ Subroutine psb_ccdbldext(a,desc_a,novr,desc_ov,info, extype) ! in a separate method. call psb_cd_switch_ovl_indxmap(desc_ov,info) end if - if (info == 0) call desc_ov%indxmap%reinit(info) if (info == 0) call psb_cd_set_ovl_bld(desc_ov,info) if (info /= 0) goto 9999 diff --git a/base/tools/psb_cd_set_bld.f90 b/base/tools/psb_cd_set_bld.f90 index 90adbefe..f2ebb3cb 100644 --- a/base/tools/psb_cd_set_bld.f90 +++ b/base/tools/psb_cd_set_bld.f90 @@ -39,7 +39,6 @@ subroutine psb_cd_set_ovl_bld(desc,info) if (info == psb_success_) then if (desc%indxmap%row_extendable()) then call desc%indxmap%set_state(psb_desc_ovl_bld_) -!!$ desc%matrix_data(psb_dec_type_) = psb_desc_ovl_bld_ else info = psb_err_invalid_cd_state_ end if @@ -70,10 +69,8 @@ subroutine psb_cd_set_bld(desc,info) call psb_info(ictxt, me, np) if (debug) write(psb_err_unit,*) me,'Entered CDSETBLD' - if (psb_is_asb_desc(desc)) then - end if + if (desc%is_asb()) call psb_cd_reinit(desc,info) -!!$ desc%matrix_data(psb_dec_type_) = psb_desc_bld_ call desc%indxmap%set_state(psb_desc_bld_) if (debug) write(psb_err_unit,*) me,'SET_BLD: done' diff --git a/base/tools/psb_dcdbldext.F90 b/base/tools/psb_dcdbldext.F90 index 6e162417..793fee22 100644 --- a/base/tools/psb_dcdbldext.F90 +++ b/base/tools/psb_dcdbldext.F90 @@ -177,7 +177,6 @@ Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info, extype) ! in a separate method. call psb_cd_switch_ovl_indxmap(desc_ov,info) end if - if (info == 0) call desc_ov%indxmap%reinit(info) if (info == 0) call psb_cd_set_ovl_bld(desc_ov,info) if (info /= 0) goto 9999 diff --git a/base/tools/psb_scdbldext.F90 b/base/tools/psb_scdbldext.F90 index be2cf8ed..d17db923 100644 --- a/base/tools/psb_scdbldext.F90 +++ b/base/tools/psb_scdbldext.F90 @@ -177,7 +177,6 @@ Subroutine psb_scdbldext(a,desc_a,novr,desc_ov,info, extype) ! in a separate method. call psb_cd_switch_ovl_indxmap(desc_ov,info) end if - if (info == 0) call desc_ov%indxmap%reinit(info) if (info == 0) call psb_cd_set_ovl_bld(desc_ov,info) if (info /= 0) goto 9999 diff --git a/base/tools/psb_zcdbldext.F90 b/base/tools/psb_zcdbldext.F90 index 3428089f..39ef4fce 100644 --- a/base/tools/psb_zcdbldext.F90 +++ b/base/tools/psb_zcdbldext.F90 @@ -177,7 +177,6 @@ Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info, extype) ! in a separate method. call psb_cd_switch_ovl_indxmap(desc_ov,info) end if - if (info == 0) call desc_ov%indxmap%reinit(info) if (info == 0) call psb_cd_set_ovl_bld(desc_ov,info) if (info /= 0) goto 9999