mld2p4-2:

mlprec/Makefile
 mlprec/mld_cprecinit.F90
 mlprec/mld_cprecset.F90
 mlprec/mld_sprecinit.F90
 mlprec/mld_sprecset.F90

No UMFPACK for single precision.
stopcriterion
Salvatore Filippone 13 years ago
parent 645e91557f
commit c377ba1503

@ -175,7 +175,7 @@ mld_s_ilu_solver.o mld_s_iluk_fact.o: mld_s_ilu_fact_mod.o
mld_s_as_smoother.o mld_s_jac_smoother.o: mld_s_base_smoother_mod.o mld_s_as_smoother.o mld_s_jac_smoother.o: mld_s_base_smoother_mod.o
mld_s_jac_smoother.o: mld_s_diag_solver.o mld_s_jac_smoother.o: mld_s_diag_solver.o
mld_sprecinit.o mld_sprecset.o: mld_s_diag_solver.o mld_s_ilu_solver.o \ mld_sprecinit.o mld_sprecset.o: mld_s_diag_solver.o mld_s_ilu_solver.o \
mld_s_umf_solver.o mld_s_as_smoother.o mld_s_jac_smoother.o \ mld_s_as_smoother.o mld_s_jac_smoother.o \
mld_s_id_solver.o mld_s_slu_solver.o mld_s_sludist_solver.o mld_s_id_solver.o mld_s_slu_solver.o mld_s_sludist_solver.o
mld_z_id_solver.o mld_z_sludist_solver.o mld_z_slu_solver.o \ mld_z_id_solver.o mld_z_sludist_solver.o mld_z_slu_solver.o \
@ -195,7 +195,7 @@ mld_c_ilu_solver.o mld_c_iluk_fact.o: mld_c_ilu_fact_mod.o
mld_c_as_smoother.o mld_c_jac_smoother.o: mld_c_base_smoother_mod.o mld_c_as_smoother.o mld_c_jac_smoother.o: mld_c_base_smoother_mod.o
mld_c_jac_smoother.o: mld_c_diag_solver.o mld_c_jac_smoother.o: mld_c_diag_solver.o
mld_cprecinit.o mld_cprecset.o: mld_c_diag_solver.o mld_c_ilu_solver.o \ mld_cprecinit.o mld_cprecset.o: mld_c_diag_solver.o mld_c_ilu_solver.o \
mld_c_umf_solver.o mld_c_as_smoother.o mld_c_jac_smoother.o \ mld_c_as_smoother.o mld_c_jac_smoother.o \
mld_c_id_solver.o mld_c_slu_solver.o mld_c_sludist_solver.o mld_c_id_solver.o mld_c_slu_solver.o mld_c_sludist_solver.o

@ -97,7 +97,7 @@ subroutine mld_cprecinit(p,ptype,info,nlev)
use mld_c_id_solver use mld_c_id_solver
use mld_c_diag_solver use mld_c_diag_solver
use mld_c_ilu_solver use mld_c_ilu_solver
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
use mld_c_umf_solver use mld_c_umf_solver
#endif #endif
#if defined(HAVE_SLU_) #if defined(HAVE_SLU_)
@ -190,7 +190,7 @@ subroutine mld_cprecinit(p,ptype,info,nlev)
ilev_ = nlev_ ilev_ = nlev_
allocate(mld_c_jac_smoother_type :: p%precv(ilev_)%sm, stat=info) allocate(mld_c_jac_smoother_type :: p%precv(ilev_)%sm, stat=info)
if (info /= psb_success_) return if (info /= psb_success_) return
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
allocate(mld_c_umf_solver_type :: p%precv(ilev_)%sm%sv, stat=info) allocate(mld_c_umf_solver_type :: p%precv(ilev_)%sm%sv, stat=info)
#elif defined(HAVE_SLU_) #elif defined(HAVE_SLU_)
allocate(mld_c_slu_solver_type :: p%precv(ilev_)%sm%sv, stat=info) allocate(mld_c_slu_solver_type :: p%precv(ilev_)%sm%sv, stat=info)

@ -85,7 +85,7 @@ subroutine mld_cprecseti(p,what,val,info,ilev)
use mld_c_diag_solver use mld_c_diag_solver
use mld_c_ilu_solver use mld_c_ilu_solver
use mld_c_id_solver use mld_c_id_solver
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
use mld_c_umf_solver use mld_c_umf_solver
#endif #endif
#if defined(HAVE_SLU_) #if defined(HAVE_SLU_)
@ -190,7 +190,7 @@ subroutine mld_cprecseti(p,what,val,info,ilev)
select case (val) select case (val)
case(mld_bjac_) case(mld_bjac_)
call onelev_set_smoother(p%precv(nlev_),val,info) call onelev_set_smoother(p%precv(nlev_),val,info)
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
call onelev_set_solver(p%precv(nlev_),mld_umf_,info) call onelev_set_solver(p%precv(nlev_),mld_umf_,info)
#elif defined(HAVE_SLU_) #elif defined(HAVE_SLU_)
call onelev_set_solver(p%precv(nlev_),mld_slu_,info) call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
@ -291,7 +291,7 @@ subroutine mld_cprecseti(p,what,val,info,ilev)
select case (val) select case (val)
case(mld_bjac_) case(mld_bjac_)
call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info) call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info)
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
call onelev_set_solver(p%precv(nlev_),mld_umf_,info) call onelev_set_solver(p%precv(nlev_),mld_umf_,info)
#elif defined(HAVE_SLU_) #elif defined(HAVE_SLU_)
call onelev_set_solver(p%precv(nlev_),mld_slu_,info) call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
@ -507,7 +507,7 @@ contains
end if end if
call level%sm%sv%set(mld_sub_solve_,val,info) call level%sm%sv%set(mld_sub_solve_,val,info)
#ifdef HAVE_UMF_ #if defined(HAVE_UMF_) && 0
case (mld_umf_) case (mld_umf_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
select type (sv => level%sm%sv) select type (sv => level%sm%sv)

@ -97,7 +97,7 @@ subroutine mld_sprecinit(p,ptype,info,nlev)
use mld_s_id_solver use mld_s_id_solver
use mld_s_diag_solver use mld_s_diag_solver
use mld_s_ilu_solver use mld_s_ilu_solver
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
use mld_s_umf_solver use mld_s_umf_solver
#endif #endif
#if defined(HAVE_SLU_) #if defined(HAVE_SLU_)
@ -190,7 +190,7 @@ subroutine mld_sprecinit(p,ptype,info,nlev)
ilev_ = nlev_ ilev_ = nlev_
allocate(mld_s_jac_smoother_type :: p%precv(ilev_)%sm, stat=info) allocate(mld_s_jac_smoother_type :: p%precv(ilev_)%sm, stat=info)
if (info /= psb_success_) return if (info /= psb_success_) return
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
allocate(mld_s_umf_solver_type :: p%precv(ilev_)%sm%sv, stat=info) allocate(mld_s_umf_solver_type :: p%precv(ilev_)%sm%sv, stat=info)
#elif defined(HAVE_SLU_) #elif defined(HAVE_SLU_)
allocate(mld_s_slu_solver_type :: p%precv(ilev_)%sm%sv, stat=info) allocate(mld_s_slu_solver_type :: p%precv(ilev_)%sm%sv, stat=info)

@ -85,7 +85,7 @@ subroutine mld_sprecseti(p,what,val,info,ilev)
use mld_s_diag_solver use mld_s_diag_solver
use mld_s_ilu_solver use mld_s_ilu_solver
use mld_s_id_solver use mld_s_id_solver
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
use mld_s_umf_solver use mld_s_umf_solver
#endif #endif
#if defined(HAVE_SLU_) #if defined(HAVE_SLU_)
@ -190,7 +190,7 @@ subroutine mld_sprecseti(p,what,val,info,ilev)
select case (val) select case (val)
case(mld_bjac_) case(mld_bjac_)
call onelev_set_smoother(p%precv(nlev_),val,info) call onelev_set_smoother(p%precv(nlev_),val,info)
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
call onelev_set_solver(p%precv(nlev_),mld_umf_,info) call onelev_set_solver(p%precv(nlev_),mld_umf_,info)
#elif defined(HAVE_SLU_) #elif defined(HAVE_SLU_)
call onelev_set_solver(p%precv(nlev_),mld_slu_,info) call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
@ -291,7 +291,7 @@ subroutine mld_sprecseti(p,what,val,info,ilev)
select case (val) select case (val)
case(mld_bjac_) case(mld_bjac_)
call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info) call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info)
#if defined(HAVE_UMF_) #if defined(HAVE_UMF_) && 0
call onelev_set_solver(p%precv(nlev_),mld_umf_,info) call onelev_set_solver(p%precv(nlev_),mld_umf_,info)
#elif defined(HAVE_SLU_) #elif defined(HAVE_SLU_)
call onelev_set_solver(p%precv(nlev_),mld_slu_,info) call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
@ -507,7 +507,7 @@ contains
end if end if
call level%sm%sv%set(mld_sub_solve_,val,info) call level%sm%sv%set(mld_sub_solve_,val,info)
#ifdef HAVE_UMF_ #if defined(HAVE_UMF_) && 0
case (mld_umf_) case (mld_umf_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
select type (sv => level%sm%sv) select type (sv => level%sm%sv)

Loading…
Cancel
Save