diff --git a/mlprec/impl/Makefile b/mlprec/impl/Makefile index e03c55fc..9d4070ee 100644 --- a/mlprec/impl/Makefile +++ b/mlprec/impl/Makefile @@ -23,25 +23,25 @@ MPCOBJS=mld_sslud_interface.o mld_dslud_interface.o mld_cslud_interface.o mld_zs DINNEROBJS= mld_dmlprec_bld.o \ - mld_d_ml_prec_bld.o mld_d_hierarchy_bld.o \ + mld_d_smoothers_bld.o mld_d_hierarchy_bld.o \ mld_dilu0_fact.o mld_diluk_fact.o mld_dilut_fact.o mld_daggrmap_bld.o \ mld_d_dec_map_bld.o mld_dmlprec_aply.o mld_daggrmat_asb.o \ $(DMPFOBJS) mld_d_extprol_bld.o mld_d_lev_aggrmap_bld.o mld_d_lev_aggrmat_asb.o SINNEROBJS= mld_smlprec_bld.o \ - mld_s_ml_prec_bld.o mld_s_hierarchy_bld.o \ + mld_s_smoothers_bld.o mld_s_hierarchy_bld.o \ mld_silu0_fact.o mld_siluk_fact.o mld_silut_fact.o mld_saggrmap_bld.o \ mld_s_dec_map_bld.o mld_smlprec_aply.o mld_saggrmat_asb.o \ $(SMPFOBJS) mld_s_extprol_bld.o mld_s_lev_aggrmap_bld.o mld_s_lev_aggrmat_asb.o ZINNEROBJS= mld_zmlprec_bld.o \ - mld_z_ml_prec_bld.o mld_z_hierarchy_bld.o \ + mld_z_smoothers_bld.o mld_z_hierarchy_bld.o \ mld_zilu0_fact.o mld_ziluk_fact.o mld_zilut_fact.o mld_zaggrmap_bld.o \ mld_z_dec_map_bld.o mld_zmlprec_aply.o mld_zaggrmat_asb.o \ $(ZMPFOBJS) mld_z_extprol_bld.o mld_z_lev_aggrmap_bld.o mld_z_lev_aggrmat_asb.o CINNEROBJS= mld_cmlprec_bld.o \ - mld_c_ml_prec_bld.o mld_c_hierarchy_bld.o \ + mld_c_smoothers_bld.o mld_c_hierarchy_bld.o \ mld_cilu0_fact.o mld_ciluk_fact.o mld_cilut_fact.o mld_caggrmap_bld.o \ mld_c_dec_map_bld.o mld_cmlprec_aply.o mld_caggrmat_asb.o \ $(CMPFOBJS) mld_c_extprol_bld.o mld_c_lev_aggrmap_bld.o mld_c_lev_aggrmat_asb.o diff --git a/mlprec/impl/mld_c_ml_prec_bld.f90 b/mlprec/impl/mld_c_smoothers_bld.f90 similarity index 96% rename from mlprec/impl/mld_c_ml_prec_bld.f90 rename to mlprec/impl/mld_c_smoothers_bld.f90 index bb875722..4a8815b2 100644 --- a/mlprec/impl/mld_c_ml_prec_bld.f90 +++ b/mlprec/impl/mld_c_smoothers_bld.f90 @@ -36,9 +36,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: mld_c_ml_prec_bld.f90 +! File: mld_c_smoothers_bld.f90 ! -! Subroutine: mld_c_ml_prec_bld +! Subroutine: mld_c_smoothers_bld ! Version: complex ! ! This routine builds the preconditioner according to the requirements made by @@ -74,11 +74,11 @@ ! ! ! -subroutine mld_c_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) +subroutine mld_c_smoothers_bld(a,desc_a,p,info,amold,vmold,imold) use psb_base_mod use mld_c_inner_mod - use mld_c_prec_mod, mld_protect_name => mld_c_ml_prec_bld + use mld_c_prec_mod, mld_protect_name => mld_c_smoothers_bld Implicit None @@ -109,7 +109,7 @@ subroutine mld_c_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - name = 'mld_c_ml_prec_bld' + name = 'mld_c_smoothers_bld' info = psb_success_ int_err(1) = 0 ictxt = desc_a%get_context() @@ -191,4 +191,4 @@ subroutine mld_c_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) return -end subroutine mld_c_ml_prec_bld +end subroutine mld_c_smoothers_bld diff --git a/mlprec/impl/mld_cmlprec_bld.f90 b/mlprec/impl/mld_cmlprec_bld.f90 index d3ef5b41..ba53ea68 100644 --- a/mlprec/impl/mld_cmlprec_bld.f90 +++ b/mlprec/impl/mld_cmlprec_bld.f90 @@ -129,7 +129,7 @@ subroutine mld_cmlprec_bld(a,desc_a,p,info,amold,vmold,imold) iszv = p%get_nlevs() - call mld_c_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + call mld_c_smoothers_bld(a,desc_a,p,info,amold,vmold,imold) if (info /= psb_success_) then info=psb_err_internal_error_ diff --git a/mlprec/impl/mld_d_ml_prec_bld.f90 b/mlprec/impl/mld_d_smoothers_bld.f90 similarity index 96% rename from mlprec/impl/mld_d_ml_prec_bld.f90 rename to mlprec/impl/mld_d_smoothers_bld.f90 index f2507278..f0e3ad2d 100644 --- a/mlprec/impl/mld_d_ml_prec_bld.f90 +++ b/mlprec/impl/mld_d_smoothers_bld.f90 @@ -36,9 +36,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: mld_d_ml_prec_bld.f90 +! File: mld_d_smoothers_bld.f90 ! -! Subroutine: mld_d_ml_prec_bld +! Subroutine: mld_d_smoothers_bld ! Version: real ! ! This routine builds the preconditioner according to the requirements made by @@ -74,11 +74,11 @@ ! ! ! -subroutine mld_d_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) +subroutine mld_d_smoothers_bld(a,desc_a,p,info,amold,vmold,imold) use psb_base_mod use mld_d_inner_mod - use mld_d_prec_mod, mld_protect_name => mld_d_ml_prec_bld + use mld_d_prec_mod, mld_protect_name => mld_d_smoothers_bld Implicit None @@ -109,7 +109,7 @@ subroutine mld_d_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - name = 'mld_d_ml_prec_bld' + name = 'mld_d_smoothers_bld' info = psb_success_ int_err(1) = 0 ictxt = desc_a%get_context() @@ -191,4 +191,4 @@ subroutine mld_d_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) return -end subroutine mld_d_ml_prec_bld +end subroutine mld_d_smoothers_bld diff --git a/mlprec/impl/mld_dmlprec_bld.f90 b/mlprec/impl/mld_dmlprec_bld.f90 index b5252739..9fbe1c70 100644 --- a/mlprec/impl/mld_dmlprec_bld.f90 +++ b/mlprec/impl/mld_dmlprec_bld.f90 @@ -129,7 +129,7 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info,amold,vmold,imold) iszv = p%get_nlevs() - call mld_d_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + call mld_d_smoothers_bld(a,desc_a,p,info,amold,vmold,imold) if (info /= psb_success_) then info=psb_err_internal_error_ diff --git a/mlprec/impl/mld_s_ml_prec_bld.f90 b/mlprec/impl/mld_s_smoothers_bld.f90 similarity index 96% rename from mlprec/impl/mld_s_ml_prec_bld.f90 rename to mlprec/impl/mld_s_smoothers_bld.f90 index 3614504d..4561a5f7 100644 --- a/mlprec/impl/mld_s_ml_prec_bld.f90 +++ b/mlprec/impl/mld_s_smoothers_bld.f90 @@ -36,9 +36,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: mld_s_ml_prec_bld.f90 +! File: mld_s_smoothers_bld.f90 ! -! Subroutine: mld_s_ml_prec_bld +! Subroutine: mld_s_smoothers_bld ! Version: real ! ! This routine builds the preconditioner according to the requirements made by @@ -74,11 +74,11 @@ ! ! ! -subroutine mld_s_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) +subroutine mld_s_smoothers_bld(a,desc_a,p,info,amold,vmold,imold) use psb_base_mod use mld_s_inner_mod - use mld_s_prec_mod, mld_protect_name => mld_s_ml_prec_bld + use mld_s_prec_mod, mld_protect_name => mld_s_smoothers_bld Implicit None @@ -109,7 +109,7 @@ subroutine mld_s_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - name = 'mld_s_ml_prec_bld' + name = 'mld_s_smoothers_bld' info = psb_success_ int_err(1) = 0 ictxt = desc_a%get_context() @@ -191,4 +191,4 @@ subroutine mld_s_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) return -end subroutine mld_s_ml_prec_bld +end subroutine mld_s_smoothers_bld diff --git a/mlprec/impl/mld_smlprec_bld.f90 b/mlprec/impl/mld_smlprec_bld.f90 index b96dc733..761df534 100644 --- a/mlprec/impl/mld_smlprec_bld.f90 +++ b/mlprec/impl/mld_smlprec_bld.f90 @@ -129,7 +129,7 @@ subroutine mld_smlprec_bld(a,desc_a,p,info,amold,vmold,imold) iszv = p%get_nlevs() - call mld_s_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + call mld_s_smoothers_bld(a,desc_a,p,info,amold,vmold,imold) if (info /= psb_success_) then info=psb_err_internal_error_ diff --git a/mlprec/impl/mld_z_ml_prec_bld.f90 b/mlprec/impl/mld_z_smoothers_bld.f90 similarity index 96% rename from mlprec/impl/mld_z_ml_prec_bld.f90 rename to mlprec/impl/mld_z_smoothers_bld.f90 index 6a87f734..20f1f1b9 100644 --- a/mlprec/impl/mld_z_ml_prec_bld.f90 +++ b/mlprec/impl/mld_z_smoothers_bld.f90 @@ -36,9 +36,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: mld_z_ml_prec_bld.f90 +! File: mld_z_smoothers_bld.f90 ! -! Subroutine: mld_z_ml_prec_bld +! Subroutine: mld_z_smoothers_bld ! Version: complex ! ! This routine builds the preconditioner according to the requirements made by @@ -74,11 +74,11 @@ ! ! ! -subroutine mld_z_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) +subroutine mld_z_smoothers_bld(a,desc_a,p,info,amold,vmold,imold) use psb_base_mod use mld_z_inner_mod - use mld_z_prec_mod, mld_protect_name => mld_z_ml_prec_bld + use mld_z_prec_mod, mld_protect_name => mld_z_smoothers_bld Implicit None @@ -109,7 +109,7 @@ subroutine mld_z_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - name = 'mld_z_ml_prec_bld' + name = 'mld_z_smoothers_bld' info = psb_success_ int_err(1) = 0 ictxt = desc_a%get_context() @@ -191,4 +191,4 @@ subroutine mld_z_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) return -end subroutine mld_z_ml_prec_bld +end subroutine mld_z_smoothers_bld diff --git a/mlprec/impl/mld_zmlprec_bld.f90 b/mlprec/impl/mld_zmlprec_bld.f90 index 7c292b1c..50253ac9 100644 --- a/mlprec/impl/mld_zmlprec_bld.f90 +++ b/mlprec/impl/mld_zmlprec_bld.f90 @@ -129,7 +129,7 @@ subroutine mld_zmlprec_bld(a,desc_a,p,info,amold,vmold,imold) iszv = p%get_nlevs() - call mld_z_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + call mld_z_smoothers_bld(a,desc_a,p,info,amold,vmold,imold) if (info /= psb_success_) then info=psb_err_internal_error_ diff --git a/mlprec/mld_c_inner_mod.f90 b/mlprec/mld_c_inner_mod.f90 index 467a193c..bf447a14 100644 --- a/mlprec/mld_c_inner_mod.f90 +++ b/mlprec/mld_c_inner_mod.f90 @@ -64,7 +64,6 @@ module mld_c_inner_mod end subroutine mld_cmlprec_bld end interface mld_mlprec_bld - interface mld_mlprec_aply subroutine mld_cmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_, psb_ipk_ @@ -95,20 +94,6 @@ module mld_c_inner_mod end subroutine mld_cmlprec_aply_vect end interface mld_mlprec_aply - - interface mld_coarse_bld - subroutine mld_ccoarse_bld(a,desc_a,p,info) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_, psb_ipk_ - use mld_c_prec_type, only : mld_c_onelev_type - implicit none - type(psb_cspmat_type), intent(in), target :: a - type(psb_desc_type), intent(in), target :: desc_a - type(mld_c_onelev_type), intent(inout), target :: p - integer(psb_ipk_), intent(out) :: info - end subroutine mld_ccoarse_bld - end interface mld_coarse_bld - - interface mld_bld_mlhier_aggsize subroutine mld_c_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,precv,info) use psb_base_mod, only : psb_ipk_, psb_cspmat_type, psb_desc_type,psb_spk_ diff --git a/mlprec/mld_c_prec_mod.f90 b/mlprec/mld_c_prec_mod.f90 index 103d66c5..7a0e06cb 100644 --- a/mlprec/mld_c_prec_mod.f90 +++ b/mlprec/mld_c_prec_mod.f90 @@ -120,8 +120,8 @@ module mld_c_prec_mod end subroutine mld_c_extprol_bld end interface mld_extprol_bld - interface mld_ml_prec_bld - subroutine mld_c_ml_prec_bld(a,desc_a,prec,info,amold,vmold,imold) + interface mld_smoothers_bld + subroutine mld_c_smoothers_bld(a,desc_a,prec,info,amold,vmold,imold) import :: psb_cspmat_type, psb_desc_type, psb_spk_, & & psb_c_base_sparse_mat, psb_c_base_vect_type, & & psb_i_base_vect_type, mld_cprec_type, psb_ipk_ @@ -134,8 +134,8 @@ module mld_c_prec_mod class(psb_c_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold ! character, intent(in),optional :: upd - end subroutine mld_c_ml_prec_bld - end interface mld_ml_prec_bld + end subroutine mld_c_smoothers_bld + end interface mld_smoothers_bld contains diff --git a/mlprec/mld_d_inner_mod.f90 b/mlprec/mld_d_inner_mod.f90 index 6fc4c07a..cd4dd596 100644 --- a/mlprec/mld_d_inner_mod.f90 +++ b/mlprec/mld_d_inner_mod.f90 @@ -64,7 +64,6 @@ module mld_d_inner_mod end subroutine mld_dmlprec_bld end interface mld_mlprec_bld - interface mld_mlprec_aply subroutine mld_dmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_, psb_ipk_ @@ -95,20 +94,6 @@ module mld_d_inner_mod end subroutine mld_dmlprec_aply_vect end interface mld_mlprec_aply - - interface mld_coarse_bld - subroutine mld_dcoarse_bld(a,desc_a,p,info) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_, psb_ipk_ - use mld_d_prec_type, only : mld_d_onelev_type - implicit none - type(psb_dspmat_type), intent(in), target :: a - type(psb_desc_type), intent(in), target :: desc_a - type(mld_d_onelev_type), intent(inout), target :: p - integer(psb_ipk_), intent(out) :: info - end subroutine mld_dcoarse_bld - end interface mld_coarse_bld - - interface mld_bld_mlhier_aggsize subroutine mld_d_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,precv,info) use psb_base_mod, only : psb_ipk_, psb_dspmat_type, psb_desc_type,psb_dpk_ diff --git a/mlprec/mld_d_prec_mod.f90 b/mlprec/mld_d_prec_mod.f90 index 6e8de542..885a11e2 100644 --- a/mlprec/mld_d_prec_mod.f90 +++ b/mlprec/mld_d_prec_mod.f90 @@ -120,8 +120,8 @@ module mld_d_prec_mod end subroutine mld_d_extprol_bld end interface mld_extprol_bld - interface mld_ml_prec_bld - subroutine mld_d_ml_prec_bld(a,desc_a,prec,info,amold,vmold,imold) + interface mld_smoothers_bld + subroutine mld_d_smoothers_bld(a,desc_a,prec,info,amold,vmold,imold) import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & & psb_d_base_sparse_mat, psb_d_base_vect_type, & & psb_i_base_vect_type, mld_dprec_type, psb_ipk_ @@ -134,8 +134,8 @@ module mld_d_prec_mod class(psb_d_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold ! character, intent(in),optional :: upd - end subroutine mld_d_ml_prec_bld - end interface mld_ml_prec_bld + end subroutine mld_d_smoothers_bld + end interface mld_smoothers_bld contains diff --git a/mlprec/mld_s_inner_mod.f90 b/mlprec/mld_s_inner_mod.f90 index 279e45df..ae4398ed 100644 --- a/mlprec/mld_s_inner_mod.f90 +++ b/mlprec/mld_s_inner_mod.f90 @@ -64,7 +64,6 @@ module mld_s_inner_mod end subroutine mld_smlprec_bld end interface mld_mlprec_bld - interface mld_mlprec_aply subroutine mld_smlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_, psb_ipk_ @@ -95,20 +94,6 @@ module mld_s_inner_mod end subroutine mld_smlprec_aply_vect end interface mld_mlprec_aply - - interface mld_coarse_bld - subroutine mld_scoarse_bld(a,desc_a,p,info) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_, psb_ipk_ - use mld_s_prec_type, only : mld_s_onelev_type - implicit none - type(psb_sspmat_type), intent(in), target :: a - type(psb_desc_type), intent(in), target :: desc_a - type(mld_s_onelev_type), intent(inout), target :: p - integer(psb_ipk_), intent(out) :: info - end subroutine mld_scoarse_bld - end interface mld_coarse_bld - - interface mld_bld_mlhier_aggsize subroutine mld_s_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,precv,info) use psb_base_mod, only : psb_ipk_, psb_sspmat_type, psb_desc_type,psb_spk_ diff --git a/mlprec/mld_s_prec_mod.f90 b/mlprec/mld_s_prec_mod.f90 index b7b4ddc9..6fe68623 100644 --- a/mlprec/mld_s_prec_mod.f90 +++ b/mlprec/mld_s_prec_mod.f90 @@ -120,8 +120,8 @@ module mld_s_prec_mod end subroutine mld_s_extprol_bld end interface mld_extprol_bld - interface mld_ml_prec_bld - subroutine mld_s_ml_prec_bld(a,desc_a,prec,info,amold,vmold,imold) + interface mld_smoothers_bld + subroutine mld_s_smoothers_bld(a,desc_a,prec,info,amold,vmold,imold) import :: psb_sspmat_type, psb_desc_type, psb_spk_, & & psb_s_base_sparse_mat, psb_s_base_vect_type, & & psb_i_base_vect_type, mld_sprec_type, psb_ipk_ @@ -134,8 +134,8 @@ module mld_s_prec_mod class(psb_s_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold ! character, intent(in),optional :: upd - end subroutine mld_s_ml_prec_bld - end interface mld_ml_prec_bld + end subroutine mld_s_smoothers_bld + end interface mld_smoothers_bld contains diff --git a/mlprec/mld_z_inner_mod.f90 b/mlprec/mld_z_inner_mod.f90 index 72e64ac6..d9b1c549 100644 --- a/mlprec/mld_z_inner_mod.f90 +++ b/mlprec/mld_z_inner_mod.f90 @@ -64,7 +64,6 @@ module mld_z_inner_mod end subroutine mld_zmlprec_bld end interface mld_mlprec_bld - interface mld_mlprec_aply subroutine mld_zmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_, psb_ipk_ @@ -95,20 +94,6 @@ module mld_z_inner_mod end subroutine mld_zmlprec_aply_vect end interface mld_mlprec_aply - - interface mld_coarse_bld - subroutine mld_zcoarse_bld(a,desc_a,p,info) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_, psb_ipk_ - use mld_z_prec_type, only : mld_z_onelev_type - implicit none - type(psb_zspmat_type), intent(in), target :: a - type(psb_desc_type), intent(in), target :: desc_a - type(mld_z_onelev_type), intent(inout), target :: p - integer(psb_ipk_), intent(out) :: info - end subroutine mld_zcoarse_bld - end interface mld_coarse_bld - - interface mld_bld_mlhier_aggsize subroutine mld_z_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,precv,info) use psb_base_mod, only : psb_ipk_, psb_zspmat_type, psb_desc_type,psb_dpk_ diff --git a/mlprec/mld_z_prec_mod.f90 b/mlprec/mld_z_prec_mod.f90 index 1d2f203f..d301b49b 100644 --- a/mlprec/mld_z_prec_mod.f90 +++ b/mlprec/mld_z_prec_mod.f90 @@ -120,8 +120,8 @@ module mld_z_prec_mod end subroutine mld_z_extprol_bld end interface mld_extprol_bld - interface mld_ml_prec_bld - subroutine mld_z_ml_prec_bld(a,desc_a,prec,info,amold,vmold,imold) + interface mld_smoothers_bld + subroutine mld_z_smoothers_bld(a,desc_a,prec,info,amold,vmold,imold) import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & & psb_z_base_sparse_mat, psb_z_base_vect_type, & & psb_i_base_vect_type, mld_zprec_type, psb_ipk_ @@ -134,8 +134,8 @@ module mld_z_prec_mod class(psb_z_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold ! character, intent(in),optional :: upd - end subroutine mld_z_ml_prec_bld - end interface mld_ml_prec_bld + end subroutine mld_z_smoothers_bld + end interface mld_smoothers_bld contains