diff --git a/amgprec/amg_d_sludist_solver.F90 b/amgprec/amg_d_sludist_solver.F90 index e578b213..35f7a37c 100644 --- a/amgprec/amg_d_sludist_solver.F90 +++ b/amgprec/amg_d_sludist_solver.F90 @@ -52,7 +52,7 @@ module amg_d_sludist_solver use iso_c_binding use amg_d_base_solver_mod -#if (!defined(PSB_HAVE_SLUDIST)) || defined(PSB_IPK8) +#if (!defined(AMG_HAVE_SLUDIST)) || defined(PSB_IPK8) type, extends(amg_d_base_solver_type) :: amg_d_sludist_solver_type diff --git a/amgprec/amg_z_sludist_solver.F90 b/amgprec/amg_z_sludist_solver.F90 index 061d26ad..85aa1d68 100644 --- a/amgprec/amg_z_sludist_solver.F90 +++ b/amgprec/amg_z_sludist_solver.F90 @@ -52,7 +52,7 @@ module amg_z_sludist_solver use iso_c_binding use amg_z_base_solver_mod -#if (!defined(PSB_HAVE_SLUDIST)) || defined(PSB_IPK8) +#if (!defined(AMG_HAVE_SLUDIST)) || defined(PSB_IPK8) type, extends(amg_z_base_solver_type) :: amg_z_sludist_solver_type diff --git a/amgprec/impl/amg_ccprecset.F90 b/amgprec/impl/amg_ccprecset.F90 index 9453f4c5..87d3e138 100644 --- a/amgprec/impl/amg_ccprecset.F90 +++ b/amgprec/impl/amg_ccprecset.F90 @@ -90,7 +90,7 @@ subroutine amg_ccprecseti(p,what,val,info,ilev,ilmax,pos,idx) use amg_c_ainv_solver use amg_c_invk_solver use amg_c_invt_solver -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_c_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -329,7 +329,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) use amg_c_ainv_solver use amg_c_invk_solver use amg_c_invt_solver -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_c_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -480,7 +480,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) select case (psb_toupper(string)) case('BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -494,7 +494,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) case('L1-BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -506,7 +506,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('SLU') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -566,7 +566,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) #endif case('UMF') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -590,7 +590,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #endif case('SLUDIST') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -709,7 +709,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) select case (psb_toupper(trim(string))) case('BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -722,7 +722,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('L1-BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -734,7 +734,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('SLU') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -794,7 +794,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) #endif case('UMF') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -818,7 +818,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #endif case('SLUDIST') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & diff --git a/amgprec/impl/amg_cprecinit.F90 b/amgprec/impl/amg_cprecinit.F90 index a2cdd482..d67ebb9b 100644 --- a/amgprec/impl/amg_cprecinit.F90 +++ b/amgprec/impl/amg_cprecinit.F90 @@ -99,7 +99,7 @@ subroutine amg_cprecinit(ctxt,prec,ptype,info) use amg_c_ilu_solver use amg_c_gs_solver -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_c_slu_solver #endif @@ -232,7 +232,7 @@ subroutine amg_cprecinit(ctxt,prec,ptype,info) call prec%set('SMOOTHER_TYPE','FBGS',info) #if defined(PSB_HAVE_MUMPS) call prec%set('COARSE_SOLVE','MUMPS',info) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call prec%set('COARSE_SOLVE','SLU',info) #else call prec%set('COARSE_SOLVE','ILU',info) diff --git a/amgprec/impl/amg_dcprecset.F90 b/amgprec/impl/amg_dcprecset.F90 index 8f432ca9..96e9f9d7 100644 --- a/amgprec/impl/amg_dcprecset.F90 +++ b/amgprec/impl/amg_dcprecset.F90 @@ -90,13 +90,13 @@ subroutine amg_dcprecseti(p,what,val,info,ilev,ilmax,pos,idx) use amg_d_ainv_solver use amg_d_invk_solver use amg_d_invt_solver -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_d_umf_solver #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) use amg_d_sludist_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_d_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -335,13 +335,13 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) use amg_d_ainv_solver use amg_d_invk_solver use amg_d_invt_solver -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_d_umf_solver #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) use amg_d_sludist_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_d_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -492,9 +492,9 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) select case (psb_toupper(string)) case('BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -508,9 +508,9 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) case('L1-BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -522,7 +522,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('SLU') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -582,14 +582,14 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) #endif case('UMF') -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) if (hier_asb) & & 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_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -613,21 +613,21 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #endif case('SLUDIST') -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos) if (hier_asb) & & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) -#elif defined(PSB_HAVE_UMF) +#elif defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) if (hier_asb) & & 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_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -746,9 +746,9 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) select case (psb_toupper(trim(string))) case('BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -761,9 +761,9 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('L1-BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -775,7 +775,7 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('SLU') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -835,14 +835,14 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) #endif case('UMF') -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) if (hier_asb) & & 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_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -866,21 +866,21 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #endif case('SLUDIST') -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos) if (hier_asb) & & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) -#elif defined(PSB_HAVE_UMF) +#elif defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) if (hier_asb) & & 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_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & diff --git a/amgprec/impl/amg_dprecinit.F90 b/amgprec/impl/amg_dprecinit.F90 index 7daff9e0..b261f185 100644 --- a/amgprec/impl/amg_dprecinit.F90 +++ b/amgprec/impl/amg_dprecinit.F90 @@ -100,10 +100,10 @@ subroutine amg_dprecinit(ctxt,prec,ptype,info) use amg_d_gs_solver use amg_d_poly_smoother -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_d_umf_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_d_slu_solver #endif @@ -242,11 +242,11 @@ subroutine amg_dprecinit(ctxt,prec,ptype,info) end do call prec%set('ML_CYCLE','VCYCLE',info) call prec%set('SMOOTHER_TYPE','FBGS',info) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call prec%set('COARSE_SOLVE','UMF',info) #elif defined(PSB_HAVE_MUMPS) call prec%set('COARSE_SOLVE','MUMPS',info) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call prec%set('COARSE_SOLVE','SLU',info) #else call prec%set('COARSE_SOLVE','ILU',info) diff --git a/amgprec/impl/amg_scprecset.F90 b/amgprec/impl/amg_scprecset.F90 index 0206ba29..3c6dbea5 100644 --- a/amgprec/impl/amg_scprecset.F90 +++ b/amgprec/impl/amg_scprecset.F90 @@ -90,7 +90,7 @@ subroutine amg_scprecseti(p,what,val,info,ilev,ilmax,pos,idx) use amg_s_ainv_solver use amg_s_invk_solver use amg_s_invt_solver -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_s_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -329,7 +329,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) use amg_s_ainv_solver use amg_s_invk_solver use amg_s_invt_solver -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_s_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -480,7 +480,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) select case (psb_toupper(string)) case('BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -494,7 +494,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) case('L1-BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -506,7 +506,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('SLU') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -566,7 +566,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) #endif case('UMF') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -590,7 +590,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #endif case('SLUDIST') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -709,7 +709,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) select case (psb_toupper(trim(string))) case('BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -722,7 +722,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('L1-BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -734,7 +734,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('SLU') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -794,7 +794,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) #endif case('UMF') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -818,7 +818,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #endif case('SLUDIST') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & diff --git a/amgprec/impl/amg_sprecinit.F90 b/amgprec/impl/amg_sprecinit.F90 index 9a081e81..a952af90 100644 --- a/amgprec/impl/amg_sprecinit.F90 +++ b/amgprec/impl/amg_sprecinit.F90 @@ -100,7 +100,7 @@ subroutine amg_sprecinit(ctxt,prec,ptype,info) use amg_s_gs_solver use amg_s_poly_smoother -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_s_slu_solver #endif @@ -241,7 +241,7 @@ subroutine amg_sprecinit(ctxt,prec,ptype,info) call prec%set('SMOOTHER_TYPE','FBGS',info) #if defined(PSB_HAVE_MUMPS) call prec%set('COARSE_SOLVE','MUMPS',info) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call prec%set('COARSE_SOLVE','SLU',info) #else call prec%set('COARSE_SOLVE','ILU',info) diff --git a/amgprec/impl/amg_zcprecset.F90 b/amgprec/impl/amg_zcprecset.F90 index e5e8c03a..dc895221 100644 --- a/amgprec/impl/amg_zcprecset.F90 +++ b/amgprec/impl/amg_zcprecset.F90 @@ -90,13 +90,13 @@ subroutine amg_zcprecseti(p,what,val,info,ilev,ilmax,pos,idx) use amg_z_ainv_solver use amg_z_invk_solver use amg_z_invt_solver -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_z_umf_solver #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) use amg_z_sludist_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_z_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -335,13 +335,13 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) use amg_z_ainv_solver use amg_z_invk_solver use amg_z_invt_solver -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_z_umf_solver #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) use amg_z_sludist_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_z_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -492,9 +492,9 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) select case (psb_toupper(string)) case('BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -508,9 +508,9 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) case('L1-BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -522,7 +522,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('SLU') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -582,14 +582,14 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) #endif case('UMF') -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) if (hier_asb) & & 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_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -613,21 +613,21 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #endif case('SLUDIST') -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos) if (hier_asb) & & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) -#elif defined(PSB_HAVE_UMF) +#elif defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) if (hier_asb) & & 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_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -746,9 +746,9 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) select case (psb_toupper(trim(string))) case('BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -761,9 +761,9 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('L1-BJAC') call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) #elif defined(PSB_HAVE_MUMPS) call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) @@ -775,7 +775,7 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) case('SLU') -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -835,14 +835,14 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) #endif case('UMF') -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) if (hier_asb) & & 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_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & @@ -866,21 +866,21 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx) #endif case('SLUDIST') -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos) if (hier_asb) & & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & amg_distr_mat_) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) -#elif defined(PSB_HAVE_UMF) +#elif defined(AMG_HAVE_UMF) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) if (hier_asb) & & 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_SLU) +#elif defined(AMG_HAVE_SLU) call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) if (hier_asb) & diff --git a/amgprec/impl/amg_zprecinit.F90 b/amgprec/impl/amg_zprecinit.F90 index 701dbbae..22e14d4a 100644 --- a/amgprec/impl/amg_zprecinit.F90 +++ b/amgprec/impl/amg_zprecinit.F90 @@ -99,10 +99,10 @@ subroutine amg_zprecinit(ctxt,prec,ptype,info) use amg_z_ilu_solver use amg_z_gs_solver -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_z_umf_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_z_slu_solver #endif @@ -233,11 +233,11 @@ subroutine amg_zprecinit(ctxt,prec,ptype,info) end do call prec%set('ML_CYCLE','VCYCLE',info) call prec%set('SMOOTHER_TYPE','FBGS',info) -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) call prec%set('COARSE_SOLVE','UMF',info) #elif defined(PSB_HAVE_MUMPS) call prec%set('COARSE_SOLVE','MUMPS',info) -#elif defined(PSB_HAVE_SLU) +#elif defined(AMG_HAVE_SLU) call prec%set('COARSE_SOLVE','SLU',info) #else call prec%set('COARSE_SOLVE','ILU',info) diff --git a/amgprec/impl/level/amg_c_base_onelev_csetc.F90 b/amgprec/impl/level/amg_c_base_onelev_csetc.F90 index 451b63a0..ea19f016 100644 --- a/amgprec/impl/level/amg_c_base_onelev_csetc.F90 +++ b/amgprec/impl/level/amg_c_base_onelev_csetc.F90 @@ -53,7 +53,7 @@ subroutine amg_c_base_onelev_csetc(lv,what,val,info,pos,idx) use amg_c_ainv_solver use amg_c_invk_solver use amg_c_invt_solver -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_c_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -88,7 +88,7 @@ subroutine amg_c_base_onelev_csetc(lv,what,val,info,pos,idx) type(amg_c_ainv_solver_type) :: amg_c_ainv_solver_mold type(amg_c_invk_solver_type) :: amg_c_invk_solver_mold type(amg_c_invt_solver_type) :: amg_c_invt_solver_mold -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) type(amg_c_slu_solver_type) :: amg_c_slu_solver_mold #endif #if defined(PSB_HAVE_MUMPS) @@ -216,7 +216,7 @@ subroutine amg_c_base_onelev_csetc(lv,what,val,info,pos,idx) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info) end if end if -#ifdef PSB_HAVE_SLU +#ifdef AMG_HAVE_SLU case ('SLU') call lv%set(amg_c_slu_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 052eaaaa..bb604080 100644 --- a/amgprec/impl/level/amg_c_base_onelev_cseti.F90 +++ b/amgprec/impl/level/amg_c_base_onelev_cseti.F90 @@ -49,7 +49,7 @@ subroutine amg_c_base_onelev_cseti(lv,what,val,info,pos,idx) use amg_c_ilu_solver use amg_c_id_solver use amg_c_gs_solver -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_c_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -78,7 +78,7 @@ subroutine amg_c_base_onelev_cseti(lv,what,val,info,pos,idx) type(amg_c_id_solver_type) :: amg_c_id_solver_mold type(amg_c_gs_solver_type) :: amg_c_gs_solver_mold type(amg_c_bwgs_solver_type) :: amg_c_bwgs_solver_mold -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) type(amg_c_slu_solver_type) :: amg_c_slu_solver_mold #endif #if defined(PSB_HAVE_MUMPS) @@ -174,7 +174,7 @@ subroutine amg_c_base_onelev_cseti(lv,what,val,info,pos,idx) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info) end if end if -#ifdef PSB_HAVE_SLU +#ifdef AMG_HAVE_SLU case (amg_slu_) call lv%set(amg_c_slu_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 3cb6e267..f975a19d 100644 --- a/amgprec/impl/level/amg_d_base_onelev_csetc.F90 +++ b/amgprec/impl/level/amg_d_base_onelev_csetc.F90 @@ -57,13 +57,13 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) use amg_d_ainv_solver use amg_d_invk_solver use amg_d_invt_solver -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_d_umf_solver #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) use amg_d_sludist_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_d_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -99,13 +99,13 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) type(amg_d_invk_solver_type) :: amg_d_invk_solver_mold type(amg_d_invt_solver_type) :: amg_d_invt_solver_mold type(amg_d_poly_smoother_type) :: amg_d_poly_smoother_mold -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) type(amg_d_umf_solver_type) :: amg_d_umf_solver_mold #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) type(amg_d_sludist_solver_type) :: amg_d_sludist_solver_mold #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) type(amg_d_slu_solver_type) :: amg_d_slu_solver_mold #endif #if defined(PSB_HAVE_MUMPS) @@ -236,7 +236,7 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info) end if end if -#ifdef PSB_HAVE_SLU +#ifdef AMG_HAVE_SLU case ('SLU') call lv%set(amg_d_slu_solver_mold,info,pos=pos) #endif @@ -244,11 +244,11 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) case ('MUMPS') call lv%set(amg_d_mumps_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_SLUDIST +#ifdef AMG_HAVE_SLUDIST case ('SLUDIST') call lv%set(amg_d_sludist_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_UMF +#ifdef AMG_HAVE_UMF case ('UMF') call lv%set(amg_d_umf_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 07add208..839d948c 100644 --- a/amgprec/impl/level/amg_d_base_onelev_cseti.F90 +++ b/amgprec/impl/level/amg_d_base_onelev_cseti.F90 @@ -50,13 +50,13 @@ subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx) use amg_d_ilu_solver use amg_d_id_solver use amg_d_gs_solver -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_d_umf_solver #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) use amg_d_sludist_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_d_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -85,13 +85,13 @@ subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx) type(amg_d_id_solver_type) :: amg_d_id_solver_mold type(amg_d_gs_solver_type) :: amg_d_gs_solver_mold type(amg_d_bwgs_solver_type) :: amg_d_bwgs_solver_mold -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) type(amg_d_umf_solver_type) :: amg_d_umf_solver_mold #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) type(amg_d_sludist_solver_type) :: amg_d_sludist_solver_mold #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) type(amg_d_slu_solver_type) :: amg_d_slu_solver_mold #endif #if defined(PSB_HAVE_MUMPS) @@ -187,7 +187,7 @@ subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info) end if end if -#ifdef PSB_HAVE_SLU +#ifdef AMG_HAVE_SLU case (amg_slu_) call lv%set(amg_d_slu_solver_mold,info,pos=pos) #endif @@ -195,11 +195,11 @@ subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx) case (amg_mumps_) call lv%set(amg_d_mumps_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_SLUDIST +#ifdef AMG_HAVE_SLUDIST case (amg_sludist_) call lv%set(amg_d_sludist_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_UMF +#ifdef AMG_HAVE_UMF case (amg_umf_) call lv%set(amg_d_umf_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 10842d66..be32f1ac 100644 --- a/amgprec/impl/level/amg_s_base_onelev_csetc.F90 +++ b/amgprec/impl/level/amg_s_base_onelev_csetc.F90 @@ -57,7 +57,7 @@ subroutine amg_s_base_onelev_csetc(lv,what,val,info,pos,idx) use amg_s_ainv_solver use amg_s_invk_solver use amg_s_invt_solver -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_s_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -93,7 +93,7 @@ subroutine amg_s_base_onelev_csetc(lv,what,val,info,pos,idx) type(amg_s_invk_solver_type) :: amg_s_invk_solver_mold type(amg_s_invt_solver_type) :: amg_s_invt_solver_mold type(amg_s_poly_smoother_type) :: amg_s_poly_smoother_mold -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) type(amg_s_slu_solver_type) :: amg_s_slu_solver_mold #endif #if defined(PSB_HAVE_MUMPS) @@ -224,7 +224,7 @@ subroutine amg_s_base_onelev_csetc(lv,what,val,info,pos,idx) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info) end if end if -#ifdef PSB_HAVE_SLU +#ifdef AMG_HAVE_SLU case ('SLU') call lv%set(amg_s_slu_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 450c38ed..7f9ac072 100644 --- a/amgprec/impl/level/amg_s_base_onelev_cseti.F90 +++ b/amgprec/impl/level/amg_s_base_onelev_cseti.F90 @@ -50,7 +50,7 @@ subroutine amg_s_base_onelev_cseti(lv,what,val,info,pos,idx) use amg_s_ilu_solver use amg_s_id_solver use amg_s_gs_solver -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_s_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -79,7 +79,7 @@ subroutine amg_s_base_onelev_cseti(lv,what,val,info,pos,idx) type(amg_s_id_solver_type) :: amg_s_id_solver_mold type(amg_s_gs_solver_type) :: amg_s_gs_solver_mold type(amg_s_bwgs_solver_type) :: amg_s_bwgs_solver_mold -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) type(amg_s_slu_solver_type) :: amg_s_slu_solver_mold #endif #if defined(PSB_HAVE_MUMPS) @@ -175,7 +175,7 @@ subroutine amg_s_base_onelev_cseti(lv,what,val,info,pos,idx) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info) end if end if -#ifdef PSB_HAVE_SLU +#ifdef AMG_HAVE_SLU case (amg_slu_) call lv%set(amg_s_slu_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 e5e7f91c..5133dbcc 100644 --- a/amgprec/impl/level/amg_z_base_onelev_csetc.F90 +++ b/amgprec/impl/level/amg_z_base_onelev_csetc.F90 @@ -53,13 +53,13 @@ subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx) use amg_z_ainv_solver use amg_z_invk_solver use amg_z_invt_solver -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_z_umf_solver #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) use amg_z_sludist_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_z_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -94,13 +94,13 @@ subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx) type(amg_z_ainv_solver_type) :: amg_z_ainv_solver_mold type(amg_z_invk_solver_type) :: amg_z_invk_solver_mold type(amg_z_invt_solver_type) :: amg_z_invt_solver_mold -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) type(amg_z_umf_solver_type) :: amg_z_umf_solver_mold #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) type(amg_z_sludist_solver_type) :: amg_z_sludist_solver_mold #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) type(amg_z_slu_solver_type) :: amg_z_slu_solver_mold #endif #if defined(PSB_HAVE_MUMPS) @@ -228,7 +228,7 @@ subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info) end if end if -#ifdef PSB_HAVE_SLU +#ifdef AMG_HAVE_SLU case ('SLU') call lv%set(amg_z_slu_solver_mold,info,pos=pos) #endif @@ -236,11 +236,11 @@ subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx) case ('MUMPS') call lv%set(amg_z_mumps_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_SLUDIST +#ifdef AMG_HAVE_SLUDIST case ('SLUDIST') call lv%set(amg_z_sludist_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_UMF +#ifdef AMG_HAVE_UMF case ('UMF') call lv%set(amg_z_umf_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 13e246d9..130cebf1 100644 --- a/amgprec/impl/level/amg_z_base_onelev_cseti.F90 +++ b/amgprec/impl/level/amg_z_base_onelev_cseti.F90 @@ -49,13 +49,13 @@ subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx) use amg_z_ilu_solver use amg_z_id_solver use amg_z_gs_solver -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) use amg_z_umf_solver #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) use amg_z_sludist_solver #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) use amg_z_slu_solver #endif #if defined(PSB_HAVE_MUMPS) @@ -84,13 +84,13 @@ subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx) type(amg_z_id_solver_type) :: amg_z_id_solver_mold type(amg_z_gs_solver_type) :: amg_z_gs_solver_mold type(amg_z_bwgs_solver_type) :: amg_z_bwgs_solver_mold -#if defined(PSB_HAVE_UMF) +#if defined(AMG_HAVE_UMF) type(amg_z_umf_solver_type) :: amg_z_umf_solver_mold #endif -#if defined(PSB_HAVE_SLUDIST) +#if defined(AMG_HAVE_SLUDIST) type(amg_z_sludist_solver_type) :: amg_z_sludist_solver_mold #endif -#if defined(PSB_HAVE_SLU) +#if defined(AMG_HAVE_SLU) type(amg_z_slu_solver_type) :: amg_z_slu_solver_mold #endif #if defined(PSB_HAVE_MUMPS) @@ -186,7 +186,7 @@ subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info) end if end if -#ifdef PSB_HAVE_SLU +#ifdef AMG_HAVE_SLU case (amg_slu_) call lv%set(amg_z_slu_solver_mold,info,pos=pos) #endif @@ -194,11 +194,11 @@ subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx) case (amg_mumps_) call lv%set(amg_z_mumps_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_SLUDIST +#ifdef AMG_HAVE_SLUDIST case (amg_sludist_) call lv%set(amg_z_sludist_solver_mold,info,pos=pos) #endif -#ifdef PSB_HAVE_UMF +#ifdef AMG_HAVE_UMF case (amg_umf_) call lv%set(amg_z_umf_solver_mold,info,pos=pos) #endif diff --git a/configure b/configure index 72526846..599e83b8 100755 --- a/configure +++ b/configure @@ -10843,8 +10843,8 @@ printf "%s\n" "$as_me: Configuring with SuperLU_DIST version flag $pac_sludist_v SLUDIST_FLAGS="" SLUDIST_FLAGS="$SLUDIST_INCLUDES" FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLUDIST $FDEFINES" - CHAVESLUDIST="#define AMG_HAVE_SLUDISST" - CSLUDISTVERSION="#define AMG_SLUD_VERSION $pac_sludist_version" + CHAVESLUDIST="#define AMG_HAVE_SLUDIST" + CSLUDISTVERSION="#define AMG_SLUD_VERSION $pac_sludist_version" else SLUDIST_FLAGS="" fi diff --git a/configure.ac b/configure.ac index e1f4f178..912e3d26 100755 --- a/configure.ac +++ b/configure.ac @@ -805,8 +805,8 @@ if test "x$amg4psblas_cv_have_superludist" == "xyes" ; then SLUDIST_FLAGS="" SLUDIST_FLAGS="$SLUDIST_INCLUDES" FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLUDIST $FDEFINES" - CHAVESLUDIST="#define AMG_HAVE_SLUDISST" - CSLUDISTVERSION="#define AMG_SLUD_VERSION $pac_sludist_version" + CHAVESLUDIST="#define AMG_HAVE_SLUDIST" + CSLUDISTVERSION="#define AMG_SLUD_VERSION $pac_sludist_version" else SLUDIST_FLAGS="" fi