diff --git a/base/modules/psb_tools_mod.f90 b/base/modules/psb_tools_mod.f90 index 6f20a0a6..9f25b08b 100644 --- a/base/modules/psb_tools_mod.f90 +++ b/base/modules/psb_tools_mod.f90 @@ -333,7 +333,7 @@ Module psb_tools_mod interface psb_cdbldext - Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info,extype) + Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info,extype) use psb_descriptor_type Use psb_spmat_type integer, intent(in) :: novr @@ -342,8 +342,8 @@ Module psb_tools_mod Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info integer, intent(in),optional :: extype - end Subroutine psb_dcdovr - Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info,extype) + end Subroutine psb_dcdbldext + Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info,extype) use psb_descriptor_type Use psb_spmat_type integer, intent(in) :: novr @@ -352,7 +352,7 @@ Module psb_tools_mod Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info integer, intent(in),optional :: extype - end Subroutine psb_zcdovr + end Subroutine psb_zcdbldext end interface interface psb_cdren diff --git a/base/tools/Makefile b/base/tools/Makefile index 9fa47a18..27c5fe45 100644 --- a/base/tools/Makefile +++ b/base/tools/Makefile @@ -11,9 +11,9 @@ FOBJS = psb_dallc.o psb_dasb.o psb_cdprt.o \ psb_ifree.o psb_iins.o psb_loc_to_glob.o\ psb_zallc.o psb_zasb.o psb_zfree.o psb_zins.o \ psb_zspalloc.o psb_zspasb.o psb_zspfree.o\ - psb_zspins.o psb_zsprn.o psb_zcdovr.o + psb_zspins.o psb_zsprn.o -MPFOBJS = psb_dsphalo.o psb_zsphalo.o psb_icdasb.o psb_dcdovr.o psb_zcdovr.o +MPFOBJS = psb_dsphalo.o psb_zsphalo.o psb_icdasb.o psb_dcdbldext.o psb_zcdbldext.o LIBDIR=.. MODDIR=../modules diff --git a/base/tools/psb_dcdovr.F90 b/base/tools/psb_dcdbldext.F90 similarity index 98% rename from base/tools/psb_dcdovr.F90 rename to base/tools/psb_dcdbldext.F90 index 0e52f22f..8d444313 100644 --- a/base/tools/psb_dcdovr.F90 +++ b/base/tools/psb_dcdbldext.F90 @@ -28,9 +28,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: psb_cdovr.f90 +! File: psb_cdbldext.f90 ! -! Subroutine: psb_cdovr +! Subroutine: psb_cdbldext ! This routine takes a matrix A with its descriptor, and builds the ! auxiliary descriptor corresponding to the number of overlap levels ! specified on input. @@ -58,9 +58,9 @@ ! c. The (novr+1)-th layer becomes the ! new halo. ! -Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype) +Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info, extype) - use psb_tools_mod, psb_protect_name => psb_dcdovr + use psb_tools_mod, psb_protect_name => psb_dcdbldext use psb_serial_mod use psb_descriptor_type @@ -111,7 +111,7 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype) integer :: debug_level, debug_unit character(len=20) :: name, ch_err - name='psb_dcdovr' + name='psb_dcdbldext' info = 0 call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() @@ -588,7 +588,7 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype) Do i=1,iszr idx=workr(i) if (idx <1) then - write(0,*) me,'Error in CDOVRBLD level',i_ovr,' : ',idx,i,iszr + write(0,*) me,'Error in CDBLDEXTBLD level',i_ovr,' : ',idx,i,iszr else If (desc_ov%glob_to_loc(idx) < -np) Then ! ! This is a new index. Assigning a local index as @@ -624,7 +624,7 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype) &proc_id,n_col,idx else if (desc_ov%glob_to_loc(idx) < 0) Then if (debug_level >= psb_debug_outer_) & - & write(debug_unit,*) me,' ',trim(name),':Wrong input to cdovrbld?',& + & write(debug_unit,*) me,' ',trim(name),':Wrong input to cdbldextbld?',& &idx,desc_ov%glob_to_loc(idx) End If End Do @@ -763,5 +763,5 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype) end if Return -End Subroutine psb_dcdovr +End Subroutine psb_dcdbldext diff --git a/base/tools/psb_zcdovr.F90 b/base/tools/psb_zcdbldext.F90 similarity index 98% rename from base/tools/psb_zcdovr.F90 rename to base/tools/psb_zcdbldext.F90 index 7116e6b8..10883514 100644 --- a/base/tools/psb_zcdovr.F90 +++ b/base/tools/psb_zcdbldext.F90 @@ -28,9 +28,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: psb_zcdovr.f90 +! File: psb_zcdbldext.f90 ! -! Subroutine: psb_zcdovr +! Subroutine: psb_zcdbldext ! This routine takes a matrix A with its descriptor, and builds the ! auxiliary descriptor corresponding to the number of overlap levels ! specified on input. @@ -58,9 +58,9 @@ ! c. The (novr+1)-th layer becomes the ! new halo. ! -Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype) +Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info, extype) - use psb_tools_mod, psb_protect_name => psb_zcdovr + use psb_tools_mod, psb_protect_name => psb_zcdbldext use psb_serial_mod use psb_descriptor_type use psb_error_mod @@ -110,7 +110,7 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype) integer :: debug_level, debug_unit character(len=20) :: name, ch_err - name='psb_zcdovr' + name='psb_zcdbldext' info = 0 call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() @@ -587,7 +587,7 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype) Do i=1,iszr idx=workr(i) if (idx <1) then - write(0,*) me,'Error in CDOVRBLD level',i_ovr,' : ',idx,i,iszr + write(0,*) me,'Error in CDBLDEXTBLD level',i_ovr,' : ',idx,i,iszr else If (desc_ov%glob_to_loc(idx) < -np) Then ! ! This is a new index. Assigning a local index as @@ -623,7 +623,7 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype) &proc_id,n_col,idx else if (desc_ov%glob_to_loc(idx) < 0) Then if (debug_level >= psb_debug_outer_) & - & write(debug_unit,*) me,' ',trim(name),':Wrong input to cdovrbld?',& + & write(debug_unit,*) me,' ',trim(name),':Wrong input to cdbldextbld?',& &idx,desc_ov%glob_to_loc(idx) End If End Do @@ -762,5 +762,5 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype) end if Return -End Subroutine psb_zcdovr +End Subroutine psb_zcdbldext