fdurastante/amg4psblas
1
0
Fork 0
mirror of https://github.com/sfilippone/amg4psblas.git synced 2026-10-06 14:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix AMG_prefix for some defines

Browse Source
This commit is contained in:
sfilippone
2025-03-18 12:18:36 +01:00
parent 0b9ca017c6
commit da7a3be4e4
20 changed files with 142 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amgprec/amg_d_sludist_solver.F90
+1 -1
View File
@@ -52,7 +52,7 @@ module amg_d_sludist_solver
use iso_c_binding use iso_c_binding
use amg_d_base_solver_mod 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 type, extends(amg_d_base_solver_type) :: amg_d_sludist_solver_type
amgprec/amg_z_sludist_solver.F90
+1 -1
View File
@@ -52,7 +52,7 @@ module amg_z_sludist_solver
use iso_c_binding use iso_c_binding
use amg_z_base_solver_mod 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 type, extends(amg_z_base_solver_type) :: amg_z_sludist_solver_type
amgprec/impl/amg_ccprecset.F90
+12 -12
View File
@@ -90,7 +90,7 @@ subroutine amg_ccprecseti(p,what,val,info,ilev,ilmax,pos,idx)
use amg_c_ainv_solver use amg_c_ainv_solver
use amg_c_invk_solver use amg_c_invk_solver
use amg_c_invt_solver use amg_c_invt_solver
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_c_slu_solver use amg_c_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_ainv_solver
use amg_c_invk_solver use amg_c_invk_solver
use amg_c_invt_solver use amg_c_invt_solver
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_c_slu_solver use amg_c_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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)) select case (psb_toupper(string))
case('BJAC') case('BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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') case('L1-BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('SLU') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
#endif #endif
case('UMF') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -590,7 +590,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
#endif #endif
case('SLUDIST') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -709,7 +709,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
select case (psb_toupper(trim(string))) select case (psb_toupper(trim(string)))
case('BJAC') case('BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('L1-BJAC') case('L1-BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('SLU') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
#endif #endif
case('UMF') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -818,7 +818,7 @@ subroutine amg_ccprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
#endif #endif
case('SLUDIST') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
amgprec/impl/amg_cprecinit.F90
+2 -2
View File
@@ -99,7 +99,7 @@ subroutine amg_cprecinit(ctxt,prec,ptype,info)
use amg_c_ilu_solver use amg_c_ilu_solver
use amg_c_gs_solver use amg_c_gs_solver
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_c_slu_solver use amg_c_slu_solver
#endif #endif
@@ -232,7 +232,7 @@ subroutine amg_cprecinit(ctxt,prec,ptype,info)
call prec%set('SMOOTHER_TYPE','FBGS',info) call prec%set('SMOOTHER_TYPE','FBGS',info)
#if defined(PSB_HAVE_MUMPS) #if defined(PSB_HAVE_MUMPS)
call prec%set('COARSE_SOLVE','MUMPS',info) call prec%set('COARSE_SOLVE','MUMPS',info)
#elif defined(PSB_HAVE_SLU) #elif defined(AMG_HAVE_SLU)
call prec%set('COARSE_SOLVE','SLU',info) call prec%set('COARSE_SOLVE','SLU',info)
#else #else
call prec%set('COARSE_SOLVE','ILU',info) call prec%set('COARSE_SOLVE','ILU',info)
amgprec/impl/amg_dcprecset.F90
+26 -26
View File
@@ -90,13 +90,13 @@ subroutine amg_dcprecseti(p,what,val,info,ilev,ilmax,pos,idx)
use amg_d_ainv_solver use amg_d_ainv_solver
use amg_d_invk_solver use amg_d_invk_solver
use amg_d_invt_solver use amg_d_invt_solver
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_d_umf_solver use amg_d_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
use amg_d_sludist_solver use amg_d_sludist_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_d_slu_solver use amg_d_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_ainv_solver
use amg_d_invk_solver use amg_d_invk_solver
use amg_d_invt_solver use amg_d_invt_solver
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_d_umf_solver use amg_d_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
use amg_d_sludist_solver use amg_d_sludist_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_d_slu_solver use amg_d_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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)) select case (psb_toupper(string))
case('BJAC') case('BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) 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) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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') case('L1-BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) 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) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('SLU') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
#endif #endif
case('UMF') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_repl_mat_) & amg_repl_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -613,21 +613,21 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
#endif #endif
case('SLUDIST') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_distr_mat_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_repl_mat_) & amg_repl_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -746,9 +746,9 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
select case (psb_toupper(trim(string))) select case (psb_toupper(trim(string)))
case('BJAC') case('BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) 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) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('L1-BJAC') case('L1-BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) 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) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('SLU') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
#endif #endif
case('UMF') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_repl_mat_) & amg_repl_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -866,21 +866,21 @@ subroutine amg_dcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
#endif #endif
case('SLUDIST') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_distr_mat_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_repl_mat_) & amg_repl_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
amgprec/impl/amg_dprecinit.F90
+4 -4
View File
@@ -100,10 +100,10 @@ subroutine amg_dprecinit(ctxt,prec,ptype,info)
use amg_d_gs_solver use amg_d_gs_solver
use amg_d_poly_smoother use amg_d_poly_smoother
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_d_umf_solver use amg_d_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_d_slu_solver use amg_d_slu_solver
#endif #endif
@@ -242,11 +242,11 @@ subroutine amg_dprecinit(ctxt,prec,ptype,info)
end do end do
call prec%set('ML_CYCLE','VCYCLE',info) call prec%set('ML_CYCLE','VCYCLE',info)
call prec%set('SMOOTHER_TYPE','FBGS',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) call prec%set('COARSE_SOLVE','UMF',info)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call prec%set('COARSE_SOLVE','MUMPS',info) call prec%set('COARSE_SOLVE','MUMPS',info)
#elif defined(PSB_HAVE_SLU) #elif defined(AMG_HAVE_SLU)
call prec%set('COARSE_SOLVE','SLU',info) call prec%set('COARSE_SOLVE','SLU',info)
#else #else
call prec%set('COARSE_SOLVE','ILU',info) call prec%set('COARSE_SOLVE','ILU',info)
amgprec/impl/amg_scprecset.F90
+12 -12
View File
@@ -90,7 +90,7 @@ subroutine amg_scprecseti(p,what,val,info,ilev,ilmax,pos,idx)
use amg_s_ainv_solver use amg_s_ainv_solver
use amg_s_invk_solver use amg_s_invk_solver
use amg_s_invt_solver use amg_s_invt_solver
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_s_slu_solver use amg_s_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_ainv_solver
use amg_s_invk_solver use amg_s_invk_solver
use amg_s_invt_solver use amg_s_invt_solver
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_s_slu_solver use amg_s_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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)) select case (psb_toupper(string))
case('BJAC') case('BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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') case('L1-BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('SLU') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
#endif #endif
case('UMF') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -590,7 +590,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
#endif #endif
case('SLUDIST') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -709,7 +709,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
select case (psb_toupper(trim(string))) select case (psb_toupper(trim(string)))
case('BJAC') case('BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('L1-BJAC') case('L1-BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('SLU') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
#endif #endif
case('UMF') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -818,7 +818,7 @@ subroutine amg_scprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
#endif #endif
case('SLUDIST') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
amgprec/impl/amg_sprecinit.F90
+2 -2
View File
@@ -100,7 +100,7 @@ subroutine amg_sprecinit(ctxt,prec,ptype,info)
use amg_s_gs_solver use amg_s_gs_solver
use amg_s_poly_smoother use amg_s_poly_smoother
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_s_slu_solver use amg_s_slu_solver
#endif #endif
@@ -241,7 +241,7 @@ subroutine amg_sprecinit(ctxt,prec,ptype,info)
call prec%set('SMOOTHER_TYPE','FBGS',info) call prec%set('SMOOTHER_TYPE','FBGS',info)
#if defined(PSB_HAVE_MUMPS) #if defined(PSB_HAVE_MUMPS)
call prec%set('COARSE_SOLVE','MUMPS',info) call prec%set('COARSE_SOLVE','MUMPS',info)
#elif defined(PSB_HAVE_SLU) #elif defined(AMG_HAVE_SLU)
call prec%set('COARSE_SOLVE','SLU',info) call prec%set('COARSE_SOLVE','SLU',info)
#else #else
call prec%set('COARSE_SOLVE','ILU',info) call prec%set('COARSE_SOLVE','ILU',info)
amgprec/impl/amg_zcprecset.F90
+26 -26
View File
@@ -90,13 +90,13 @@ subroutine amg_zcprecseti(p,what,val,info,ilev,ilmax,pos,idx)
use amg_z_ainv_solver use amg_z_ainv_solver
use amg_z_invk_solver use amg_z_invk_solver
use amg_z_invt_solver use amg_z_invt_solver
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_z_umf_solver use amg_z_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
use amg_z_sludist_solver use amg_z_sludist_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_z_slu_solver use amg_z_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_ainv_solver
use amg_z_invk_solver use amg_z_invk_solver
use amg_z_invt_solver use amg_z_invt_solver
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_z_umf_solver use amg_z_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
use amg_z_sludist_solver use amg_z_sludist_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_z_slu_solver use amg_z_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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)) select case (psb_toupper(string))
case('BJAC') case('BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) 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) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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') case('L1-BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) 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) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('SLU') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
#endif #endif
case('UMF') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_repl_mat_) & amg_repl_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -613,21 +613,21 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
#endif #endif
case('SLUDIST') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_distr_mat_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_repl_mat_) & amg_repl_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -746,9 +746,9 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
select case (psb_toupper(trim(string))) select case (psb_toupper(trim(string)))
case('BJAC') case('BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_bjac_,info,pos=pos) 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) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('L1-BJAC') case('L1-BJAC')
call p%precv(nlev_)%set('SMOOTHER_TYPE',amg_l1_bjac_,info,pos=pos) 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) 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) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call p%precv(nlev_)%set('SUB_SOLVE',amg_mumps_,info,pos=pos) 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_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info)
case('SLU') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & 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) call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos)
#endif #endif
case('UMF') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_repl_mat_) & amg_repl_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
@@ -866,21 +866,21 @@ subroutine amg_zcprecsetc(p,what,string,info,ilev,ilmax,pos,idx)
#endif #endif
case('SLUDIST') 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_sludist_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_distr_mat_) & amg_distr_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_distr_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_umf_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
& call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),& & call amg_warn_coarse_mat(p%precv(nlev_)%parms%get_coarse_mat(),&
& amg_repl_mat_) & amg_repl_mat_)
call p%precv(nlev_)%set('COARSE_MAT',amg_repl_mat_,info,pos=pos) 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('SMOOTHER_TYPE',amg_bjac_,info,pos=pos)
call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos) call p%precv(nlev_)%set('SUB_SOLVE',amg_slu_,info,pos=pos)
if (hier_asb) & if (hier_asb) &
amgprec/impl/amg_zprecinit.F90
+4 -4
View File
@@ -99,10 +99,10 @@ subroutine amg_zprecinit(ctxt,prec,ptype,info)
use amg_z_ilu_solver use amg_z_ilu_solver
use amg_z_gs_solver use amg_z_gs_solver
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_z_umf_solver use amg_z_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_z_slu_solver use amg_z_slu_solver
#endif #endif
@@ -233,11 +233,11 @@ subroutine amg_zprecinit(ctxt,prec,ptype,info)
end do end do
call prec%set('ML_CYCLE','VCYCLE',info) call prec%set('ML_CYCLE','VCYCLE',info)
call prec%set('SMOOTHER_TYPE','FBGS',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) call prec%set('COARSE_SOLVE','UMF',info)
#elif defined(PSB_HAVE_MUMPS) #elif defined(PSB_HAVE_MUMPS)
call prec%set('COARSE_SOLVE','MUMPS',info) call prec%set('COARSE_SOLVE','MUMPS',info)
#elif defined(PSB_HAVE_SLU) #elif defined(AMG_HAVE_SLU)
call prec%set('COARSE_SOLVE','SLU',info) call prec%set('COARSE_SOLVE','SLU',info)
#else #else
call prec%set('COARSE_SOLVE','ILU',info) call prec%set('COARSE_SOLVE','ILU',info)
amgprec/impl/level/amg_c_base_onelev_csetc.F90
+3 -3
View File
@@ -53,7 +53,7 @@ subroutine amg_c_base_onelev_csetc(lv,what,val,info,pos,idx)
use amg_c_ainv_solver use amg_c_ainv_solver
use amg_c_invk_solver use amg_c_invk_solver
use amg_c_invt_solver use amg_c_invt_solver
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_c_slu_solver use amg_c_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_ainv_solver_type) :: amg_c_ainv_solver_mold
type(amg_c_invk_solver_type) :: amg_c_invk_solver_mold type(amg_c_invk_solver_type) :: amg_c_invk_solver_mold
type(amg_c_invt_solver_type) :: amg_c_invt_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 type(amg_c_slu_solver_type) :: amg_c_slu_solver_mold
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info)
end if end if
end if end if
#ifdef PSB_HAVE_SLU #ifdef AMG_HAVE_SLU
case ('SLU') case ('SLU')
call lv%set(amg_c_slu_solver_mold,info,pos=pos) call lv%set(amg_c_slu_solver_mold,info,pos=pos)
#endif #endif
amgprec/impl/level/amg_c_base_onelev_cseti.F90
+3 -3
View File
@@ -49,7 +49,7 @@ subroutine amg_c_base_onelev_cseti(lv,what,val,info,pos,idx)
use amg_c_ilu_solver use amg_c_ilu_solver
use amg_c_id_solver use amg_c_id_solver
use amg_c_gs_solver use amg_c_gs_solver
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_c_slu_solver use amg_c_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_id_solver_type) :: amg_c_id_solver_mold
type(amg_c_gs_solver_type) :: amg_c_gs_solver_mold type(amg_c_gs_solver_type) :: amg_c_gs_solver_mold
type(amg_c_bwgs_solver_type) :: amg_c_bwgs_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 type(amg_c_slu_solver_type) :: amg_c_slu_solver_mold
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info)
end if end if
end if end if
#ifdef PSB_HAVE_SLU #ifdef AMG_HAVE_SLU
case (amg_slu_) case (amg_slu_)
call lv%set(amg_c_slu_solver_mold,info,pos=pos) call lv%set(amg_c_slu_solver_mold,info,pos=pos)
#endif #endif
amgprec/impl/level/amg_d_base_onelev_csetc.F90
+9 -9
View File
@@ -57,13 +57,13 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx)
use amg_d_ainv_solver use amg_d_ainv_solver
use amg_d_invk_solver use amg_d_invk_solver
use amg_d_invt_solver use amg_d_invt_solver
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_d_umf_solver use amg_d_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
use amg_d_sludist_solver use amg_d_sludist_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_d_slu_solver use amg_d_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_invk_solver_type) :: amg_d_invk_solver_mold
type(amg_d_invt_solver_type) :: amg_d_invt_solver_mold type(amg_d_invt_solver_type) :: amg_d_invt_solver_mold
type(amg_d_poly_smoother_type) :: amg_d_poly_smoother_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 type(amg_d_umf_solver_type) :: amg_d_umf_solver_mold
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
type(amg_d_sludist_solver_type) :: amg_d_sludist_solver_mold type(amg_d_sludist_solver_type) :: amg_d_sludist_solver_mold
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
type(amg_d_slu_solver_type) :: amg_d_slu_solver_mold type(amg_d_slu_solver_type) :: amg_d_slu_solver_mold
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info)
end if end if
end if end if
#ifdef PSB_HAVE_SLU #ifdef AMG_HAVE_SLU
case ('SLU') case ('SLU')
call lv%set(amg_d_slu_solver_mold,info,pos=pos) call lv%set(amg_d_slu_solver_mold,info,pos=pos)
#endif #endif
@@ -244,11 +244,11 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx)
case ('MUMPS') case ('MUMPS')
call lv%set(amg_d_mumps_solver_mold,info,pos=pos) call lv%set(amg_d_mumps_solver_mold,info,pos=pos)
#endif #endif
#ifdef PSB_HAVE_SLUDIST #ifdef AMG_HAVE_SLUDIST
case ('SLUDIST') case ('SLUDIST')
call lv%set(amg_d_sludist_solver_mold,info,pos=pos) call lv%set(amg_d_sludist_solver_mold,info,pos=pos)
#endif #endif
#ifdef PSB_HAVE_UMF #ifdef AMG_HAVE_UMF
case ('UMF') case ('UMF')
call lv%set(amg_d_umf_solver_mold,info,pos=pos) call lv%set(amg_d_umf_solver_mold,info,pos=pos)
#endif #endif
amgprec/impl/level/amg_d_base_onelev_cseti.F90
+9 -9
View File
@@ -50,13 +50,13 @@ subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx)
use amg_d_ilu_solver use amg_d_ilu_solver
use amg_d_id_solver use amg_d_id_solver
use amg_d_gs_solver use amg_d_gs_solver
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_d_umf_solver use amg_d_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
use amg_d_sludist_solver use amg_d_sludist_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_d_slu_solver use amg_d_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_id_solver_type) :: amg_d_id_solver_mold
type(amg_d_gs_solver_type) :: amg_d_gs_solver_mold type(amg_d_gs_solver_type) :: amg_d_gs_solver_mold
type(amg_d_bwgs_solver_type) :: amg_d_bwgs_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 type(amg_d_umf_solver_type) :: amg_d_umf_solver_mold
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
type(amg_d_sludist_solver_type) :: amg_d_sludist_solver_mold type(amg_d_sludist_solver_type) :: amg_d_sludist_solver_mold
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
type(amg_d_slu_solver_type) :: amg_d_slu_solver_mold type(amg_d_slu_solver_type) :: amg_d_slu_solver_mold
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info)
end if end if
end if end if
#ifdef PSB_HAVE_SLU #ifdef AMG_HAVE_SLU
case (amg_slu_) case (amg_slu_)
call lv%set(amg_d_slu_solver_mold,info,pos=pos) call lv%set(amg_d_slu_solver_mold,info,pos=pos)
#endif #endif
@@ -195,11 +195,11 @@ subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx)
case (amg_mumps_) case (amg_mumps_)
call lv%set(amg_d_mumps_solver_mold,info,pos=pos) call lv%set(amg_d_mumps_solver_mold,info,pos=pos)
#endif #endif
#ifdef PSB_HAVE_SLUDIST #ifdef AMG_HAVE_SLUDIST
case (amg_sludist_) case (amg_sludist_)
call lv%set(amg_d_sludist_solver_mold,info,pos=pos) call lv%set(amg_d_sludist_solver_mold,info,pos=pos)
#endif #endif
#ifdef PSB_HAVE_UMF #ifdef AMG_HAVE_UMF
case (amg_umf_) case (amg_umf_)
call lv%set(amg_d_umf_solver_mold,info,pos=pos) call lv%set(amg_d_umf_solver_mold,info,pos=pos)
#endif #endif
amgprec/impl/level/amg_s_base_onelev_csetc.F90
+3 -3
View File
@@ -57,7 +57,7 @@ subroutine amg_s_base_onelev_csetc(lv,what,val,info,pos,idx)
use amg_s_ainv_solver use amg_s_ainv_solver
use amg_s_invk_solver use amg_s_invk_solver
use amg_s_invt_solver use amg_s_invt_solver
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_s_slu_solver use amg_s_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_invk_solver_type) :: amg_s_invk_solver_mold
type(amg_s_invt_solver_type) :: amg_s_invt_solver_mold type(amg_s_invt_solver_type) :: amg_s_invt_solver_mold
type(amg_s_poly_smoother_type) :: amg_s_poly_smoother_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 type(amg_s_slu_solver_type) :: amg_s_slu_solver_mold
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info)
end if end if
end if end if
#ifdef PSB_HAVE_SLU #ifdef AMG_HAVE_SLU
case ('SLU') case ('SLU')
call lv%set(amg_s_slu_solver_mold,info,pos=pos) call lv%set(amg_s_slu_solver_mold,info,pos=pos)
#endif #endif
amgprec/impl/level/amg_s_base_onelev_cseti.F90
+3 -3
View File
@@ -50,7 +50,7 @@ subroutine amg_s_base_onelev_cseti(lv,what,val,info,pos,idx)
use amg_s_ilu_solver use amg_s_ilu_solver
use amg_s_id_solver use amg_s_id_solver
use amg_s_gs_solver use amg_s_gs_solver
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_s_slu_solver use amg_s_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_id_solver_type) :: amg_s_id_solver_mold
type(amg_s_gs_solver_type) :: amg_s_gs_solver_mold type(amg_s_gs_solver_type) :: amg_s_gs_solver_mold
type(amg_s_bwgs_solver_type) :: amg_s_bwgs_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 type(amg_s_slu_solver_type) :: amg_s_slu_solver_mold
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info)
end if end if
end if end if
#ifdef PSB_HAVE_SLU #ifdef AMG_HAVE_SLU
case (amg_slu_) case (amg_slu_)
call lv%set(amg_s_slu_solver_mold,info,pos=pos) call lv%set(amg_s_slu_solver_mold,info,pos=pos)
#endif #endif
amgprec/impl/level/amg_z_base_onelev_csetc.F90
+9 -9
View File
@@ -53,13 +53,13 @@ subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx)
use amg_z_ainv_solver use amg_z_ainv_solver
use amg_z_invk_solver use amg_z_invk_solver
use amg_z_invt_solver use amg_z_invt_solver
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_z_umf_solver use amg_z_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
use amg_z_sludist_solver use amg_z_sludist_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_z_slu_solver use amg_z_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_ainv_solver_type) :: amg_z_ainv_solver_mold
type(amg_z_invk_solver_type) :: amg_z_invk_solver_mold type(amg_z_invk_solver_type) :: amg_z_invk_solver_mold
type(amg_z_invt_solver_type) :: amg_z_invt_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 type(amg_z_umf_solver_type) :: amg_z_umf_solver_mold
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
type(amg_z_sludist_solver_type) :: amg_z_sludist_solver_mold type(amg_z_sludist_solver_type) :: amg_z_sludist_solver_mold
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
type(amg_z_slu_solver_type) :: amg_z_slu_solver_mold type(amg_z_slu_solver_type) :: amg_z_slu_solver_mold
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info)
end if end if
end if end if
#ifdef PSB_HAVE_SLU #ifdef AMG_HAVE_SLU
case ('SLU') case ('SLU')
call lv%set(amg_z_slu_solver_mold,info,pos=pos) call lv%set(amg_z_slu_solver_mold,info,pos=pos)
#endif #endif
@@ -236,11 +236,11 @@ subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx)
case ('MUMPS') case ('MUMPS')
call lv%set(amg_z_mumps_solver_mold,info,pos=pos) call lv%set(amg_z_mumps_solver_mold,info,pos=pos)
#endif #endif
#ifdef PSB_HAVE_SLUDIST #ifdef AMG_HAVE_SLUDIST
case ('SLUDIST') case ('SLUDIST')
call lv%set(amg_z_sludist_solver_mold,info,pos=pos) call lv%set(amg_z_sludist_solver_mold,info,pos=pos)
#endif #endif
#ifdef PSB_HAVE_UMF #ifdef AMG_HAVE_UMF
case ('UMF') case ('UMF')
call lv%set(amg_z_umf_solver_mold,info,pos=pos) call lv%set(amg_z_umf_solver_mold,info,pos=pos)
#endif #endif
amgprec/impl/level/amg_z_base_onelev_cseti.F90
+9 -9
View File
@@ -49,13 +49,13 @@ subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx)
use amg_z_ilu_solver use amg_z_ilu_solver
use amg_z_id_solver use amg_z_id_solver
use amg_z_gs_solver use amg_z_gs_solver
#if defined(PSB_HAVE_UMF) #if defined(AMG_HAVE_UMF)
use amg_z_umf_solver use amg_z_umf_solver
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
use amg_z_sludist_solver use amg_z_sludist_solver
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
use amg_z_slu_solver use amg_z_slu_solver
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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_id_solver_type) :: amg_z_id_solver_mold
type(amg_z_gs_solver_type) :: amg_z_gs_solver_mold type(amg_z_gs_solver_type) :: amg_z_gs_solver_mold
type(amg_z_bwgs_solver_type) :: amg_z_bwgs_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 type(amg_z_umf_solver_type) :: amg_z_umf_solver_mold
#endif #endif
#if defined(PSB_HAVE_SLUDIST) #if defined(AMG_HAVE_SLUDIST)
type(amg_z_sludist_solver_type) :: amg_z_sludist_solver_mold type(amg_z_sludist_solver_type) :: amg_z_sludist_solver_mold
#endif #endif
#if defined(PSB_HAVE_SLU) #if defined(AMG_HAVE_SLU)
type(amg_z_slu_solver_type) :: amg_z_slu_solver_mold type(amg_z_slu_solver_type) :: amg_z_slu_solver_mold
#endif #endif
#if defined(PSB_HAVE_MUMPS) #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) if (allocated(lv%sm2a)) call lv%sm2a%sv%set('SUB_SOLVE',val,info)
end if end if
end if end if
#ifdef PSB_HAVE_SLU #ifdef AMG_HAVE_SLU
case (amg_slu_) case (amg_slu_)
call lv%set(amg_z_slu_solver_mold,info,pos=pos) call lv%set(amg_z_slu_solver_mold,info,pos=pos)
#endif #endif
@@ -194,11 +194,11 @@ subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx)
case (amg_mumps_) case (amg_mumps_)
call lv%set(amg_z_mumps_solver_mold,info,pos=pos) call lv%set(amg_z_mumps_solver_mold,info,pos=pos)
#endif #endif
#ifdef PSB_HAVE_SLUDIST #ifdef AMG_HAVE_SLUDIST
case (amg_sludist_) case (amg_sludist_)
call lv%set(amg_z_sludist_solver_mold,info,pos=pos) call lv%set(amg_z_sludist_solver_mold,info,pos=pos)
#endif #endif
#ifdef PSB_HAVE_UMF #ifdef AMG_HAVE_UMF
case (amg_umf_) case (amg_umf_)
call lv%set(amg_z_umf_solver_mold,info,pos=pos) call lv%set(amg_z_umf_solver_mold,info,pos=pos)
#endif #endif
configure
Vendored
+2 -2
View File
@@ -10843,8 +10843,8 @@ printf "%s\n" "$as_me: Configuring with SuperLU_DIST version flag $pac_sludist_v
SLUDIST_FLAGS="" SLUDIST_FLAGS=""
SLUDIST_FLAGS="$SLUDIST_INCLUDES" SLUDIST_FLAGS="$SLUDIST_INCLUDES"
FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLUDIST $FDEFINES" FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLUDIST $FDEFINES"
CHAVESLUDIST="#define AMG_HAVE_SLUDISST" CHAVESLUDIST="#define AMG_HAVE_SLUDIST"
CSLUDISTVERSION="#define AMG_SLUD_VERSION $pac_sludist_version" CSLUDISTVERSION="#define AMG_SLUD_VERSION $pac_sludist_version"
else else
SLUDIST_FLAGS="" SLUDIST_FLAGS=""
fi fi
configure.ac
+2 -2
View File
@@ -805,8 +805,8 @@ if test "x$amg4psblas_cv_have_superludist" == "xyes" ; then
SLUDIST_FLAGS="" SLUDIST_FLAGS=""
SLUDIST_FLAGS="$SLUDIST_INCLUDES" SLUDIST_FLAGS="$SLUDIST_INCLUDES"
FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLUDIST $FDEFINES" FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLUDIST $FDEFINES"
CHAVESLUDIST="#define AMG_HAVE_SLUDISST" CHAVESLUDIST="#define AMG_HAVE_SLUDIST"
CSLUDISTVERSION="#define AMG_SLUD_VERSION $pac_sludist_version" CSLUDISTVERSION="#define AMG_SLUD_VERSION $pac_sludist_version"
else else
SLUDIST_FLAGS="" SLUDIST_FLAGS=""
fi fi