From 931c337d09bd2e21016a855aab237cb8499d3a95 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 18 May 2016 14:59:58 +0000 Subject: [PATCH] mld2p4-2: mlprec/impl/level/mld_d_base_onelev_cseti.F90 mlprec/impl/level/mld_d_base_onelev_seti.F90 mlprec/impl/level/mld_s_base_onelev_cseti.F90 mlprec/impl/level/mld_s_base_onelev_seti.F90 mlprec/impl/level/mld_z_base_onelev_cseti.F90 mlprec/impl/level/mld_z_base_onelev_seti.F90 Fixes for merged changes from smoother-2SIDE --- mlprec/impl/level/mld_c_base_onelev_cseti.F90 | 11 ----------- mlprec/impl/level/mld_c_base_onelev_seti.F90 | 11 ----------- mlprec/impl/level/mld_d_base_onelev_cseti.F90 | 1 - mlprec/impl/level/mld_d_base_onelev_seti.F90 | 1 - mlprec/impl/level/mld_s_base_onelev_cseti.F90 | 11 ----------- mlprec/impl/level/mld_s_base_onelev_seti.F90 | 11 ----------- mlprec/impl/level/mld_z_base_onelev_cseti.F90 | 1 - mlprec/impl/level/mld_z_base_onelev_seti.F90 | 1 - 8 files changed, 48 deletions(-) diff --git a/mlprec/impl/level/mld_c_base_onelev_cseti.F90 b/mlprec/impl/level/mld_c_base_onelev_cseti.F90 index 6399420e..a8cc5b1b 100644 --- a/mlprec/impl/level/mld_c_base_onelev_cseti.F90 +++ b/mlprec/impl/level/mld_c_base_onelev_cseti.F90 @@ -46,9 +46,6 @@ subroutine mld_c_base_onelev_cseti(lv,what,val,info,pos) use mld_c_ilu_solver use mld_c_id_solver use mld_c_gs_solver -#if defined(HAVE_UMF_) - use mld_c_umf_solver -#endif #if defined(HAVE_SLUDIST_) use mld_c_sludist_solver #endif @@ -78,9 +75,6 @@ subroutine mld_c_base_onelev_cseti(lv,what,val,info,pos) type(mld_c_id_solver_type) :: mld_c_id_solver_mold type(mld_c_gs_solver_type) :: mld_c_gs_solver_mold type(mld_c_bwgs_solver_type) :: mld_c_bwgs_solver_mold -#if defined(HAVE_UMF_) - type(mld_c_umf_solver_type) :: mld_c_umf_solver_mold -#endif #if defined(HAVE_SLUDIST_) type(mld_c_sludist_solver_type) :: mld_c_sludist_solver_mold #endif @@ -172,11 +166,6 @@ subroutine mld_c_base_onelev_cseti(lv,what,val,info,pos) case (mld_mumps_) call lv%set(mld_c_mumps_solver_mold,info,pos=pos) #endif - -#ifdef HAVE_UMF_ - case (mld_umf_) - call lv%set(mld_c_umf_solver_mold,info,pos=pos) -#endif case default ! ! Do nothing and hope for the best :) diff --git a/mlprec/impl/level/mld_c_base_onelev_seti.F90 b/mlprec/impl/level/mld_c_base_onelev_seti.F90 index 46a2ee2b..fa4ce997 100644 --- a/mlprec/impl/level/mld_c_base_onelev_seti.F90 +++ b/mlprec/impl/level/mld_c_base_onelev_seti.F90 @@ -46,9 +46,6 @@ subroutine mld_c_base_onelev_seti(lv,what,val,info,pos) use mld_c_ilu_solver use mld_c_id_solver use mld_c_gs_solver -#if defined(HAVE_UMF_) - use mld_c_umf_solver -#endif #if defined(HAVE_SLUDIST_) use mld_c_sludist_solver #endif @@ -78,9 +75,6 @@ subroutine mld_c_base_onelev_seti(lv,what,val,info,pos) type(mld_c_id_solver_type) :: mld_c_id_solver_mold type(mld_c_gs_solver_type) :: mld_c_gs_solver_mold type(mld_c_bwgs_solver_type) :: mld_c_bwgs_solver_mold -#if defined(HAVE_UMF_) - type(mld_c_umf_solver_type) :: mld_c_umf_solver_mold -#endif #if defined(HAVE_SLUDIST_) type(mld_c_sludist_solver_type) :: mld_c_sludist_solver_mold #endif @@ -172,11 +166,6 @@ subroutine mld_c_base_onelev_seti(lv,what,val,info,pos) case (mld_mumps_) call lv%set(mld_c_mumps_solver_mold,info,pos=pos) #endif - -#ifdef HAVE_UMF_ - case (mld_umf_) - call lv%set(mld_c_umf_solver_mold,info,pos=pos) -#endif case default ! ! Do nothing and hope for the best :) diff --git a/mlprec/impl/level/mld_d_base_onelev_cseti.F90 b/mlprec/impl/level/mld_d_base_onelev_cseti.F90 index 987886d4..b91a7c80 100644 --- a/mlprec/impl/level/mld_d_base_onelev_cseti.F90 +++ b/mlprec/impl/level/mld_d_base_onelev_cseti.F90 @@ -172,7 +172,6 @@ subroutine mld_d_base_onelev_cseti(lv,what,val,info,pos) case (mld_mumps_) call lv%set(mld_d_mumps_solver_mold,info,pos=pos) #endif - #ifdef HAVE_UMF_ case (mld_umf_) call lv%set(mld_d_umf_solver_mold,info,pos=pos) diff --git a/mlprec/impl/level/mld_d_base_onelev_seti.F90 b/mlprec/impl/level/mld_d_base_onelev_seti.F90 index 63aab65f..b4992b81 100644 --- a/mlprec/impl/level/mld_d_base_onelev_seti.F90 +++ b/mlprec/impl/level/mld_d_base_onelev_seti.F90 @@ -172,7 +172,6 @@ subroutine mld_d_base_onelev_seti(lv,what,val,info,pos) case (mld_mumps_) call lv%set(mld_d_mumps_solver_mold,info,pos=pos) #endif - #ifdef HAVE_UMF_ case (mld_umf_) call lv%set(mld_d_umf_solver_mold,info,pos=pos) diff --git a/mlprec/impl/level/mld_s_base_onelev_cseti.F90 b/mlprec/impl/level/mld_s_base_onelev_cseti.F90 index 16e4e00d..addaf567 100644 --- a/mlprec/impl/level/mld_s_base_onelev_cseti.F90 +++ b/mlprec/impl/level/mld_s_base_onelev_cseti.F90 @@ -46,9 +46,6 @@ subroutine mld_s_base_onelev_cseti(lv,what,val,info,pos) use mld_s_ilu_solver use mld_s_id_solver use mld_s_gs_solver -#if defined(HAVE_UMF_) - use mld_s_umf_solver -#endif #if defined(HAVE_SLUDIST_) use mld_s_sludist_solver #endif @@ -78,9 +75,6 @@ subroutine mld_s_base_onelev_cseti(lv,what,val,info,pos) type(mld_s_id_solver_type) :: mld_s_id_solver_mold type(mld_s_gs_solver_type) :: mld_s_gs_solver_mold type(mld_s_bwgs_solver_type) :: mld_s_bwgs_solver_mold -#if defined(HAVE_UMF_) - type(mld_s_umf_solver_type) :: mld_s_umf_solver_mold -#endif #if defined(HAVE_SLUDIST_) type(mld_s_sludist_solver_type) :: mld_s_sludist_solver_mold #endif @@ -172,11 +166,6 @@ subroutine mld_s_base_onelev_cseti(lv,what,val,info,pos) case (mld_mumps_) call lv%set(mld_s_mumps_solver_mold,info,pos=pos) #endif - -#ifdef HAVE_UMF_ - case (mld_umf_) - call lv%set(mld_s_umf_solver_mold,info,pos=pos) -#endif case default ! ! Do nothing and hope for the best :) diff --git a/mlprec/impl/level/mld_s_base_onelev_seti.F90 b/mlprec/impl/level/mld_s_base_onelev_seti.F90 index 49774d04..bca51e51 100644 --- a/mlprec/impl/level/mld_s_base_onelev_seti.F90 +++ b/mlprec/impl/level/mld_s_base_onelev_seti.F90 @@ -46,9 +46,6 @@ subroutine mld_s_base_onelev_seti(lv,what,val,info,pos) use mld_s_ilu_solver use mld_s_id_solver use mld_s_gs_solver -#if defined(HAVE_UMF_) - use mld_s_umf_solver -#endif #if defined(HAVE_SLUDIST_) use mld_s_sludist_solver #endif @@ -78,9 +75,6 @@ subroutine mld_s_base_onelev_seti(lv,what,val,info,pos) type(mld_s_id_solver_type) :: mld_s_id_solver_mold type(mld_s_gs_solver_type) :: mld_s_gs_solver_mold type(mld_s_bwgs_solver_type) :: mld_s_bwgs_solver_mold -#if defined(HAVE_UMF_) - type(mld_s_umf_solver_type) :: mld_s_umf_solver_mold -#endif #if defined(HAVE_SLUDIST_) type(mld_s_sludist_solver_type) :: mld_s_sludist_solver_mold #endif @@ -172,11 +166,6 @@ subroutine mld_s_base_onelev_seti(lv,what,val,info,pos) case (mld_mumps_) call lv%set(mld_s_mumps_solver_mold,info,pos=pos) #endif - -#ifdef HAVE_UMF_ - case (mld_umf_) - call lv%set(mld_s_umf_solver_mold,info,pos=pos) -#endif case default ! ! Do nothing and hope for the best :) diff --git a/mlprec/impl/level/mld_z_base_onelev_cseti.F90 b/mlprec/impl/level/mld_z_base_onelev_cseti.F90 index 2ad9db47..39fabe2f 100644 --- a/mlprec/impl/level/mld_z_base_onelev_cseti.F90 +++ b/mlprec/impl/level/mld_z_base_onelev_cseti.F90 @@ -172,7 +172,6 @@ subroutine mld_z_base_onelev_cseti(lv,what,val,info,pos) case (mld_mumps_) call lv%set(mld_z_mumps_solver_mold,info,pos=pos) #endif - #ifdef HAVE_UMF_ case (mld_umf_) call lv%set(mld_z_umf_solver_mold,info,pos=pos) diff --git a/mlprec/impl/level/mld_z_base_onelev_seti.F90 b/mlprec/impl/level/mld_z_base_onelev_seti.F90 index 250a6522..0d486331 100644 --- a/mlprec/impl/level/mld_z_base_onelev_seti.F90 +++ b/mlprec/impl/level/mld_z_base_onelev_seti.F90 @@ -172,7 +172,6 @@ subroutine mld_z_base_onelev_seti(lv,what,val,info,pos) case (mld_mumps_) call lv%set(mld_z_mumps_solver_mold,info,pos=pos) #endif - #ifdef HAVE_UMF_ case (mld_umf_) call lv%set(mld_z_umf_solver_mold,info,pos=pos)