mld2p4-2:

Makefile

@@ -7,7 +7,7 @@ library: libdir mlp
 libdir:
 	(if test ! -d lib ; then mkdir lib; fi)
 mlp:
-	cd mlprec && $(MAKE) lib
+	cd mlprec && $(MAKE) all
 
 install: all
 	(./mkdir.sh  $(INSTALL_DIR) &&\

mlprec/Makefile

@@ -89,31 +89,31 @@ COBJS= mld_sslu_interface.o mld_sumf_interface.o \
        mld_cslu_interface.o mld_cumf_interface.o \
        mld_zslu_interface.o mld_zumf_interface.o
 
-OBJS=$(F90OBJS) $(MODOBJS) $(COBJS) $(MPCOBJS)
+OBJS=$(MODOBJS) 
+#OBJS=$(F90OBJS) $(MODOBJS) $(COBJS) $(MPCOBJS)
 
 LIBMOD=mld_prec_mod$(.mod) 
 LOCAL_MODS=$(MODOBJS:.o=$(.mod))
 LIBNAME=libmld_prec.a
 
-lib: $(LIBDIR)/$(LIBNAME)
+all: lib impld
 
-$(LIBNAME): $(OBJS) 
+impld: $(OBJS)
+	cd impl && $(MAKE)
+
+lib: $(OBJS) impld
 	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
-
-
-# flea: if libdir misses some .mod file, it won't be copied unless the .a file is missing too  
-$(LIBDIR)/$(LIBNAME): $(LIBNAME) 
 	/bin/cp -p $(HERE)/$(LIBNAME) $(LIBDIR)
 	/bin/cp -p $(LIBMOD) $(LOCAL_MODS) mld_const.h $(LIBDIR)
 
-mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o	: mld_base_prec_type.o
-mld_prec_type.o: mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o	
-mld_prec_mod.o: mld_prec_type.o mld_s_prec_mod.o mld_d_prec_mod.o mld_c_prec_mod.o mld_z_prec_mod.o
 
 $(MODOBJS): $(PSBINCDIR)/psb_base_mod$(.mod)
 
 mld_base_prec_type.o: mld_const.h 
+mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o	: mld_base_prec_type.o
+mld_prec_type.o: mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o	
+mld_prec_mod.o: mld_prec_type.o mld_s_prec_mod.o mld_d_prec_mod.o mld_c_prec_mod.o mld_z_prec_mod.o
 
 $(SINNEROBJS) $(SOUTEROBJS): $(SMODOBJS)
 $(DINNEROBJS) $(DOUTEROBJS): $(DMODOBJS)
@@ -200,14 +200,11 @@ mld_cprecinit.o mld_cprecset.o: mld_c_diag_solver.o mld_c_ilu_solver.o \
 
 
 
-
-mpobjs: $(MODOBJS)
-	(make $(MPFOBJS) F90="$(MPF90)" F90COPT="$(F90COPT)")
-	(make $(MPCOBJS) CC="$(MPCC)" CCOPT="$(CCOPT)")
-
 veryclean: clean
 	/bin/rm -f $(LIBNAME)
 
-clean:
+clean: implclean
 	/bin/rm -f $(OBJS) $(LOCAL_MODS)
 
+implclean:
+	cd impl && $(MAKE) clean

mlprec/impl/Makefile

@@ -0,0 +1,87 @@
+include ../../Make.inc
+LIBDIR=../../lib
+PSBLIBDIR=$(PSBLASDIR)/lib
+PSBINCDIR=$(PSBLASDIR)/include
+HERE=..
+
+FINCLUDES=$(FMFLAG).. $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
+
+
+DMPFOBJS=mld_daggrmat_nosmth_asb.o mld_daggrmat_smth_asb.o mld_daggrmat_minnrg_asb.o 
+
+SMPFOBJS=mld_saggrmat_nosmth_asb.o mld_saggrmat_smth_asb.o mld_saggrmat_minnrg_asb.o 
+
+ZMPFOBJS=mld_zaggrmat_nosmth_asb.o mld_zaggrmat_smth_asb.o mld_zaggrmat_minnrg_asb.o 
+
+CMPFOBJS=mld_caggrmat_nosmth_asb.o mld_caggrmat_smth_asb.o mld_caggrmat_minnrg_asb.o 
+
+
+MPFOBJS=$(SMPFOBJS) $(DMPFOBJS) $(CMPFOBJS) $(ZMPFOBJS) 
+
+MPCOBJS=mld_sslud_interface.o mld_dslud_interface.o mld_cslud_interface.o mld_zslud_interface.o
+
+
+DINNEROBJS= mld_dcoarse_bld.o  mld_dmlprec_bld.o	  \
+	mld_dilu0_fact.o   mld_diluk_fact.o  mld_dilut_fact.o  mld_daggrmap_bld.o \
+	mld_d_dec_map_bld.o mld_dmlprec_aply.o mld_daggrmat_asb.o   \
+	$(DMPFOBJS) mld_d_base_solver_impl.o mld_d_base_smoother_impl.o mld_d_onelev_impl.o\
+	mld_d_as_smoother_impl.o
+
+SINNEROBJS= mld_scoarse_bld.o  mld_smlprec_bld.o	  \
+	mld_silu0_fact.o   mld_siluk_fact.o  mld_silut_fact.o  mld_saggrmap_bld.o \
+	mld_s_dec_map_bld.o mld_smlprec_aply.o mld_saggrmat_asb.o   \
+	$(SMPFOBJS)  mld_s_base_solver_impl.o mld_s_base_smoother_impl.o mld_s_onelev_impl.o\
+	mld_s_as_smoother_impl.o
+
+ZINNEROBJS= mld_zcoarse_bld.o  mld_zmlprec_bld.o	  \
+	mld_zilu0_fact.o   mld_ziluk_fact.o  mld_zilut_fact.o  mld_zaggrmap_bld.o \
+	mld_z_dec_map_bld.o mld_zmlprec_aply.o mld_zaggrmat_asb.o   \
+	$(ZMPFOBJS)  mld_z_base_solver_impl.o mld_z_base_smoother_impl.o mld_z_onelev_impl.o\
+	mld_z_as_smoother_impl.o
+
+CINNEROBJS= mld_ccoarse_bld.o  mld_cmlprec_bld.o	  \
+	mld_cilu0_fact.o   mld_ciluk_fact.o  mld_cilut_fact.o  mld_caggrmap_bld.o \
+	mld_c_dec_map_bld.o mld_cmlprec_aply.o mld_caggrmat_asb.o   \
+	$(CMPFOBJS)  mld_c_base_solver_impl.o mld_c_base_smoother_impl.o mld_c_onelev_impl.o\
+	mld_c_as_smoother_impl.o
+
+
+INNEROBJS= $(SINNEROBJS) $(DINNEROBJS) $(CINNEROBJS) $(ZINNEROBJS)
+
+
+DOUTEROBJS=mld_dprecbld.o  mld_dprecset.o mld_dprecinit.o mld_dprecaply.o
+
+SOUTEROBJS=mld_sprecbld.o  mld_sprecset.o mld_sprecinit.o mld_sprecaply.o
+
+ZOUTEROBJS=mld_zprecbld.o  mld_zprecset.o mld_zprecinit.o mld_zprecaply.o
+
+COUTEROBJS=mld_cprecbld.o  mld_cprecset.o mld_cprecinit.o mld_cprecaply.o
+
+
+OUTEROBJS=$(SOUTEROBJS) $(DOUTEROBJS) $(COUTEROBJS) $(ZOUTEROBJS)
+
+F90OBJS=$(OUTEROBJS) $(INNEROBJS)
+
+COBJS= mld_sslu_interface.o mld_sumf_interface.o \
+       mld_dslu_interface.o mld_dumf_interface.o \
+       mld_cslu_interface.o mld_cumf_interface.o \
+       mld_zslu_interface.o mld_zumf_interface.o
+
+OBJS=$(F90OBJS) $(COBJS) $(MPCOBJS)
+
+LIBNAME=libmld_prec.a
+
+lib:  $(OBJS) 
+	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
+	$(RANLIB) $(HERE)/$(LIBNAME)
+
+mpobjs: 
+	(make $(MPFOBJS) F90="$(MPF90)" F90COPT="$(F90COPT)")
+	(make $(MPCOBJS) CC="$(MPCC)" CCOPT="$(CCOPT)")
+
+veryclean: clean
+	/bin/rm -f $(LIBNAME)
+
+clean:
+	/bin/rm -f $(OBJS) $(LOCAL_MODS)
+

mlprec/impl/mld_c_base_smoother_impl.f90

@@ -341,7 +341,7 @@ end subroutine mld_c_base_smoother_bld
 !
 subroutine mld_c_base_smoother_free(sm,info)
   use psb_base_mod
-  use mld_c_base_smoother_mod, mld_protect_name => s
+  use mld_c_base_smoother_mod, mld_protect_name => mld_c_base_smoother_free
   Implicit None
 
   ! Arguments

mlprec/impl/mld_c_onelev_impl.f90

@@ -57,10 +57,10 @@
 !
 subroutine mld_c_base_onelev_descr(lv,il,nl,info,iout)
   use psb_base_mod
-  use mld_conelev_mod, mld_protect_name => mld_c_base_onelev_descr
+  use mld_c_onelev_mod, mld_protect_name => mld_c_base_onelev_descr
   Implicit None
   ! Arguments
-  class(mld_conelev_type), intent(in) :: lv
+  class(mld_c_onelev_type), intent(in) :: lv
   integer, intent(in)                 :: il,nl
   integer, intent(out)                :: info
   integer, intent(in), optional       :: iout
@@ -137,10 +137,10 @@ end subroutine mld_c_base_onelev_descr
 !
 subroutine mld_c_base_onelev_free(lv,info)
   use psb_base_mod
-  use mld_conelev_mod, mld_protect_name =>:  mld_T_onelev_precfree
+  use mld_c_onelev_mod, mld_protect_name =>  mld_c_base_onelev_free
   implicit none 
 
-  class(mld_conelev_type), intent(inout) :: lv
+  class(mld_c_onelev_type), intent(inout) :: lv
   integer, intent(out)                :: info
   integer :: i
 
@@ -175,12 +175,12 @@ end subroutine mld_c_base_onelev_free
 !
 subroutine mld_c_base_onelev_check(lv,info)
   use psb_base_mod
-  use mld_conelev_mod, mld_protect_name => mld_c_base_onelev_check
+  use mld_c_onelev_mod, mld_protect_name => mld_c_base_onelev_check
 
   Implicit None
 
   ! Arguments
-  class(mld_conelev_type), intent(inout) :: lv 
+  class(mld_c_onelev_type), intent(inout) :: lv 
   integer, intent(out)                   :: info
   Integer           :: err_act
   character(len=20) :: name='c_base_onelev_check'
@@ -231,12 +231,12 @@ end subroutine mld_c_base_onelev_check
 ! 
 subroutine mld_c_base_onelev_seti(lv,what,val,info)
   use psb_base_mod
-  use mld_conelev_mod, mld_protect_name => mld_c_base_onelev_seti
+  use mld_c_onelev_mod, mld_protect_name => mld_c_base_onelev_seti
 
   Implicit None
 
   ! Arguments
-  class(mld_conelev_type), intent(inout) :: lv 
+  class(mld_c_onelev_type), intent(inout) :: lv 
   integer, intent(in)                          :: what 
   integer, intent(in)                          :: val
   integer, intent(out)                         :: info
@@ -306,12 +306,12 @@ end subroutine mld_c_base_onelev_seti
 
 subroutine mld_c_base_onelev_setc(lv,what,val,info)
   use psb_base_mod
-  use mld_conelev_mod, mld_protect_name => mld_c_base_onelev_setc
+  use mld_c_onelev_mod, mld_protect_name => mld_c_base_onelev_setc
 
   Implicit None
 
   ! Arguments
-  class(mld_conelev_type), intent(inout) :: lv 
+  class(mld_c_onelev_type), intent(inout) :: lv 
   integer, intent(in)                            :: what 
   character(len=*), intent(in)                   :: val
   integer, intent(out)                           :: info
@@ -342,12 +342,12 @@ end subroutine mld_c_base_onelev_setc
 
 subroutine mld_c_base_onelev_setr(lv,what,val,info)
   use psb_base_mod
-  use mld_conelev_mod, mld_protect_name => mld_c_base_onelev_setr
+  use mld_c_onelev_mod, mld_protect_name => mld_c_base_onelev_setr
 
   Implicit None
 
   ! Arguments
-  class(mld_conelev_type), intent(inout) :: lv 
+  class(mld_c_onelev_type), intent(inout) :: lv 
   integer, intent(in)                            :: what 
   real(psb_spk_), intent(in)                     :: val
   integer, intent(out)                           :: info
@@ -392,9 +392,9 @@ end subroutine mld_c_base_onelev_setr
 !
 subroutine mld_c_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,solver)
   use psb_base_mod
-  use mld_conelev_mod, mld_protect_name => mld_c_base_onelev_dump
+  use mld_c_onelev_mod, mld_protect_name => mld_c_base_onelev_dump
   implicit none 
-  class(mld_conelev_type), intent(in) :: lv
+  class(mld_c_onelev_type), intent(in) :: lv
   integer, intent(in)              :: level
   integer, intent(out)             :: info
   character(len=*), intent(in), optional :: prefix, head

mlprec/impl/mld_caggrmat_asb.f90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_conelev_type), input/output.
+!    p          -  type(mld_c_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -109,7 +109,7 @@ subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_cspmat_type), intent(in)            :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_conelev_type), intent(inout), target :: p
+  type(mld_c_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
 ! Local variables

mlprec/impl/mld_caggrmat_minnrg_asb.F90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_conelev_type), input/output.
+!    p          -  type(mld_c_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -114,7 +114,7 @@ subroutine mld_caggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_cspmat_type), intent(in)             :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_conelev_type), intent(inout), target :: p
+  type(mld_c_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
   ! Local variables

mlprec/impl/mld_caggrmat_nosmth_asb.F90

@@ -66,7 +66,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_conelev_type), input/output.
+!    p          -  type(mld_c_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -97,7 +97,7 @@ subroutine mld_caggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_cspmat_type), intent(in)          :: a
   type(psb_desc_type), intent(in)            :: desc_a
   integer, intent(inout)                     :: ilaggr(:), nlaggr(:)
-  type(mld_conelev_type), intent(inout), target  :: p
+  type(mld_c_onelev_type), intent(inout), target  :: p
   integer, intent(out)                       :: info
 
   ! Local variables

mlprec/impl/mld_caggrmat_smth_asb.F90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_conelev_type), input/output.
+!    p          -  type(mld_c_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -114,7 +114,7 @@ subroutine mld_caggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_cspmat_type), intent(in)             :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_conelev_type), intent(inout), target :: p
+  type(mld_c_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
   ! Local variables

mlprec/impl/mld_ccoarse_bld.f90

@@ -58,7 +58,7 @@
 !               fine-level matrix.
 !    desc_a  -  type(psb_desc_type), input.
 !               The communication descriptor of a.
-!    p       -  type(mld_conelev_type), input/output.
+!    p       -  type(mld_c_onelev_type), input/output.
 !               The 'one-level' data structure containing the local part
 !               of the base preconditioner to be built as well as
 !               information concerning the prolongator and its transpose.
@@ -75,7 +75,7 @@ subroutine mld_ccoarse_bld(a,desc_a,p,info)
   ! Arguments
   type(psb_cspmat_type), intent(in), target    :: a
   type(psb_desc_type), intent(in), target      :: desc_a
-  type(mld_conelev_type), intent(inout),target :: p
+  type(mld_c_onelev_type), intent(inout),target :: p
   integer, intent(out)                         :: info
 
   ! Local variables

mlprec/impl/mld_cmlprec_bld.f90

@@ -353,7 +353,7 @@ subroutine mld_cmlprec_bld(a,desc_a,p,info,amold,vmold)
 contains
 
   subroutine check_coarse_lev(prec)
-    type(mld_conelev_type) :: prec
+    type(mld_c_onelev_type) :: prec
 
     !
     ! At the coarsest level, check mld_coarse_solve_ 

mlprec/impl/mld_cprecset.F90

@@ -341,7 +341,7 @@ subroutine mld_cprecseti(p,what,val,info,ilev)
 contains
 
   subroutine onelev_set_smoother(level,val,info)
-    type(mld_conelev_type), intent(inout) :: level
+    type(mld_c_onelev_type), intent(inout) :: level
     integer, intent(in)                   :: val
     integer, intent(out)                  :: info
     info = psb_success_
@@ -438,7 +438,7 @@ contains
   end subroutine onelev_set_smoother
 
   subroutine onelev_set_solver(level,val,info)
-    type(mld_conelev_type), intent(inout) :: level
+    type(mld_c_onelev_type), intent(inout) :: level
     integer, intent(in)                   :: val
     integer, intent(out)                  :: info
     info = psb_success_

mlprec/impl/mld_d_base_smoother_impl.f90

@@ -341,7 +341,7 @@ end subroutine mld_d_base_smoother_bld
 !
 subroutine mld_d_base_smoother_free(sm,info)
   use psb_base_mod
-  use mld_d_base_smoother_mod, mld_protect_name => s
+  use mld_d_base_smoother_mod, mld_protect_name => mld_d_base_smoother_free
   Implicit None
 
   ! Arguments

mlprec/impl/mld_d_onelev_impl.f90

@@ -57,10 +57,10 @@
 !
 subroutine mld_d_base_onelev_descr(lv,il,nl,info,iout)
   use psb_base_mod
-  use mld_donelev_mod, mld_protect_name => mld_d_base_onelev_descr
+  use mld_d_onelev_mod, mld_protect_name => mld_d_base_onelev_descr
   Implicit None
   ! Arguments
-  class(mld_donelev_type), intent(in) :: lv
+  class(mld_d_onelev_type), intent(in) :: lv
   integer, intent(in)                 :: il,nl
   integer, intent(out)                :: info
   integer, intent(in), optional       :: iout
@@ -137,10 +137,10 @@ end subroutine mld_d_base_onelev_descr
 !
 subroutine mld_d_base_onelev_free(lv,info)
   use psb_base_mod
-  use mld_donelev_mod, mld_protect_name =>:  mld_T_onelev_precfree
+  use mld_d_onelev_mod, mld_protect_name =>  mld_d_base_onelev_free
   implicit none 
 
-  class(mld_donelev_type), intent(inout) :: lv
+  class(mld_d_onelev_type), intent(inout) :: lv
   integer, intent(out)                :: info
   integer :: i
 
@@ -175,12 +175,12 @@ end subroutine mld_d_base_onelev_free
 !
 subroutine mld_d_base_onelev_check(lv,info)
   use psb_base_mod
-  use mld_donelev_mod, mld_protect_name => mld_d_base_onelev_check
+  use mld_d_onelev_mod, mld_protect_name => mld_d_base_onelev_check
 
   Implicit None
 
   ! Arguments
-  class(mld_donelev_type), intent(inout) :: lv 
+  class(mld_d_onelev_type), intent(inout) :: lv 
   integer, intent(out)                   :: info
   Integer           :: err_act
   character(len=20) :: name='d_base_onelev_check'
@@ -231,12 +231,12 @@ end subroutine mld_d_base_onelev_check
 ! 
 subroutine mld_d_base_onelev_seti(lv,what,val,info)
   use psb_base_mod
-  use mld_donelev_mod, mld_protect_name => mld_d_base_onelev_seti
+  use mld_d_onelev_mod, mld_protect_name => mld_d_base_onelev_seti
 
   Implicit None
 
   ! Arguments
-  class(mld_donelev_type), intent(inout) :: lv 
+  class(mld_d_onelev_type), intent(inout) :: lv 
   integer, intent(in)                          :: what 
   integer, intent(in)                          :: val
   integer, intent(out)                         :: info
@@ -306,12 +306,12 @@ end subroutine mld_d_base_onelev_seti
 
 subroutine mld_d_base_onelev_setc(lv,what,val,info)
   use psb_base_mod
-  use mld_donelev_mod, mld_protect_name => mld_d_base_onelev_setc
+  use mld_d_onelev_mod, mld_protect_name => mld_d_base_onelev_setc
 
   Implicit None
 
   ! Arguments
-  class(mld_donelev_type), intent(inout) :: lv 
+  class(mld_d_onelev_type), intent(inout) :: lv 
   integer, intent(in)                            :: what 
   character(len=*), intent(in)                   :: val
   integer, intent(out)                           :: info
@@ -342,12 +342,12 @@ end subroutine mld_d_base_onelev_setc
 
 subroutine mld_d_base_onelev_setr(lv,what,val,info)
   use psb_base_mod
-  use mld_donelev_mod, mld_protect_name => mld_d_base_onelev_setr
+  use mld_d_onelev_mod, mld_protect_name => mld_d_base_onelev_setr
 
   Implicit None
 
   ! Arguments
-  class(mld_donelev_type), intent(inout) :: lv 
+  class(mld_d_onelev_type), intent(inout) :: lv 
   integer, intent(in)                            :: what 
   real(psb_dpk_), intent(in)                     :: val
   integer, intent(out)                           :: info
@@ -392,9 +392,9 @@ end subroutine mld_d_base_onelev_setr
 !
 subroutine mld_d_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,solver)
   use psb_base_mod
-  use mld_donelev_mod, mld_protect_name => mld_d_base_onelev_dump
+  use mld_d_onelev_mod, mld_protect_name => mld_d_base_onelev_dump
   implicit none 
-  class(mld_donelev_type), intent(in) :: lv
+  class(mld_d_onelev_type), intent(in) :: lv
   integer, intent(in)              :: level
   integer, intent(out)             :: info
   character(len=*), intent(in), optional :: prefix, head

mlprec/impl/mld_daggrmat_asb.f90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_donelev_type), input/output.
+!    p          -  type(mld_d_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -109,7 +109,7 @@ subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_dspmat_type), intent(in)            :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_donelev_type), intent(inout), target :: p
+  type(mld_d_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
 ! Local variables

mlprec/impl/mld_daggrmat_minnrg_asb.F90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_donelev_type), input/output.
+!    p          -  type(mld_d_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -114,7 +114,7 @@ subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_dspmat_type), intent(in)             :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_donelev_type), intent(inout), target :: p
+  type(mld_d_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
   ! Local variables

mlprec/impl/mld_daggrmat_nosmth_asb.F90

@@ -66,7 +66,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_donelev_type), input/output.
+!    p          -  type(mld_d_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -97,7 +97,7 @@ subroutine mld_daggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_dspmat_type), intent(in)          :: a
   type(psb_desc_type), intent(in)            :: desc_a
   integer, intent(inout)                     :: ilaggr(:), nlaggr(:)
-  type(mld_donelev_type), intent(inout), target  :: p
+  type(mld_d_onelev_type), intent(inout), target  :: p
   integer, intent(out)                       :: info
 
   ! Local variables

mlprec/impl/mld_daggrmat_smth_asb.F90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_donelev_type), input/output.
+!    p          -  type(mld_d_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -114,7 +114,7 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_dspmat_type), intent(in)             :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_donelev_type), intent(inout), target :: p
+  type(mld_d_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
   ! Local variables

mlprec/impl/mld_dcoarse_bld.f90

@@ -58,7 +58,7 @@
 !               fine-level matrix.
 !    desc_a  -  type(psb_desc_type), input.
 !               The communication descriptor of a.
-!    p       -  type(mld_donelev_type), input/output.
+!    p       -  type(mld_d_onelev_type), input/output.
 !               The 'one-level' data structure containing the local part
 !               of the base preconditioner to be built as well as
 !               information concerning the prolongator and its transpose.
@@ -75,7 +75,7 @@ subroutine mld_dcoarse_bld(a,desc_a,p,info)
   ! Arguments
   type(psb_dspmat_type), intent(in), target    :: a
   type(psb_desc_type), intent(in), target      :: desc_a
-  type(mld_donelev_type), intent(inout),target :: p
+  type(mld_d_onelev_type), intent(inout),target :: p
   integer, intent(out)                         :: info
 
   ! Local variables

mlprec/impl/mld_dmlprec_bld.f90

@@ -353,7 +353,7 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info,amold,vmold)
 contains
 
   subroutine check_coarse_lev(prec)
-    type(mld_donelev_type) :: prec
+    type(mld_d_onelev_type) :: prec
 
     !
     ! At the coarsest level, check mld_coarse_solve_ 

mlprec/impl/mld_dprecset.F90

@@ -341,7 +341,7 @@ subroutine mld_dprecseti(p,what,val,info,ilev)
 contains
 
   subroutine onelev_set_smoother(level,val,info)
-    type(mld_donelev_type), intent(inout) :: level
+    type(mld_d_onelev_type), intent(inout) :: level
     integer, intent(in)                   :: val
     integer, intent(out)                  :: info
     info = psb_success_
@@ -438,7 +438,7 @@ contains
   end subroutine onelev_set_smoother
 
   subroutine onelev_set_solver(level,val,info)
-    type(mld_donelev_type), intent(inout) :: level
+    type(mld_d_onelev_type), intent(inout) :: level
     integer, intent(in)                   :: val
     integer, intent(out)                  :: info
     info = psb_success_

mlprec/impl/mld_s_base_smoother_impl.f90

@@ -341,7 +341,7 @@ end subroutine mld_s_base_smoother_bld
 !
 subroutine mld_s_base_smoother_free(sm,info)
   use psb_base_mod
-  use mld_s_base_smoother_mod, mld_protect_name => s
+  use mld_s_base_smoother_mod, mld_protect_name => mld_s_base_smoother_free
   Implicit None
 
   ! Arguments

mlprec/impl/mld_s_onelev_impl.f90

@@ -57,10 +57,10 @@
 !
 subroutine mld_s_base_onelev_descr(lv,il,nl,info,iout)
   use psb_base_mod
-  use mld_sonelev_mod, mld_protect_name => mld_s_base_onelev_descr
+  use mld_s_onelev_mod, mld_protect_name => mld_s_base_onelev_descr
   Implicit None
   ! Arguments
-  class(mld_sonelev_type), intent(in) :: lv
+  class(mld_s_onelev_type), intent(in) :: lv
   integer, intent(in)                 :: il,nl
   integer, intent(out)                :: info
   integer, intent(in), optional       :: iout
@@ -137,10 +137,10 @@ end subroutine mld_s_base_onelev_descr
 !
 subroutine mld_s_base_onelev_free(lv,info)
   use psb_base_mod
-  use mld_sonelev_mod, mld_protect_name =>:  mld_T_onelev_precfree
+  use mld_s_onelev_mod, mld_protect_name =>  mld_s_base_onelev_free
   implicit none 
 
-  class(mld_sonelev_type), intent(inout) :: lv
+  class(mld_s_onelev_type), intent(inout) :: lv
   integer, intent(out)                :: info
   integer :: i
 
@@ -175,12 +175,12 @@ end subroutine mld_s_base_onelev_free
 !
 subroutine mld_s_base_onelev_check(lv,info)
   use psb_base_mod
-  use mld_sonelev_mod, mld_protect_name => mld_s_base_onelev_check
+  use mld_s_onelev_mod, mld_protect_name => mld_s_base_onelev_check
 
   Implicit None
 
   ! Arguments
-  class(mld_sonelev_type), intent(inout) :: lv 
+  class(mld_s_onelev_type), intent(inout) :: lv 
   integer, intent(out)                   :: info
   Integer           :: err_act
   character(len=20) :: name='s_base_onelev_check'
@@ -231,12 +231,12 @@ end subroutine mld_s_base_onelev_check
 ! 
 subroutine mld_s_base_onelev_seti(lv,what,val,info)
   use psb_base_mod
-  use mld_sonelev_mod, mld_protect_name => mld_s_base_onelev_seti
+  use mld_s_onelev_mod, mld_protect_name => mld_s_base_onelev_seti
 
   Implicit None
 
   ! Arguments
-  class(mld_sonelev_type), intent(inout) :: lv 
+  class(mld_s_onelev_type), intent(inout) :: lv 
   integer, intent(in)                          :: what 
   integer, intent(in)                          :: val
   integer, intent(out)                         :: info
@@ -306,12 +306,12 @@ end subroutine mld_s_base_onelev_seti
 
 subroutine mld_s_base_onelev_setc(lv,what,val,info)
   use psb_base_mod
-  use mld_sonelev_mod, mld_protect_name => mld_s_base_onelev_setc
+  use mld_s_onelev_mod, mld_protect_name => mld_s_base_onelev_setc
 
   Implicit None
 
   ! Arguments
-  class(mld_sonelev_type), intent(inout) :: lv 
+  class(mld_s_onelev_type), intent(inout) :: lv 
   integer, intent(in)                            :: what 
   character(len=*), intent(in)                   :: val
   integer, intent(out)                           :: info
@@ -342,12 +342,12 @@ end subroutine mld_s_base_onelev_setc
 
 subroutine mld_s_base_onelev_setr(lv,what,val,info)
   use psb_base_mod
-  use mld_sonelev_mod, mld_protect_name => mld_s_base_onelev_setr
+  use mld_s_onelev_mod, mld_protect_name => mld_s_base_onelev_setr
 
   Implicit None
 
   ! Arguments
-  class(mld_sonelev_type), intent(inout) :: lv 
+  class(mld_s_onelev_type), intent(inout) :: lv 
   integer, intent(in)                            :: what 
   real(psb_spk_), intent(in)                     :: val
   integer, intent(out)                           :: info
@@ -392,9 +392,9 @@ end subroutine mld_s_base_onelev_setr
 !
 subroutine mld_s_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,solver)
   use psb_base_mod
-  use mld_sonelev_mod, mld_protect_name => mld_s_base_onelev_dump
+  use mld_s_onelev_mod, mld_protect_name => mld_s_base_onelev_dump
   implicit none 
-  class(mld_sonelev_type), intent(in) :: lv
+  class(mld_s_onelev_type), intent(in) :: lv
   integer, intent(in)              :: level
   integer, intent(out)             :: info
   character(len=*), intent(in), optional :: prefix, head

mlprec/impl/mld_saggrmat_asb.f90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_sonelev_type), input/output.
+!    p          -  type(mld_s_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -109,7 +109,7 @@ subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_sspmat_type), intent(in)            :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_sonelev_type), intent(inout), target :: p
+  type(mld_s_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
 ! Local variables

mlprec/impl/mld_saggrmat_minnrg_asb.F90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_sonelev_type), input/output.
+!    p          -  type(mld_s_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -114,7 +114,7 @@ subroutine mld_saggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_sspmat_type), intent(in)             :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_sonelev_type), intent(inout), target :: p
+  type(mld_s_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
   ! Local variables

mlprec/impl/mld_saggrmat_nosmth_asb.F90

@@ -66,7 +66,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_sonelev_type), input/output.
+!    p          -  type(mld_s_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -97,7 +97,7 @@ subroutine mld_saggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_sspmat_type), intent(in)          :: a
   type(psb_desc_type), intent(in)            :: desc_a
   integer, intent(inout)                     :: ilaggr(:), nlaggr(:)
-  type(mld_sonelev_type), intent(inout), target  :: p
+  type(mld_s_onelev_type), intent(inout), target  :: p
   integer, intent(out)                       :: info
 
   ! Local variables

mlprec/impl/mld_saggrmat_smth_asb.F90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_sonelev_type), input/output.
+!    p          -  type(mld_s_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -114,7 +114,7 @@ subroutine mld_saggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_sspmat_type), intent(in)             :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_sonelev_type), intent(inout), target :: p
+  type(mld_s_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
   ! Local variables

mlprec/impl/mld_scoarse_bld.f90

@@ -58,7 +58,7 @@
 !               fine-level matrix.
 !    desc_a  -  type(psb_desc_type), input.
 !               The communication descriptor of a.
-!    p       -  type(mld_sonelev_type), input/output.
+!    p       -  type(mld_s_onelev_type), input/output.
 !               The 'one-level' data structure containing the local part
 !               of the base preconditioner to be built as well as
 !               information concerning the prolongator and its transpose.
@@ -75,7 +75,7 @@ subroutine mld_scoarse_bld(a,desc_a,p,info)
   ! Arguments
   type(psb_sspmat_type), intent(in), target    :: a
   type(psb_desc_type), intent(in), target      :: desc_a
-  type(mld_sonelev_type), intent(inout),target :: p
+  type(mld_s_onelev_type), intent(inout),target :: p
   integer, intent(out)                         :: info
 
   ! Local variables

mlprec/impl/mld_smlprec_bld.f90

@@ -353,7 +353,7 @@ subroutine mld_smlprec_bld(a,desc_a,p,info,amold,vmold)
 contains
 
   subroutine check_coarse_lev(prec)
-    type(mld_sonelev_type) :: prec
+    type(mld_s_onelev_type) :: prec
 
     !
     ! At the coarsest level, check mld_coarse_solve_ 

mlprec/impl/mld_sprecset.F90

@@ -341,7 +341,7 @@ subroutine mld_sprecseti(p,what,val,info,ilev)
 contains
 
   subroutine onelev_set_smoother(level,val,info)
-    type(mld_sonelev_type), intent(inout) :: level
+    type(mld_s_onelev_type), intent(inout) :: level
     integer, intent(in)                   :: val
     integer, intent(out)                  :: info
     info = psb_success_
@@ -438,7 +438,7 @@ contains
   end subroutine onelev_set_smoother
 
   subroutine onelev_set_solver(level,val,info)
-    type(mld_sonelev_type), intent(inout) :: level
+    type(mld_s_onelev_type), intent(inout) :: level
     integer, intent(in)                   :: val
     integer, intent(out)                  :: info
     info = psb_success_

mlprec/impl/mld_z_base_smoother_impl.f90

@@ -341,7 +341,7 @@ end subroutine mld_z_base_smoother_bld
 !
 subroutine mld_z_base_smoother_free(sm,info)
   use psb_base_mod
-  use mld_z_base_smoother_mod, mld_protect_name => s
+  use mld_z_base_smoother_mod, mld_protect_name => mld_z_base_smoother_free
   Implicit None
 
   ! Arguments

mlprec/impl/mld_z_onelev_impl.f90

@@ -57,10 +57,10 @@
 !
 subroutine mld_z_base_onelev_descr(lv,il,nl,info,iout)
   use psb_base_mod
-  use mld_zonelev_mod, mld_protect_name => mld_z_base_onelev_descr
+  use mld_z_onelev_mod, mld_protect_name => mld_z_base_onelev_descr
   Implicit None
   ! Arguments
-  class(mld_zonelev_type), intent(in) :: lv
+  class(mld_z_onelev_type), intent(in) :: lv
   integer, intent(in)                 :: il,nl
   integer, intent(out)                :: info
   integer, intent(in), optional       :: iout
@@ -137,10 +137,10 @@ end subroutine mld_z_base_onelev_descr
 !
 subroutine mld_z_base_onelev_free(lv,info)
   use psb_base_mod
-  use mld_zonelev_mod, mld_protect_name =>:  mld_T_onelev_precfree
+  use mld_z_onelev_mod, mld_protect_name =>  mld_z_base_onelev_free
   implicit none 
 
-  class(mld_zonelev_type), intent(inout) :: lv
+  class(mld_z_onelev_type), intent(inout) :: lv
   integer, intent(out)                :: info
   integer :: i
 
@@ -175,12 +175,12 @@ end subroutine mld_z_base_onelev_free
 !
 subroutine mld_z_base_onelev_check(lv,info)
   use psb_base_mod
-  use mld_zonelev_mod, mld_protect_name => mld_z_base_onelev_check
+  use mld_z_onelev_mod, mld_protect_name => mld_z_base_onelev_check
 
   Implicit None
 
   ! Arguments
-  class(mld_zonelev_type), intent(inout) :: lv 
+  class(mld_z_onelev_type), intent(inout) :: lv 
   integer, intent(out)                   :: info
   Integer           :: err_act
   character(len=20) :: name='z_base_onelev_check'
@@ -231,12 +231,12 @@ end subroutine mld_z_base_onelev_check
 ! 
 subroutine mld_z_base_onelev_seti(lv,what,val,info)
   use psb_base_mod
-  use mld_zonelev_mod, mld_protect_name => mld_z_base_onelev_seti
+  use mld_z_onelev_mod, mld_protect_name => mld_z_base_onelev_seti
 
   Implicit None
 
   ! Arguments
-  class(mld_zonelev_type), intent(inout) :: lv 
+  class(mld_z_onelev_type), intent(inout) :: lv 
   integer, intent(in)                          :: what 
   integer, intent(in)                          :: val
   integer, intent(out)                         :: info
@@ -306,12 +306,12 @@ end subroutine mld_z_base_onelev_seti
 
 subroutine mld_z_base_onelev_setc(lv,what,val,info)
   use psb_base_mod
-  use mld_zonelev_mod, mld_protect_name => mld_z_base_onelev_setc
+  use mld_z_onelev_mod, mld_protect_name => mld_z_base_onelev_setc
 
   Implicit None
 
   ! Arguments
-  class(mld_zonelev_type), intent(inout) :: lv 
+  class(mld_z_onelev_type), intent(inout) :: lv 
   integer, intent(in)                            :: what 
   character(len=*), intent(in)                   :: val
   integer, intent(out)                           :: info
@@ -342,12 +342,12 @@ end subroutine mld_z_base_onelev_setc
 
 subroutine mld_z_base_onelev_setr(lv,what,val,info)
   use psb_base_mod
-  use mld_zonelev_mod, mld_protect_name => mld_z_base_onelev_setr
+  use mld_z_onelev_mod, mld_protect_name => mld_z_base_onelev_setr
 
   Implicit None
 
   ! Arguments
-  class(mld_zonelev_type), intent(inout) :: lv 
+  class(mld_z_onelev_type), intent(inout) :: lv 
   integer, intent(in)                            :: what 
   real(psb_dpk_), intent(in)                     :: val
   integer, intent(out)                           :: info
@@ -392,9 +392,9 @@ end subroutine mld_z_base_onelev_setr
 !
 subroutine mld_z_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,solver)
   use psb_base_mod
-  use mld_zonelev_mod, mld_protect_name => mld_z_base_onelev_dump
+  use mld_z_onelev_mod, mld_protect_name => mld_z_base_onelev_dump
   implicit none 
-  class(mld_zonelev_type), intent(in) :: lv
+  class(mld_z_onelev_type), intent(in) :: lv
   integer, intent(in)              :: level
   integer, intent(out)             :: info
   character(len=*), intent(in), optional :: prefix, head

mlprec/impl/mld_zaggrmat_asb.f90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_zonelev_type), input/output.
+!    p          -  type(mld_z_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -109,7 +109,7 @@ subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_zspmat_type), intent(in)            :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_zonelev_type), intent(inout), target :: p
+  type(mld_z_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
 ! Local variables

mlprec/impl/mld_zaggrmat_minnrg_asb.F90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_zonelev_type), input/output.
+!    p          -  type(mld_z_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -114,7 +114,7 @@ subroutine mld_zaggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_zspmat_type), intent(in)             :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_zonelev_type), intent(inout), target :: p
+  type(mld_z_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
   ! Local variables

mlprec/impl/mld_zaggrmat_nosmth_asb.F90

@@ -66,7 +66,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_zonelev_type), input/output.
+!    p          -  type(mld_z_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -97,7 +97,7 @@ subroutine mld_zaggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_zspmat_type), intent(in)          :: a
   type(psb_desc_type), intent(in)            :: desc_a
   integer, intent(inout)                     :: ilaggr(:), nlaggr(:)
-  type(mld_zonelev_type), intent(inout), target  :: p
+  type(mld_z_onelev_type), intent(inout), target  :: p
   integer, intent(out)                       :: info
 
   ! Local variables

mlprec/impl/mld_zaggrmat_smth_asb.F90

@@ -83,7 +83,7 @@
 !                  the fine-level matrix.
 !    desc_a     -  type(psb_desc_type), input.
 !                  The communication descriptor of the fine-level matrix.
-!    p          -  type(mld_zonelev_type), input/output.
+!    p          -  type(mld_z_onelev_type), input/output.
 !                  The 'one-level' data structure that will contain the local
 !                  part of the matrix to be built as well as the information 
 !                  concerning the prolongator and its transpose.
@@ -114,7 +114,7 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info)
   type(psb_zspmat_type), intent(in)             :: a
   type(psb_desc_type), intent(in)               :: desc_a
   integer, intent(inout)                        :: ilaggr(:), nlaggr(:)
-  type(mld_zonelev_type), intent(inout), target :: p
+  type(mld_z_onelev_type), intent(inout), target :: p
   integer, intent(out)                          :: info
 
   ! Local variables

mlprec/impl/mld_zcoarse_bld.f90

@@ -58,7 +58,7 @@
 !               fine-level matrix.
 !    desc_a  -  type(psb_desc_type), input.
 !               The communication descriptor of a.
-!    p       -  type(mld_zonelev_type), input/output.
+!    p       -  type(mld_z_onelev_type), input/output.
 !               The 'one-level' data structure containing the local part
 !               of the base preconditioner to be built as well as
 !               information concerning the prolongator and its transpose.
@@ -75,7 +75,7 @@ subroutine mld_zcoarse_bld(a,desc_a,p,info)
   ! Arguments
   type(psb_zspmat_type), intent(in), target    :: a
   type(psb_desc_type), intent(in), target      :: desc_a
-  type(mld_zonelev_type), intent(inout),target :: p
+  type(mld_z_onelev_type), intent(inout),target :: p
   integer, intent(out)                         :: info
 
   ! Local variables

mlprec/impl/mld_zmlprec_bld.f90

@@ -353,7 +353,7 @@ subroutine mld_zmlprec_bld(a,desc_a,p,info,amold,vmold)
 contains
 
   subroutine check_coarse_lev(prec)
-    type(mld_zonelev_type) :: prec
+    type(mld_z_onelev_type) :: prec
 
     !
     ! At the coarsest level, check mld_coarse_solve_