mld2p4-2:

mlprec/Makefile
 mlprec/mld_c_prec_mod.f90
 mlprec/mld_c_prec_type.f90
 mlprec/mld_d_prec_mod.f90
 mlprec/mld_d_prec_type.f90
 mlprec/mld_s_prec_mod.f90
 mlprec/mld_s_prec_type.f90
 mlprec/mld_z_prec_mod.f90
 mlprec/mld_z_prec_type.f90

Make all smoothers/solvers visible to the outside.

mlprec/Makefile

@@ -7,22 +7,22 @@ HERE=.
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
 
 
-DMODOBJS=mld_d_prec_type.o mld_d_prec_mod.o mld_d_ilu_fact_mod.o \
+DMODOBJS=mld_d_prec_type.o mld_d_ilu_fact_mod.o \
 	mld_d_inner_mod.o mld_d_ilu_solver.o mld_d_diag_solver.o mld_d_jac_smoother.o mld_d_as_smoother.o \
 	mld_d_umf_solver.o mld_d_slu_solver.o mld_d_sludist_solver.o mld_d_id_solver.o\
 	mld_d_base_solver_mod.o mld_d_base_smoother_mod.o mld_d_onelev_mod.o
 
-SMODOBJS=mld_s_prec_type.o mld_s_prec_mod.o mld_s_ilu_fact_mod.o \
+SMODOBJS=mld_s_prec_type.o mld_s_ilu_fact_mod.o \
 	mld_s_inner_mod.o mld_s_ilu_solver.o mld_s_diag_solver.o mld_s_jac_smoother.o mld_s_as_smoother.o \
 	mld_s_slu_solver.o mld_s_sludist_solver.o mld_s_id_solver.o\
 	mld_s_base_solver_mod.o mld_s_base_smoother_mod.o mld_s_onelev_mod.o
 
-ZMODOBJS=mld_z_prec_type.o mld_z_prec_mod.o mld_z_ilu_fact_mod.o \
+ZMODOBJS=mld_z_prec_type.o mld_z_ilu_fact_mod.o \
 	mld_z_inner_mod.o mld_z_ilu_solver.o mld_z_diag_solver.o mld_z_jac_smoother.o mld_z_as_smoother.o \
 	mld_z_umf_solver.o mld_z_slu_solver.o mld_z_sludist_solver.o mld_z_id_solver.o\
 	mld_z_base_solver_mod.o mld_z_base_smoother_mod.o mld_z_onelev_mod.o
 
-CMODOBJS=mld_c_prec_type.o mld_c_prec_mod.o mld_c_ilu_fact_mod.o \
+CMODOBJS=mld_c_prec_type.o mld_c_ilu_fact_mod.o \
 	mld_c_inner_mod.o mld_c_ilu_solver.o mld_c_diag_solver.o mld_c_jac_smoother.o mld_c_as_smoother.o \
 	mld_c_slu_solver.o mld_c_sludist_solver.o mld_c_id_solver.o\
 	mld_c_base_solver_mod.o mld_c_base_smoother_mod.o mld_c_onelev_mod.o
@@ -30,6 +30,7 @@ CMODOBJS=mld_c_prec_type.o mld_c_prec_mod.o mld_c_ilu_fact_mod.o \
 
 
 MODOBJS=mld_base_prec_type.o mld_prec_type.o  mld_prec_mod.o \
+	 mld_s_prec_mod.o  mld_d_prec_mod.o mld_c_prec_mod.o mld_z_prec_mod.o \
 	$(SMODOBJS) $(DMODOBJS) $(CMODOBJS) $(ZMODOBJS) 
 
 
@@ -68,10 +69,10 @@ mld_d_inner_mod.o: mld_d_prec_type.o
 mld_c_inner_mod.o: mld_c_prec_type.o
 mld_z_inner_mod.o: mld_z_prec_type.o
 
-mld_s_prec_mod.o: mld_s_prec_type.o
-mld_d_prec_mod.o: mld_d_prec_type.o
-mld_c_prec_mod.o: mld_c_prec_type.o
-mld_z_prec_mod.o: mld_z_prec_type.o
+mld_s_prec_mod.o: $(SMODOBJS) 
+mld_d_prec_mod.o: $(DMODOBJS) 
+mld_c_prec_mod.o: $(CMODOBJS) 
+mld_z_prec_mod.o: $(ZMODOBJS) 
 
 
 mld_s_prec_type.o: mld_s_onelev_mod.o
@@ -142,4 +143,4 @@ clean: implclean
 	/bin/rm -f $(OBJS) $(LOCAL_MODS)
 
 implclean:
-	cd impl && $(MAKE) clean
+	cd impl && $(MAKE) clean

mlprec/mld_c_prec_mod.f90

@@ -46,7 +46,12 @@
 module mld_c_prec_mod
 
   use mld_c_prec_type
-
+  use mld_c_jac_smoother
+  use mld_c_as_smoother
+  use mld_c_id_solver
+  use mld_c_diag_solver
+  use mld_c_ilu_solver
+    
   interface mld_precinit
     subroutine mld_cprecinit(p,ptype,info,nlev)
       import :: psb_cspmat_type, psb_desc_type, psb_spk_, &

mlprec/mld_c_prec_type.f90

@@ -79,10 +79,10 @@ module mld_c_prec_type
   !
   !
 
-  type, extends(psb_cprec_type)         :: mld_cprec_type
-    integer(psb_ipk_)                 :: ictxt
+  type, extends(psb_cprec_type)        :: mld_cprec_type
+    integer(psb_ipk_)                  :: ictxt
     integer(psb_ipk_)                  :: coarse_aggr_size
-    real(psb_spk_)                      :: op_complexity=szero
+    real(psb_spk_)                        :: op_complexity=szero
     type(mld_c_onelev_type), allocatable :: precv(:) 
   contains
     procedure, pass(prec)               :: psb_c_apply2_vect => mld_c_apply2_vect

mlprec/mld_d_prec_mod.f90

@@ -46,7 +46,12 @@
 module mld_d_prec_mod
 
   use mld_d_prec_type
-
+  use mld_d_jac_smoother
+  use mld_d_as_smoother
+  use mld_d_id_solver
+  use mld_d_diag_solver
+  use mld_d_ilu_solver
+    
   interface mld_precinit
     subroutine mld_dprecinit(p,ptype,info,nlev)
       import :: psb_dspmat_type, psb_desc_type, psb_dpk_, &

mlprec/mld_d_prec_type.f90

@@ -79,10 +79,10 @@ module mld_d_prec_type
   !
   !
 
-  type, extends(psb_dprec_type)         :: mld_dprec_type
-    integer(psb_ipk_)                 :: ictxt
+  type, extends(psb_dprec_type)        :: mld_dprec_type
+    integer(psb_ipk_)                  :: ictxt
     integer(psb_ipk_)                  :: coarse_aggr_size
-    real(psb_dpk_)                      :: op_complexity=dzero
+    real(psb_dpk_)                        :: op_complexity=dzero
     type(mld_d_onelev_type), allocatable :: precv(:) 
   contains
     procedure, pass(prec)               :: psb_d_apply2_vect => mld_d_apply2_vect

mlprec/mld_s_prec_mod.f90

@@ -46,7 +46,12 @@
 module mld_s_prec_mod
 
   use mld_s_prec_type
-
+  use mld_s_jac_smoother
+  use mld_s_as_smoother
+  use mld_s_id_solver
+  use mld_s_diag_solver
+  use mld_s_ilu_solver
+    
   interface mld_precinit
     subroutine mld_sprecinit(p,ptype,info,nlev)
       import :: psb_sspmat_type, psb_desc_type, psb_spk_, &

mlprec/mld_s_prec_type.f90

@@ -79,10 +79,10 @@ module mld_s_prec_type
   !
   !
 
-  type, extends(psb_sprec_type)         :: mld_sprec_type
-    integer(psb_ipk_)                 :: ictxt
+  type, extends(psb_sprec_type)        :: mld_sprec_type
+    integer(psb_ipk_)                  :: ictxt
     integer(psb_ipk_)                  :: coarse_aggr_size
-    real(psb_spk_)                      :: op_complexity=szero
+    real(psb_spk_)                        :: op_complexity=szero
     type(mld_s_onelev_type), allocatable :: precv(:) 
   contains
     procedure, pass(prec)               :: psb_s_apply2_vect => mld_s_apply2_vect

mlprec/mld_z_prec_mod.f90

@@ -46,7 +46,12 @@
 module mld_z_prec_mod
 
   use mld_z_prec_type
-
+  use mld_z_jac_smoother
+  use mld_z_as_smoother
+  use mld_z_id_solver
+  use mld_z_diag_solver
+  use mld_z_ilu_solver
+    
   interface mld_precinit
     subroutine mld_zprecinit(p,ptype,info,nlev)
       import :: psb_zspmat_type, psb_desc_type, psb_dpk_, &

mlprec/mld_z_prec_type.f90

@@ -79,10 +79,10 @@ module mld_z_prec_type
   !
   !
 
-  type, extends(psb_zprec_type)         :: mld_zprec_type
-    integer(psb_ipk_)                 :: ictxt
+  type, extends(psb_zprec_type)        :: mld_zprec_type
+    integer(psb_ipk_)                  :: ictxt
     integer(psb_ipk_)                  :: coarse_aggr_size
-    real(psb_dpk_)                      :: op_complexity=dzero
+    real(psb_dpk_)                        :: op_complexity=dzero
     type(mld_z_onelev_type), allocatable :: precv(:) 
   contains
     procedure, pass(prec)               :: psb_z_apply2_vect => mld_z_apply2_vect