From e7fe7f0bf105d7ca16ad05ffd785881031e3e74f Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 22 Jul 2008 12:21:11 +0000 Subject: [PATCH] mld2p4 mlprec/mld_cprecset.f90 mlprec/mld_dprecset.f90 mlprec/mld_sprecset.f90 mlprec/mld_zprecset.f90 Fixed coarse_solve settings. --- mlprec/mld_cprecset.f90 | 16 ++++++---------- mlprec/mld_dprecset.f90 | 16 ++++++---------- mlprec/mld_sprecset.f90 | 16 ++++++---------- mlprec/mld_zprecset.f90 | 16 ++++++---------- 4 files changed, 24 insertions(+), 40 deletions(-) diff --git a/mlprec/mld_cprecset.f90 b/mlprec/mld_cprecset.f90 index de58d32d..11f0ea55 100644 --- a/mlprec/mld_cprecset.f90 +++ b/mlprec/mld_cprecset.f90 @@ -164,14 +164,12 @@ subroutine mld_cprecseti(p,what,val,info,ilev) p%baseprecv(nlev_)%iprcparm(mld_coarse_solve_) = val p%baseprecv(nlev_)%iprcparm(mld_smoother_type_) = mld_bjac_ p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_distr_mat_ - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == 0) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val select case (val) case(mld_umf_, mld_slu_) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_repl_mat_ - case(mld_bjac_) - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == mld_bjac_) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = mld_umf_ + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val + case(mld_slu_dist_) + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val end select endif case(mld_coarse_sweeps_) @@ -242,16 +240,14 @@ subroutine mld_cprecseti(p,what,val,info,ilev) if (nlev_ > 1) then p%baseprecv(nlev_)%iprcparm(mld_coarse_solve_) = val - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == 0) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val p%baseprecv(nlev_)%iprcparm(mld_smoother_type_) = mld_bjac_ p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_distr_mat_ select case (val) case(mld_umf_, mld_slu_) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_repl_mat_ - case(mld_bjac_) - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == mld_bjac_) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = mld_umf_ + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val + case(mld_slu_dist_) + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val end select endif case(mld_coarse_subsolve_) diff --git a/mlprec/mld_dprecset.f90 b/mlprec/mld_dprecset.f90 index 26a41ad5..5909ab01 100644 --- a/mlprec/mld_dprecset.f90 +++ b/mlprec/mld_dprecset.f90 @@ -164,14 +164,12 @@ subroutine mld_dprecseti(p,what,val,info,ilev) p%baseprecv(nlev_)%iprcparm(mld_coarse_solve_) = val p%baseprecv(nlev_)%iprcparm(mld_smoother_type_) = mld_bjac_ p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_distr_mat_ - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == 0) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val select case (val) case(mld_umf_, mld_slu_) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_repl_mat_ - case(mld_bjac_) - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == mld_bjac_) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = mld_umf_ + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val + case(mld_slu_dist_) + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val end select endif case(mld_coarse_sweeps_) @@ -242,16 +240,14 @@ subroutine mld_dprecseti(p,what,val,info,ilev) if (nlev_ > 1) then p%baseprecv(nlev_)%iprcparm(mld_coarse_solve_) = val - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == 0) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val p%baseprecv(nlev_)%iprcparm(mld_smoother_type_) = mld_bjac_ p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_distr_mat_ select case (val) case(mld_umf_, mld_slu_) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_repl_mat_ - case(mld_bjac_) - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == mld_bjac_) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = mld_umf_ + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val + case(mld_slu_dist_) + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val end select endif case(mld_coarse_subsolve_) diff --git a/mlprec/mld_sprecset.f90 b/mlprec/mld_sprecset.f90 index 3e7de4b3..28ddd81e 100644 --- a/mlprec/mld_sprecset.f90 +++ b/mlprec/mld_sprecset.f90 @@ -164,14 +164,12 @@ subroutine mld_sprecseti(p,what,val,info,ilev) p%baseprecv(nlev_)%iprcparm(mld_coarse_solve_) = val p%baseprecv(nlev_)%iprcparm(mld_smoother_type_) = mld_bjac_ p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_distr_mat_ - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == 0) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val select case (val) case(mld_umf_, mld_slu_) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_repl_mat_ - case(mld_bjac_) - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == mld_bjac_) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = mld_umf_ + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val + case(mld_slu_dist_) + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val end select endif case(mld_coarse_sweeps_) @@ -242,16 +240,14 @@ subroutine mld_sprecseti(p,what,val,info,ilev) if (nlev_ > 1) then p%baseprecv(nlev_)%iprcparm(mld_coarse_solve_) = val - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == 0) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val p%baseprecv(nlev_)%iprcparm(mld_smoother_type_) = mld_bjac_ p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_distr_mat_ select case (val) case(mld_umf_, mld_slu_) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_repl_mat_ - case(mld_bjac_) - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == mld_bjac_) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = mld_umf_ + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val + case(mld_slu_dist_) + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val end select endif case(mld_coarse_subsolve_) diff --git a/mlprec/mld_zprecset.f90 b/mlprec/mld_zprecset.f90 index 4a013758..50c51ac4 100644 --- a/mlprec/mld_zprecset.f90 +++ b/mlprec/mld_zprecset.f90 @@ -164,14 +164,12 @@ subroutine mld_zprecseti(p,what,val,info,ilev) p%baseprecv(nlev_)%iprcparm(mld_coarse_solve_) = val p%baseprecv(nlev_)%iprcparm(mld_smoother_type_) = mld_bjac_ p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_distr_mat_ - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == 0) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val select case (val) case(mld_umf_, mld_slu_) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_repl_mat_ - case(mld_bjac_) - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == mld_bjac_) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = mld_umf_ + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val + case(mld_slu_dist_) + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val end select endif case(mld_coarse_sweeps_) @@ -242,16 +240,14 @@ subroutine mld_zprecseti(p,what,val,info,ilev) if (nlev_ > 1) then p%baseprecv(nlev_)%iprcparm(mld_coarse_solve_) = val - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == 0) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val p%baseprecv(nlev_)%iprcparm(mld_smoother_type_) = mld_bjac_ p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_distr_mat_ select case (val) case(mld_umf_, mld_slu_) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = mld_repl_mat_ - case(mld_bjac_) - if (p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) == mld_bjac_) & - & p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = mld_umf_ + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val + case(mld_slu_dist_) + p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val end select endif case(mld_coarse_subsolve_)