From 9ded4607012b9668355ccc7884e96fa5417551f0 Mon Sep 17 00:00:00 2001 From: sfilippone Date: Tue, 18 Mar 2025 14:11:33 +0100 Subject: [PATCH] Fix #defines --- amgprec/impl/amg_ccprecset.F90 | 28 +++++++++---------- amgprec/impl/amg_cprecinit.F90 | 2 +- amgprec/impl/amg_dcprecset.F90 | 28 +++++++++---------- amgprec/impl/amg_dprecinit.F90 | 2 +- amgprec/impl/amg_scprecset.F90 | 28 +++++++++---------- amgprec/impl/amg_sprecinit.F90 | 2 +- amgprec/impl/amg_zcprecset.F90 | 28 +++++++++---------- amgprec/impl/amg_zprecinit.F90 | 2 +- .../impl/level/amg_c_base_onelev_csetc.F90 | 6 ++-- .../impl/level/amg_c_base_onelev_cseti.F90 | 6 ++-- .../impl/level/amg_d_base_onelev_csetc.F90 | 6 ++-- .../impl/level/amg_d_base_onelev_cseti.F90 | 6 ++-- .../impl/level/amg_s_base_onelev_csetc.F90 | 6 ++-- .../impl/level/amg_s_base_onelev_cseti.F90 | 6 ++-- .../impl/level/amg_z_base_onelev_csetc.F90 | 6 ++-- .../impl/level/amg_z_base_onelev_cseti.F90 | 6 ++-- 16 files changed, 84 insertions(+), 84 deletions(-) diff --git a/amgprec/impl/amg_ccprecset.F90 b/amgprec/impl/amg_ccprecset.F90 index 87d3e138..c3ef9ace 100644 --- a/amgprec/impl/amg_ccprecset.F90 +++ b/amgprec/impl/amg_ccprecset.F90 @@ -93,7 +93,7 @@ subroutine amg_ccprecseti(p,what,val,info,ilev,ilmax,pos,idx) #if defined(AMG_HAVE_SLU) use amg_c_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_c_mumps_solver #endif @@ -332,7 +332,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #if defined(AMG_HAVE_SLU) use amg_c_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_c_mumps_solver #endif use amg_c_krm_solver, only : amg_c_krm_solver_type @@ -482,7 +482,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) #if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -496,7 +496,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) #if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -513,7 +513,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -550,7 +550,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) case('MUMPS') -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -573,7 +573,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -597,7 +597,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -711,7 +711,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) #if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -724,7 +724,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) #if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -741,7 +741,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -778,7 +778,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) case('MUMPS') -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -801,7 +801,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -825,7 +825,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & diff --git a/amgprec/impl/amg_cprecinit.F90 b/amgprec/impl/amg_cprecinit.F90 index d67ebb9b..54079a1f 100644 --- a/amgprec/impl/amg_cprecinit.F90 +++ b/amgprec/impl/amg_cprecinit.F90 @@ -230,7 +230,7 @@ subroutine amg_cprecinit(ctxt,prec,ptype,info) end do call prec%set('ML_CYCLE','VCYCLE',info) call prec%set('SMOOTHER_TYPE','FBGS',info) -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call prec%set('COARSE_SOLVE','MUMPS',info) #elif defined(AMG_HAVE_SLU) call prec%set('COARSE_SOLVE','SLU',info) diff --git a/amgprec/impl/amg_dcprecset.F90 b/amgprec/impl/amg_dcprecset.F90 index 96e9f9d7..813d53ba 100644 --- a/amgprec/impl/amg_dcprecset.F90 +++ b/amgprec/impl/amg_dcprecset.F90 @@ -99,7 +99,7 @@ subroutine amg_dcprecseti(p,what,val,info,ilev,ilmax,pos,idx) #if defined(AMG_HAVE_SLU) use amg_d_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_d_mumps_solver #endif @@ -344,7 +344,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #if defined(AMG_HAVE_SLU) use amg_d_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_d_mumps_solver #endif use amg_d_krm_solver, only : amg_d_krm_solver_type @@ -496,7 +496,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) #elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -512,7 +512,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) #elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -529,7 +529,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -566,7 +566,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) case('MUMPS') -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -596,7 +596,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -634,7 +634,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -750,7 +750,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) #elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -765,7 +765,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) #elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -782,7 +782,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -819,7 +819,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) case('MUMPS') -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -849,7 +849,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -887,7 +887,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & diff --git a/amgprec/impl/amg_dprecinit.F90 b/amgprec/impl/amg_dprecinit.F90 index b261f185..9ad69179 100644 --- a/amgprec/impl/amg_dprecinit.F90 +++ b/amgprec/impl/amg_dprecinit.F90 @@ -244,7 +244,7 @@ subroutine amg_dprecinit(ctxt,prec,ptype,info) call prec%set('SMOOTHER_TYPE','FBGS',info) #if defined(AMG_HAVE_UMF) call prec%set('COARSE_SOLVE','UMF',info) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call prec%set('COARSE_SOLVE','MUMPS',info) #elif defined(AMG_HAVE_SLU) call prec%set('COARSE_SOLVE','SLU',info) diff --git a/amgprec/impl/amg_scprecset.F90 b/amgprec/impl/amg_scprecset.F90 index 3c6dbea5..7cda2f51 100644 --- a/amgprec/impl/amg_scprecset.F90 +++ b/amgprec/impl/amg_scprecset.F90 @@ -93,7 +93,7 @@ subroutine amg_scprecseti(p,what,val,info,ilev,ilmax,pos,idx) #if defined(AMG_HAVE_SLU) use amg_s_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_s_mumps_solver #endif @@ -332,7 +332,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #if defined(AMG_HAVE_SLU) use amg_s_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_s_mumps_solver #endif use amg_s_krm_solver, only : amg_s_krm_solver_type @@ -482,7 +482,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) #if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -496,7 +496,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) #if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -513,7 +513,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -550,7 +550,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) case('MUMPS') -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -573,7 +573,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -597,7 +597,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -711,7 +711,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) #if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -724,7 +724,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) #if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -741,7 +741,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -778,7 +778,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) case('MUMPS') -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -801,7 +801,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -825,7 +825,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & diff --git a/amgprec/impl/amg_sprecinit.F90 b/amgprec/impl/amg_sprecinit.F90 index a952af90..2b39d2d1 100644 --- a/amgprec/impl/amg_sprecinit.F90 +++ b/amgprec/impl/amg_sprecinit.F90 @@ -239,7 +239,7 @@ subroutine amg_sprecinit(ctxt,prec,ptype,info) end do call prec%set('ML_CYCLE','VCYCLE',info) call prec%set('SMOOTHER_TYPE','FBGS',info) -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call prec%set('COARSE_SOLVE','MUMPS',info) #elif defined(AMG_HAVE_SLU) call prec%set('COARSE_SOLVE','SLU',info) diff --git a/amgprec/impl/amg_zcprecset.F90 b/amgprec/impl/amg_zcprecset.F90 index dc895221..708e7e2e 100644 --- a/amgprec/impl/amg_zcprecset.F90 +++ b/amgprec/impl/amg_zcprecset.F90 @@ -99,7 +99,7 @@ subroutine amg_zcprecseti(p,what,val,info,ilev,ilmax,pos,idx) #if defined(AMG_HAVE_SLU) use amg_z_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_z_mumps_solver #endif @@ -344,7 +344,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #if defined(AMG_HAVE_SLU) use amg_z_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_z_mumps_solver #endif use amg_z_krm_solver, only : amg_z_krm_solver_type @@ -496,7 +496,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) #elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -512,7 +512,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) #elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -529,7 +529,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -566,7 +566,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) case('MUMPS') -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -596,7 +596,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -634,7 +634,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -750,7 +750,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) #elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -765,7 +765,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) #elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) #else call p%precv(nlev_)%set('SUB_SOLVE',amg_ilu_n_,info,pos=pos) @@ -782,7 +782,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -819,7 +819,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) case('MUMPS') -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -849,7 +849,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & @@ -887,7 +887,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_repl_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) if (hier_asb) & diff --git a/amgprec/impl/amg_zprecinit.F90 b/amgprec/impl/amg_zprecinit.F90 index 22e14d4a..39e79b87 100644 --- a/amgprec/impl/amg_zprecinit.F90 +++ b/amgprec/impl/amg_zprecinit.F90 @@ -235,7 +235,7 @@ subroutine amg_zprecinit(ctxt,prec,ptype,info) call prec%set('SMOOTHER_TYPE','FBGS',info) #if defined(AMG_HAVE_UMF) call prec%set('COARSE_SOLVE','UMF',info) -#elif defined(PSB_HAVE_MUMPS) +#elif defined(AMG_HAVE_MUMPS) call prec%set('COARSE_SOLVE','MUMPS',info) #elif defined(AMG_HAVE_SLU) call prec%set('COARSE_SOLVE','SLU',info) diff --git a/amgprec/impl/level/amg_c_base_onelev_csetc.F90 b/amgprec/impl/level/amg_c_base_onelev_csetc.F90 index ea19f016..22bfd112 100644 --- a/amgprec/impl/level/amg_c_base_onelev_csetc.F90 +++ b/amgprec/impl/level/amg_c_base_onelev_csetc.F90 @@ -56,7 +56,7 @@ subroutine amg_c_base_onelev_csetc(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) use amg_c_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_c_mumps_solver #endif @@ -91,7 +91,7 @@ subroutine amg_c_base_onelev_csetc(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) type(amg_c_slu_solver_type) :: amg_c_slu_solver_mold #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) type(amg_c_mumps_solver_type) :: amg_c_mumps_solver_mold #endif @@ -220,7 +220,7 @@ subroutine amg_c_base_onelev_csetc(lv,what,val,info,pos,idx) case ('SLU') call lv%set(amg_c_slu_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_MUMPS +#ifdef AMG_HAVE_MUMPS case ('MUMPS') call lv%set(amg_c_mumps_solver_mold,info,pos=pos) #endif diff --git a/amgprec/impl/level/amg_c_base_onelev_cseti.F90 b/amgprec/impl/level/amg_c_base_onelev_cseti.F90 index bb604080..f7e094ea 100644 --- a/amgprec/impl/level/amg_c_base_onelev_cseti.F90 +++ b/amgprec/impl/level/amg_c_base_onelev_cseti.F90 @@ -52,7 +52,7 @@ subroutine amg_c_base_onelev_cseti(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) use amg_c_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_c_mumps_solver #endif @@ -81,7 +81,7 @@ subroutine amg_c_base_onelev_cseti(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) type(amg_c_slu_solver_type) :: amg_c_slu_solver_mold #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) type(amg_c_mumps_solver_type) :: amg_c_mumps_solver_mold #endif @@ -178,7 +178,7 @@ subroutine amg_c_base_onelev_cseti(lv,what,val,info,pos,idx) case (amg_slu_) call lv%set(amg_c_slu_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_MUMPS +#ifdef AMG_HAVE_MUMPS case (amg_mumps_) call lv%set(amg_c_mumps_solver_mold,info,pos=pos) #endif diff --git a/amgprec/impl/level/amg_d_base_onelev_csetc.F90 b/amgprec/impl/level/amg_d_base_onelev_csetc.F90 index f975a19d..3ad55b07 100644 --- a/amgprec/impl/level/amg_d_base_onelev_csetc.F90 +++ b/amgprec/impl/level/amg_d_base_onelev_csetc.F90 @@ -66,7 +66,7 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) use amg_d_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_d_mumps_solver #endif @@ -108,7 +108,7 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) type(amg_d_slu_solver_type) :: amg_d_slu_solver_mold #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) type(amg_d_mumps_solver_type) :: amg_d_mumps_solver_mold #endif @@ -240,7 +240,7 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) case ('SLU') call lv%set(amg_d_slu_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_MUMPS +#ifdef AMG_HAVE_MUMPS case ('MUMPS') call lv%set(amg_d_mumps_solver_mold,info,pos=pos) #endif diff --git a/amgprec/impl/level/amg_d_base_onelev_cseti.F90 b/amgprec/impl/level/amg_d_base_onelev_cseti.F90 index 839d948c..d5782328 100644 --- a/amgprec/impl/level/amg_d_base_onelev_cseti.F90 +++ b/amgprec/impl/level/amg_d_base_onelev_cseti.F90 @@ -59,7 +59,7 @@ subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) use amg_d_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_d_mumps_solver #endif @@ -94,7 +94,7 @@ subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) type(amg_d_slu_solver_type) :: amg_d_slu_solver_mold #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) type(amg_d_mumps_solver_type) :: amg_d_mumps_solver_mold #endif @@ -191,7 +191,7 @@ subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx) case (amg_slu_) call lv%set(amg_d_slu_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_MUMPS +#ifdef AMG_HAVE_MUMPS case (amg_mumps_) call lv%set(amg_d_mumps_solver_mold,info,pos=pos) #endif diff --git a/amgprec/impl/level/amg_s_base_onelev_csetc.F90 b/amgprec/impl/level/amg_s_base_onelev_csetc.F90 index be32f1ac..05583ee3 100644 --- a/amgprec/impl/level/amg_s_base_onelev_csetc.F90 +++ b/amgprec/impl/level/amg_s_base_onelev_csetc.F90 @@ -60,7 +60,7 @@ subroutine amg_s_base_onelev_csetc(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) use amg_s_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_s_mumps_solver #endif @@ -96,7 +96,7 @@ subroutine amg_s_base_onelev_csetc(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) type(amg_s_slu_solver_type) :: amg_s_slu_solver_mold #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) type(amg_s_mumps_solver_type) :: amg_s_mumps_solver_mold #endif @@ -228,7 +228,7 @@ subroutine amg_s_base_onelev_csetc(lv,what,val,info,pos,idx) case ('SLU') call lv%set(amg_s_slu_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_MUMPS +#ifdef AMG_HAVE_MUMPS case ('MUMPS') call lv%set(amg_s_mumps_solver_mold,info,pos=pos) #endif diff --git a/amgprec/impl/level/amg_s_base_onelev_cseti.F90 b/amgprec/impl/level/amg_s_base_onelev_cseti.F90 index 7f9ac072..78ed0591 100644 --- a/amgprec/impl/level/amg_s_base_onelev_cseti.F90 +++ b/amgprec/impl/level/amg_s_base_onelev_cseti.F90 @@ -53,7 +53,7 @@ subroutine amg_s_base_onelev_cseti(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) use amg_s_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_s_mumps_solver #endif @@ -82,7 +82,7 @@ subroutine amg_s_base_onelev_cseti(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) type(amg_s_slu_solver_type) :: amg_s_slu_solver_mold #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) type(amg_s_mumps_solver_type) :: amg_s_mumps_solver_mold #endif @@ -179,7 +179,7 @@ subroutine amg_s_base_onelev_cseti(lv,what,val,info,pos,idx) case (amg_slu_) call lv%set(amg_s_slu_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_MUMPS +#ifdef AMG_HAVE_MUMPS case (amg_mumps_) call lv%set(amg_s_mumps_solver_mold,info,pos=pos) #endif diff --git a/amgprec/impl/level/amg_z_base_onelev_csetc.F90 b/amgprec/impl/level/amg_z_base_onelev_csetc.F90 index 5133dbcc..6df9e7dd 100644 --- a/amgprec/impl/level/amg_z_base_onelev_csetc.F90 +++ b/amgprec/impl/level/amg_z_base_onelev_csetc.F90 @@ -62,7 +62,7 @@ subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) use amg_z_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_z_mumps_solver #endif @@ -103,7 +103,7 @@ subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) type(amg_z_slu_solver_type) :: amg_z_slu_solver_mold #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) type(amg_z_mumps_solver_type) :: amg_z_mumps_solver_mold #endif @@ -232,7 +232,7 @@ subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx) case ('SLU') call lv%set(amg_z_slu_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_MUMPS +#ifdef AMG_HAVE_MUMPS case ('MUMPS') call lv%set(amg_z_mumps_solver_mold,info,pos=pos) #endif diff --git a/amgprec/impl/level/amg_z_base_onelev_cseti.F90 b/amgprec/impl/level/amg_z_base_onelev_cseti.F90 index 130cebf1..7efb36d3 100644 --- a/amgprec/impl/level/amg_z_base_onelev_cseti.F90 +++ b/amgprec/impl/level/amg_z_base_onelev_cseti.F90 @@ -58,7 +58,7 @@ subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) use amg_z_slu_solver #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) use amg_z_mumps_solver #endif @@ -93,7 +93,7 @@ subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx) #if defined(AMG_HAVE_SLU) type(amg_z_slu_solver_type) :: amg_z_slu_solver_mold #endif -#if defined(PSB_HAVE_MUMPS) +#if defined(AMG_HAVE_MUMPS) type(amg_z_mumps_solver_type) :: amg_z_mumps_solver_mold #endif @@ -190,7 +190,7 @@ subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx) case (amg_slu_) call lv%set(amg_z_slu_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_MUMPS +#ifdef AMG_HAVE_MUMPS case (amg_mumps_) call lv%set(amg_z_mumps_solver_mold,info,pos=pos) #endif