From 5e4201c32c3b044822a333be40c69a6433151776 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 10 Jan 2012 14:24:00 +0000 Subject: [PATCH] mld2p4-2: mlprec/mld_c_prec_mod.f90 mlprec/mld_d_prec_mod.f90 mlprec/mld_s_prec_mod.f90 mlprec/mld_z_prec_mod.f90 Silly inconsistencies uncovered by Cray FTN. --- mlprec/mld_c_prec_mod.f90 | 68 ++++++++++++++++----------------------- mlprec/mld_d_prec_mod.f90 | 67 ++++++++++++++++---------------------- mlprec/mld_s_prec_mod.f90 | 67 ++++++++++++++++---------------------- mlprec/mld_z_prec_mod.f90 | 68 ++++++++++++++++----------------------- 4 files changed, 112 insertions(+), 158 deletions(-) diff --git a/mlprec/mld_c_prec_mod.f90 b/mlprec/mld_c_prec_mod.f90 index 4385973d..142a6d93 100644 --- a/mlprec/mld_c_prec_mod.f90 +++ b/mlprec/mld_c_prec_mod.f90 @@ -36,9 +36,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: mld_prec_mod.f90 +! File: mld_c_prec_mod.f90 ! -! Module: mld_prec_mod +! Module: mld_c_prec_mod ! ! This module defines the interfaces to the real/complex, single/double ! precision versions of the user-level MLD2P4 routines. @@ -50,8 +50,7 @@ module mld_c_prec_mod interface mld_precinit subroutine mld_cprecinit(p,ptype,info,nlev) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type + import :: psb_cspmat_type, psb_desc_type, psb_spk_, mld_cprec_type type(mld_cprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype integer, intent(out) :: info @@ -60,30 +59,30 @@ module mld_c_prec_mod end interface interface mld_precset - module procedure mld_i_zprecsetsm, mld_i_zprecsetsv, & - & mld_i_zprecseti, mld_i_zprecsetc, mld_i_zprecsetr + module procedure mld_c_iprecsetsm, mld_c_iprecsetsv, & + & mld_c_iprecseti, mld_c_iprecsetc, mld_c_iprecsetr end interface interface mld_inner_precset subroutine mld_cprecsetsm(p,val,info,ilev) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type, mld_c_base_smoother_type + import :: psb_cspmat_type, psb_desc_type, psb_spk_, & + & mld_cprec_type, mld_c_base_smoother_type type(mld_cprec_type), intent(inout) :: p class(mld_c_base_smoother_type), intent(in) :: val integer, intent(out) :: info integer, optional, intent(in) :: ilev end subroutine mld_cprecsetsm subroutine mld_cprecsetsv(p,val,info,ilev) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type, mld_c_base_solver_type + import :: psb_cspmat_type, psb_desc_type, psb_spk_, & + & mld_cprec_type, mld_c_base_solver_type type(mld_cprec_type), intent(inout) :: p class(mld_c_base_solver_type), intent(in) :: val integer, intent(out) :: info integer, optional, intent(in) :: ilev end subroutine mld_cprecsetsv subroutine mld_cprecseti(p,what,val,info,ilev) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type + import :: psb_cspmat_type, psb_desc_type, psb_spk_, & + & mld_cprec_type type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what integer, intent(in) :: val @@ -91,8 +90,8 @@ module mld_c_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_cprecseti subroutine mld_cprecsetr(p,what,val,info,ilev) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type + import :: psb_cspmat_type, psb_desc_type, psb_spk_, & + & mld_cprec_type type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what real(psb_spk_), intent(in) :: val @@ -100,8 +99,8 @@ module mld_c_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_cprecsetr subroutine mld_cprecsetc(p,what,string,info,ilev) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type + import :: psb_cspmat_type, psb_desc_type, psb_spk_, & + & mld_cprec_type type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what character(len=*), intent(in) :: string @@ -112,9 +111,9 @@ module mld_c_prec_mod interface mld_precbld subroutine mld_cprecbld(a,desc_a,prec,info,amold,vmold) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, & - & psb_spk_, psb_c_base_sparse_mat, psb_c_base_vect_type - use mld_c_prec_type, only : mld_cprec_type + import :: psb_cspmat_type, psb_desc_type, psb_spk_, & + & psb_c_base_sparse_mat, psb_c_base_vect_type, & + & mld_cprec_type implicit none type(psb_cspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a @@ -128,58 +127,47 @@ module mld_c_prec_mod contains - subroutine mld_i_zprecsetsm(p,val,info) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type, mld_c_base_smoother_type + subroutine mld_c_iprecsetsm(p,val,info) type(mld_cprec_type), intent(inout) :: p class(mld_c_base_smoother_type), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,val,info) - end subroutine mld_i_zprecsetsm + end subroutine mld_c_iprecsetsm - subroutine mld_i_zprecsetsv(p,val,info) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type, mld_c_base_solver_type + subroutine mld_c_iprecsetsv(p,val,info) type(mld_cprec_type), intent(inout) :: p class(mld_c_base_solver_type), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,val,info) - end subroutine mld_i_zprecsetsv + end subroutine mld_c_iprecsetsv - subroutine mld_i_zprecseti(p,what,val,info) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type + subroutine mld_c_iprecseti(p,what,val,info) type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what integer, intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_zprecseti + end subroutine mld_c_iprecseti - subroutine mld_i_zprecsetr(p,what,val,info) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type + subroutine mld_c_iprecsetr(p,what,val,info) type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what real(psb_spk_), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_zprecsetr + end subroutine mld_c_iprecsetr - subroutine mld_i_zprecsetc(p,what,val,info) - use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ - use mld_c_prec_type, only : mld_cprec_type + subroutine mld_c_iprecsetc(p,what,val,info) type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what character(len=*), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_zprecsetc - + end subroutine mld_c_iprecsetc end module mld_c_prec_mod diff --git a/mlprec/mld_d_prec_mod.f90 b/mlprec/mld_d_prec_mod.f90 index dc07d171..a4006aca 100644 --- a/mlprec/mld_d_prec_mod.f90 +++ b/mlprec/mld_d_prec_mod.f90 @@ -36,9 +36,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: mld_prec_mod.f90 +! File: mld_d_prec_mod.f90 ! -! Module: mld_prec_mod +! Module: mld_d_prec_mod ! ! This module defines the interfaces to the real/complex, single/double ! precision versions of the user-level MLD2P4 routines. @@ -50,8 +50,7 @@ module mld_d_prec_mod interface mld_precinit subroutine mld_dprecinit(p,ptype,info,nlev) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type + import :: psb_dspmat_type, psb_desc_type, psb_dpk_, mld_dprec_type type(mld_dprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype integer, intent(out) :: info @@ -60,30 +59,30 @@ module mld_d_prec_mod end interface interface mld_precset - module procedure mld_i_dprecsetsm, mld_i_dprecsetsv, & - & mld_i_dprecseti, mld_i_dprecsetc, mld_i_dprecsetr + module procedure mld_d_iprecsetsm, mld_d_iprecsetsv, & + & mld_d_iprecseti, mld_d_iprecsetc, mld_d_iprecsetr end interface interface mld_inner_precset subroutine mld_dprecsetsm(p,val,info,ilev) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type, mld_d_base_smoother_type + import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & + & mld_dprec_type, mld_d_base_smoother_type type(mld_dprec_type), intent(inout) :: p class(mld_d_base_smoother_type), intent(in) :: val integer, intent(out) :: info integer, optional, intent(in) :: ilev end subroutine mld_dprecsetsm subroutine mld_dprecsetsv(p,val,info,ilev) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type, mld_d_base_solver_type + import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & + & mld_dprec_type, mld_d_base_solver_type type(mld_dprec_type), intent(inout) :: p class(mld_d_base_solver_type), intent(in) :: val integer, intent(out) :: info integer, optional, intent(in) :: ilev end subroutine mld_dprecsetsv subroutine mld_dprecseti(p,what,val,info,ilev) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type + import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & + & mld_dprec_type type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what integer, intent(in) :: val @@ -91,8 +90,8 @@ module mld_d_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_dprecseti subroutine mld_dprecsetr(p,what,val,info,ilev) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type + import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & + & mld_dprec_type type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what real(psb_dpk_), intent(in) :: val @@ -100,8 +99,8 @@ module mld_d_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_dprecsetr subroutine mld_dprecsetc(p,what,string,info,ilev) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type + import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & + & mld_dprec_type type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what character(len=*), intent(in) :: string @@ -112,9 +111,9 @@ module mld_d_prec_mod interface mld_precbld subroutine mld_dprecbld(a,desc_a,prec,info,amold,vmold) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, & - & psb_dpk_, psb_d_base_sparse_mat, psb_d_base_vect_type - use mld_d_prec_type, only : mld_dprec_type + import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & + & psb_d_base_sparse_mat, psb_d_base_vect_type, & + & mld_dprec_type implicit none type(psb_dspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a @@ -128,57 +127,47 @@ module mld_d_prec_mod contains - subroutine mld_i_dprecsetsm(p,val,info) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type, mld_d_base_smoother_type + subroutine mld_d_iprecsetsm(p,val,info) type(mld_dprec_type), intent(inout) :: p class(mld_d_base_smoother_type), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,val,info) - end subroutine mld_i_dprecsetsm + end subroutine mld_d_iprecsetsm - subroutine mld_i_dprecsetsv(p,val,info) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type, mld_d_base_solver_type + subroutine mld_d_iprecsetsv(p,val,info) type(mld_dprec_type), intent(inout) :: p class(mld_d_base_solver_type), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,val,info) - end subroutine mld_i_dprecsetsv + end subroutine mld_d_iprecsetsv - subroutine mld_i_dprecseti(p,what,val,info) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type + subroutine mld_d_iprecseti(p,what,val,info) type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what integer, intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_dprecseti + end subroutine mld_d_iprecseti - subroutine mld_i_dprecsetr(p,what,val,info) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type + subroutine mld_d_iprecsetr(p,what,val,info) type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what real(psb_dpk_), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_dprecsetr + end subroutine mld_d_iprecsetr - subroutine mld_i_dprecsetc(p,what,val,info) - use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ - use mld_d_prec_type, only : mld_dprec_type + subroutine mld_d_iprecsetc(p,what,val,info) type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what character(len=*), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_dprecsetc + end subroutine mld_d_iprecsetc end module mld_d_prec_mod diff --git a/mlprec/mld_s_prec_mod.f90 b/mlprec/mld_s_prec_mod.f90 index d602f86b..f67c0df6 100644 --- a/mlprec/mld_s_prec_mod.f90 +++ b/mlprec/mld_s_prec_mod.f90 @@ -36,9 +36,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: mld_prec_mod.f90 +! File: mld_s_prec_mod.f90 ! -! Module: mld_prec_mod +! Module: mld_s_prec_mod ! ! This module defines the interfaces to the real/complex, single/double ! precision versions of the user-level MLD2P4 routines. @@ -50,8 +50,7 @@ module mld_s_prec_mod interface mld_precinit subroutine mld_sprecinit(p,ptype,info,nlev) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type + import :: psb_sspmat_type, psb_desc_type, psb_spk_, mld_sprec_type type(mld_sprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype integer, intent(out) :: info @@ -60,30 +59,30 @@ module mld_s_prec_mod end interface interface mld_precset - module procedure mld_i_dprecsetsm, mld_i_dprecsetsv, & - & mld_i_dprecseti, mld_i_dprecsetc, mld_i_dprecsetr + module procedure mld_s_iprecsetsm, mld_s_iprecsetsv, & + & mld_s_iprecseti, mld_s_iprecsetc, mld_s_iprecsetr end interface interface mld_inner_precset subroutine mld_sprecsetsm(p,val,info,ilev) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type, mld_s_base_smoother_type + import :: psb_sspmat_type, psb_desc_type, psb_spk_, & + & mld_sprec_type, mld_s_base_smoother_type type(mld_sprec_type), intent(inout) :: p class(mld_s_base_smoother_type), intent(in) :: val integer, intent(out) :: info integer, optional, intent(in) :: ilev end subroutine mld_sprecsetsm subroutine mld_sprecsetsv(p,val,info,ilev) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type, mld_s_base_solver_type + import :: psb_sspmat_type, psb_desc_type, psb_spk_, & + & mld_sprec_type, mld_s_base_solver_type type(mld_sprec_type), intent(inout) :: p class(mld_s_base_solver_type), intent(in) :: val integer, intent(out) :: info integer, optional, intent(in) :: ilev end subroutine mld_sprecsetsv subroutine mld_sprecseti(p,what,val,info,ilev) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type + import :: psb_sspmat_type, psb_desc_type, psb_spk_, & + & mld_sprec_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what integer, intent(in) :: val @@ -91,8 +90,8 @@ module mld_s_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_sprecseti subroutine mld_sprecsetr(p,what,val,info,ilev) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type + import :: psb_sspmat_type, psb_desc_type, psb_spk_, & + & mld_sprec_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what real(psb_spk_), intent(in) :: val @@ -100,8 +99,8 @@ module mld_s_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_sprecsetr subroutine mld_sprecsetc(p,what,string,info,ilev) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type + import :: psb_sspmat_type, psb_desc_type, psb_spk_, & + & mld_sprec_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what character(len=*), intent(in) :: string @@ -112,9 +111,9 @@ module mld_s_prec_mod interface mld_precbld subroutine mld_sprecbld(a,desc_a,prec,info,amold,vmold) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, & - & psb_spk_, psb_s_base_sparse_mat, psb_s_base_vect_type - use mld_s_prec_type, only : mld_sprec_type + import :: psb_sspmat_type, psb_desc_type, psb_spk_, & + & psb_s_base_sparse_mat, psb_s_base_vect_type, & + & mld_sprec_type implicit none type(psb_sspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a @@ -128,57 +127,47 @@ module mld_s_prec_mod contains - subroutine mld_i_dprecsetsm(p,val,info) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type, mld_s_base_smoother_type + subroutine mld_s_iprecsetsm(p,val,info) type(mld_sprec_type), intent(inout) :: p class(mld_s_base_smoother_type), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,val,info) - end subroutine mld_i_dprecsetsm + end subroutine mld_s_iprecsetsm - subroutine mld_i_dprecsetsv(p,val,info) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type, mld_s_base_solver_type + subroutine mld_s_iprecsetsv(p,val,info) type(mld_sprec_type), intent(inout) :: p class(mld_s_base_solver_type), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,val,info) - end subroutine mld_i_dprecsetsv + end subroutine mld_s_iprecsetsv - subroutine mld_i_dprecseti(p,what,val,info) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type + subroutine mld_s_iprecseti(p,what,val,info) type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what integer, intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_dprecseti + end subroutine mld_s_iprecseti - subroutine mld_i_dprecsetr(p,what,val,info) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type + subroutine mld_s_iprecsetr(p,what,val,info) type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what real(psb_spk_), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_dprecsetr + end subroutine mld_s_iprecsetr - subroutine mld_i_dprecsetc(p,what,val,info) - use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ - use mld_s_prec_type, only : mld_sprec_type + subroutine mld_s_iprecsetc(p,what,val,info) type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what character(len=*), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_dprecsetc + end subroutine mld_s_iprecsetc end module mld_s_prec_mod diff --git a/mlprec/mld_z_prec_mod.f90 b/mlprec/mld_z_prec_mod.f90 index 05b3c8b8..0ec94a43 100644 --- a/mlprec/mld_z_prec_mod.f90 +++ b/mlprec/mld_z_prec_mod.f90 @@ -36,9 +36,9 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -! File: mld_prec_mod.f90 +! File: mld_z_prec_mod.f90 ! -! Module: mld_prec_mod +! Module: mld_z_prec_mod ! ! This module defines the interfaces to the real/complex, single/double ! precision versions of the user-level MLD2P4 routines. @@ -50,8 +50,7 @@ module mld_z_prec_mod interface mld_precinit subroutine mld_zprecinit(p,ptype,info,nlev) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type + import :: psb_zspmat_type, psb_desc_type, psb_dpk_, mld_zprec_type type(mld_zprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype integer, intent(out) :: info @@ -60,30 +59,30 @@ module mld_z_prec_mod end interface interface mld_precset - module procedure mld_i_zprecsetsm, mld_i_zprecsetsv, & - & mld_i_zprecseti, mld_i_zprecsetc, mld_i_zprecsetr + module procedure mld_z_iprecsetsm, mld_z_iprecsetsv, & + & mld_z_iprecseti, mld_z_iprecsetc, mld_z_iprecsetr end interface interface mld_inner_precset subroutine mld_zprecsetsm(p,val,info,ilev) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type, mld_z_base_smoother_type + import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & + & mld_zprec_type, mld_z_base_smoother_type type(mld_zprec_type), intent(inout) :: p class(mld_z_base_smoother_type), intent(in) :: val integer, intent(out) :: info integer, optional, intent(in) :: ilev end subroutine mld_zprecsetsm subroutine mld_zprecsetsv(p,val,info,ilev) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type, mld_z_base_solver_type + import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & + & mld_zprec_type, mld_z_base_solver_type type(mld_zprec_type), intent(inout) :: p class(mld_z_base_solver_type), intent(in) :: val integer, intent(out) :: info integer, optional, intent(in) :: ilev end subroutine mld_zprecsetsv subroutine mld_zprecseti(p,what,val,info,ilev) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type + import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & + & mld_zprec_type type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what integer, intent(in) :: val @@ -91,8 +90,8 @@ module mld_z_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_zprecseti subroutine mld_zprecsetr(p,what,val,info,ilev) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type + import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & + & mld_zprec_type type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what real(psb_dpk_), intent(in) :: val @@ -100,8 +99,8 @@ module mld_z_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_zprecsetr subroutine mld_zprecsetc(p,what,string,info,ilev) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type + import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & + & mld_zprec_type type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what character(len=*), intent(in) :: string @@ -112,9 +111,9 @@ module mld_z_prec_mod interface mld_precbld subroutine mld_zprecbld(a,desc_a,prec,info,amold,vmold) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, & - & psb_dpk_, psb_z_base_sparse_mat, psb_z_base_vect_type - use mld_z_prec_type, only : mld_zprec_type + import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & + & psb_z_base_sparse_mat, psb_z_base_vect_type, & + & mld_zprec_type implicit none type(psb_zspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a @@ -128,58 +127,47 @@ module mld_z_prec_mod contains - subroutine mld_i_zprecsetsm(p,val,info) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type, mld_z_base_smoother_type + subroutine mld_z_iprecsetsm(p,val,info) type(mld_zprec_type), intent(inout) :: p class(mld_z_base_smoother_type), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,val,info) - end subroutine mld_i_zprecsetsm + end subroutine mld_z_iprecsetsm - subroutine mld_i_zprecsetsv(p,val,info) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type, mld_z_base_solver_type + subroutine mld_z_iprecsetsv(p,val,info) type(mld_zprec_type), intent(inout) :: p class(mld_z_base_solver_type), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,val,info) - end subroutine mld_i_zprecsetsv + end subroutine mld_z_iprecsetsv - subroutine mld_i_zprecseti(p,what,val,info) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type + subroutine mld_z_iprecseti(p,what,val,info) type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what integer, intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_zprecseti + end subroutine mld_z_iprecseti - subroutine mld_i_zprecsetr(p,what,val,info) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type + subroutine mld_z_iprecsetr(p,what,val,info) type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what real(psb_dpk_), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_zprecsetr + end subroutine mld_z_iprecsetr - subroutine mld_i_zprecsetc(p,what,val,info) - use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ - use mld_z_prec_type, only : mld_zprec_type + subroutine mld_z_iprecsetc(p,what,val,info) type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what character(len=*), intent(in) :: val integer, intent(out) :: info call mld_inner_precset(p,what,val,info) - end subroutine mld_i_zprecsetc - + end subroutine mld_z_iprecsetc end module mld_z_prec_mod