mld2p4:

mlprec/impl/mld_cprecinit.F90 mlprec/impl/mld_cprecset.F90 mlprec/impl/mld_dprecinit.F90 mlprec/impl/mld_dprecset.F90 mlprec/impl/mld_sprecinit.F90 mlprec/impl/mld_sprecset.F90 mlprec/impl/mld_zprecinit.F90 mlprec/impl/mld_zprecset.F90 Description of defaults. Single vs. double precision
9 years ago · c9dc1f2d8e
parent ca1c2616e5
commit c9dc1f2d8e
8 changed files with 24 additions and 24 deletions
--- a/mlprec/impl/mld_cprecinit.F90
+++ b/mlprec/impl/mld_cprecinit.F90
@ -61,7 +61,7 @@
 !
 !    'ML'             - Multilevel hybrid preconditioner (additive on the
 !                       same level and multiplicative through the levels),
-!                       with 2 levels and post-smoothing only. RAS with
+!                       with 2 levels, pre  and post-smoothing, RAS with
 !                       overlap 1 and ILU(0) on the local blocks is
 !                       applied as post-smoother at each level, but the
 !                       coarsest one; four sweeps of the block-Jacobi solver,
--- a/mlprec/impl/mld_cprecset.F90
+++ b/mlprec/impl/mld_cprecset.F90
@ -192,6 +192,11 @@ subroutine mld_cprecseti(p,what,val,info,ilev)
          select case (val) 
          case(mld_bjac_)
            call onelev_set_smoother(p%precv(nlev_),val,info)
+#if  defined(HAVE_SLU_) 
+            call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
+#else 
+            call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
+#endif
            call p%precv(nlev_)%set(mld_coarse_mat_,mld_distr_mat_,info)
          case(mld_umf_, mld_slu_,mld_ilu_n_, mld_ilu_t_,mld_milu_n_)
            call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info)
@ -286,6 +291,11 @@ subroutine mld_cprecseti(p,what,val,info,ilev)
        select case (val) 
        case(mld_bjac_)
          call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info)
+#if  defined(HAVE_SLU_) 
+          call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
+#else 
+          call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
+#endif
          call p%precv(nlev_)%set(mld_coarse_mat_,mld_distr_mat_,info)
        case(mld_umf_, mld_slu_,mld_ilu_n_, mld_ilu_t_,mld_milu_n_)
          call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info)
--- a/mlprec/impl/mld_dprecinit.F90
+++ b/mlprec/impl/mld_dprecinit.F90
@ -61,7 +61,7 @@
 !
 !    'ML'             - Multilevel hybrid preconditioner (additive on the
 !                       same level and multiplicative through the levels),
-!                       with 2 levels and post-smoothing only. RAS with
+!                       with 2 levels, pre  and post-smoothing, RAS with
 !                       overlap 1 and ILU(0) on the local blocks is
 !                       applied as post-smoother at each level, but the
 !                       coarsest one; four sweeps of the block-Jacobi solver,
--- a/mlprec/impl/mld_dprecset.F90
+++ b/mlprec/impl/mld_dprecset.F90
@ -204,11 +204,6 @@ subroutine mld_dprecseti(p,what,val,info,ilev)
            call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
 #else 
            call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
-#endif
-#if  defined(HAVE_SLU_) 
-            call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
-#else 
-            call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
 #endif
            call p%precv(nlev_)%set(mld_coarse_mat_,mld_distr_mat_,info)
          case(mld_umf_, mld_slu_,mld_ilu_n_, mld_ilu_t_,mld_milu_n_)
@ -310,11 +305,6 @@ subroutine mld_dprecseti(p,what,val,info,ilev)
          call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
 #else 
          call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
-#endif
-#if  defined(HAVE_SLU_) 
-          call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
-#else 
-          call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
 #endif
          call p%precv(nlev_)%set(mld_coarse_mat_,mld_distr_mat_,info)
        case(mld_umf_, mld_slu_,mld_ilu_n_, mld_ilu_t_,mld_milu_n_)
--- a/mlprec/impl/mld_sprecinit.F90
+++ b/mlprec/impl/mld_sprecinit.F90
@ -61,7 +61,7 @@
 !
 !    'ML'             - Multilevel hybrid preconditioner (additive on the
 !                       same level and multiplicative through the levels),
-!                       with 2 levels and post-smoothing only. RAS with
+!                       with 2 levels, pre  and post-smoothing, RAS with
 !                       overlap 1 and ILU(0) on the local blocks is
 !                       applied as post-smoother at each level, but the
 !                       coarsest one; four sweeps of the block-Jacobi solver,
--- a/mlprec/impl/mld_sprecset.F90
+++ b/mlprec/impl/mld_sprecset.F90
@ -192,6 +192,11 @@ subroutine mld_sprecseti(p,what,val,info,ilev)
          select case (val) 
          case(mld_bjac_)
            call onelev_set_smoother(p%precv(nlev_),val,info)
+#if  defined(HAVE_SLU_) 
+            call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
+#else 
+            call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
+#endif
            call p%precv(nlev_)%set(mld_coarse_mat_,mld_distr_mat_,info)
          case(mld_umf_, mld_slu_,mld_ilu_n_, mld_ilu_t_,mld_milu_n_)
            call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info)
@ -286,6 +291,11 @@ subroutine mld_sprecseti(p,what,val,info,ilev)
        select case (val) 
        case(mld_bjac_)
          call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info)
+#if  defined(HAVE_SLU_) 
+          call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
+#else 
+          call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
+#endif
          call p%precv(nlev_)%set(mld_coarse_mat_,mld_distr_mat_,info)
        case(mld_umf_, mld_slu_,mld_ilu_n_, mld_ilu_t_,mld_milu_n_)
          call onelev_set_smoother(p%precv(nlev_),mld_bjac_,info)
--- a/mlprec/impl/mld_zprecinit.F90
+++ b/mlprec/impl/mld_zprecinit.F90
@ -61,7 +61,7 @@
 !
 !    'ML'             - Multilevel hybrid preconditioner (additive on the
 !                       same level and multiplicative through the levels),
-!                       with 2 levels and post-smoothing only. RAS with
+!                       with 2 levels, pre  and post-smoothing, RAS with
 !                       overlap 1 and ILU(0) on the local blocks is
 !                       applied as post-smoother at each level, but the
 !                       coarsest one; four sweeps of the block-Jacobi solver,
--- a/mlprec/impl/mld_zprecset.F90
+++ b/mlprec/impl/mld_zprecset.F90
@ -204,11 +204,6 @@ subroutine mld_zprecseti(p,what,val,info,ilev)
            call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
 #else 
            call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
-#endif
-#if  defined(HAVE_SLU_) 
-            call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
-#else 
-            call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
 #endif
            call p%precv(nlev_)%set(mld_coarse_mat_,mld_distr_mat_,info)
          case(mld_umf_, mld_slu_,mld_ilu_n_, mld_ilu_t_,mld_milu_n_)
@ -310,11 +305,6 @@ subroutine mld_zprecseti(p,what,val,info,ilev)
          call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
 #else 
          call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
-#endif
-#if  defined(HAVE_SLU_) 
-          call onelev_set_solver(p%precv(nlev_),mld_slu_,info)
-#else 
-          call onelev_set_solver(p%precv(nlev_),mld_ilu_n_,info)
 #endif
          call p%precv(nlev_)%set(mld_coarse_mat_,mld_distr_mat_,info)
        case(mld_umf_, mld_slu_,mld_ilu_n_, mld_ilu_t_,mld_milu_n_)