mld2p4-2:

Makefile examples/fileread/Makefile examples/pdegen/Makefile mlprec/Makefile mlprec/impl/Makefile mlprec/impl/level/Makefile mlprec/impl/smoother/Makefile mlprec/impl/solver/Makefile tests/fileread/Makefile tests/fileread/df_sample.f90 tests/newslv/Makefile tests/pdegen/Makefile Fix INCDIR.
11 years ago · 357d80553f
parent c9de38bbce
commit 357d80553f
12 changed files with 43 additions and 25 deletions
--- a/11
+++ b/11
@ -6,6 +6,9 @@ library: libdir mlp

 libdir:
 	(if test ! -d lib ; then mkdir lib; fi)
+	(if test ! -d include ; then mkdir include; fi)
+	($(INSTALL_DATA) Make.inc  include/Make.inc.mld2p4)
+
 mlp:
 	cd mlprec && $(MAKE) all

@ -15,11 +18,15 @@ install: all
 	(./mkdir.sh $(INSTALL_LIBDIR) &&\
 	   $(INSTALL_DATA) lib/*.a  $(INSTALL_LIBDIR))
 	(./mkdir.sh $(INSTALL_INCLUDEDIR) && \
-	   $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_INCLUDEDIR))
+	   $(INSTALL_DATA) include/*$(.mod) $(INSTALL_INCLUDEDIR))
+	(./mkdir.sh  $(INSTALL_INCLUDEDIR) &&\
+	   $(INSTALL_DATA) Make.inc  $(INSTALL_INCLUDEDIR)/Make.inc.mld2p4)
 	(./mkdir.sh $(INSTALL_INCLUDEDIR) && \
-	   $(INSTALL_DATA) lib/*.h $(INSTALL_INCLUDEDIR))
+	   $(INSTALL_DATA) include/*.h $(INSTALL_INCLUDEDIR))
 	(./mkdir.sh  $(INSTALL_DOCSDIR) && \
 	   /bin/cp -fr docs/*pdf docs/html $(INSTALL_DOCSDIR))
+	(./mkdir.sh  $(INSTALL_DOCSDIR) && \
+	   $(INSTALL_DATA) README LICENSE $(INSTALL_DOCSDIR))
 veryclean: 
 	(cd mlprec; make veryclean)
 	(cd lib; /bin/rm -f *.a *$(.mod))
--- a/examples/fileread/Makefile
+++ b/examples/fileread/Makefile
@ -1,11 +1,12 @@
 MLDDIR=../..
-include $(MLDDIR)/Make.inc
+MLDINCDIR=$(MLDDIR)/include
+include $(MLDINCDIR)/Make.inc.mld2p4
 PSBLIBDIR=$(PSBLASDIR)/lib/
 PSBINCDIR=$(PSBLASDIR)/include
 MLDLIBDIR=$(MLDDIR)/lib
 MLD_LIB=-L$(MLDLIBDIR)  -lmld_prec
 PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_krylov -lpsb_prec -lpsb_util  -lpsb_base
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).

 DMOBJS=mld_dexample_ml.o data_input.o
 D1OBJS=mld_dexample_1lev.o data_input.o
--- a/examples/pdegen/Makefile
+++ b/examples/pdegen/Makefile
@ -1,11 +1,12 @@
 MLDDIR=../..
-include $(MLDDIR)/Make.inc
+MLDINCDIR=$(MLDDIR)/include
+include $(MLDINCDIR)/Make.inc.mld2p4
 PSBLIBDIR=$(PSBLASDIR)/lib/
 PSBINCDIR=$(PSBLASDIR)/include
 MLDLIBDIR=$(MLDDIR)/lib
 MLD_LIB=-L$(MLDLIBDIR)  -lmld_prec
 PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_krylov -lpsb_prec -lpsb_util  -lpsb_base
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).

 DMOBJS=mld_dexample_ml.o data_input.o
 D1OBJS=mld_dexample_1lev.o data_input.o
--- a/mlprec/Makefile
+++ b/mlprec/Makefile
@ -1,5 +1,6 @@
 include ../Make.inc
 LIBDIR=../lib
+INCDIR=../include
 PSBLIBDIR=$(PSBLASDIR)/lib
 PSBINCDIR=$(PSBLASDIR)/include
 HERE=.
@ -36,7 +37,6 @@ MODOBJS=mld_base_prec_type.o mld_prec_type.o  mld_prec_mod.o \

 OBJS=$(MODOBJS) 

-#LIBMOD=mld_prec_mod$(.mod) 
 LOCAL_MODS=$(MODOBJS:.o=$(.mod))
 LIBNAME=libmld_prec.a

@ -49,7 +49,7 @@ lib: $(OBJS) impld
 	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
 	/bin/cp -p $(HERE)/$(LIBNAME) $(LIBDIR)
-	/bin/cp -p *$(.mod) mld_const.h $(LIBDIR)
+	/bin/cp -p *$(.mod) mld_const.h $(INCDIR)


 $(MODOBJS): $(PSBINCDIR)/$(BASEMODNAME)$(.mod)
--- a/mlprec/impl/Makefile
+++ b/mlprec/impl/Makefile
@ -1,10 +1,11 @@
 include ../../Make.inc
 LIBDIR=../../lib
+INCDIR=../../include
 PSBLIBDIR=$(PSBLASDIR)/lib
 PSBINCDIR=$(PSBLASDIR)/include
 HERE=..

-FINCLUDES=$(FMFLAG).. $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
+FINCLUDES=$(FMFLAG).. $(FMFLAG)$(INCDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)


 DMPFOBJS=mld_daggrmat_nosmth_asb.o mld_daggrmat_smth_asb.o mld_daggrmat_minnrg_asb.o mld_daggrmat_biz_asb.o
--- a/mlprec/impl/level/Makefile
+++ b/mlprec/impl/level/Makefile
@ -1,10 +1,11 @@
 include ../../../Make.inc
 LIBDIR=../../../lib
+INCDIR=../../../include
 PSBLIBDIR=$(PSBLASDIR)/lib
 PSBINCDIR=$(PSBLASDIR)/include
 HERE=../..

-FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
+FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(INCDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)


 OBJS=mld_c_base_onelev_check.o \
--- a/mlprec/impl/smoother/Makefile
+++ b/mlprec/impl/smoother/Makefile
@ -1,10 +1,11 @@
 include ../../../Make.inc
 LIBDIR=../../../lib
+INCDIR=../../../include
 PSBLIBDIR=$(PSBLASDIR)/lib
 PSBINCDIR=$(PSBLASDIR)/include
 HERE=../..

-FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
+FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(INCDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)


 OBJS=mld_c_as_smoother_apply.o \
--- a/mlprec/impl/solver/Makefile
+++ b/mlprec/impl/solver/Makefile
@ -1,10 +1,11 @@
 include ../../../Make.inc
 LIBDIR=../../../lib
+INCDIR=../../../include
 PSBLIBDIR=$(PSBLASDIR)/lib
 PSBINCDIR=$(PSBLASDIR)/include
 HERE=../..

-FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
+FINCLUDES=$(FMFLAG)../.. $(FMFLAG)$(INCDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)


 OBJS=mld_c_base_solver_apply.o \
--- a/tests/fileread/Makefile
+++ b/tests/fileread/Makefile
@ -1,11 +1,12 @@
 MLDDIR=../..
-include $(MLDDIR)/Make.inc
+MLDINCDIR=$(MLDDIR)/include
+include $(MLDINCDIR)/Make.inc.mld2p4
 PSBLIBDIR=$(PSBLASDIR)/lib/
 PSBINCDIR=$(PSBLASDIR)/include
 MLDLIBDIR=$(MLDDIR)/lib
 MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
 PSBLAS_LIB= -L$(PSBLIBDIR)  -lpsb_util  -lpsb_base
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).

 DFSOBJS=df_sample.o data_input.o
 SFSOBJS=sf_sample.o data_input.o
--- a/tests/fileread/df_sample.f90
+++ b/tests/fileread/df_sample.f90
@ -276,13 +276,15 @@ program df_sample
  else
    nlv = 1
    call mld_precinit(prec,prec_choice%prec,info)
-    call mld_precset(prec,mld_smoother_sweeps_, prec_choice%jsweeps, info)
-    call mld_precset(prec,mld_sub_ovr_,         prec_choice%novr,    info)
-    call mld_precset(prec,mld_sub_restr_,       prec_choice%restr,   info)
-    call mld_precset(prec,mld_sub_prol_,        prec_choice%prol,    info)
-    call mld_precset(prec,mld_sub_solve_,       prec_choice%solve,   info)
-    call mld_precset(prec,mld_sub_fillin_,      prec_choice%fill,   info)
-    call mld_precset(prec,mld_sub_iluthrs_,     prec_choice%thr,    info)
+    if (psb_toupper(prec_choice%prec) /= 'NONE') then 
+      call mld_precset(prec,mld_smoother_sweeps_, prec_choice%jsweeps, info)
+      call mld_precset(prec,mld_sub_ovr_,         prec_choice%novr,    info)
+      call mld_precset(prec,mld_sub_restr_,       prec_choice%restr,   info)
+      call mld_precset(prec,mld_sub_prol_,        prec_choice%prol,    info)
+      call mld_precset(prec,mld_sub_solve_,       prec_choice%solve,   info)
+      call mld_precset(prec,mld_sub_fillin_,      prec_choice%fill,   info)
+      call mld_precset(prec,mld_sub_iluthrs_,     prec_choice%thr,    info)
+    end if
  end if

  ! building the preconditioner
--- a/tests/newslv/Makefile
+++ b/tests/newslv/Makefile
@ -1,11 +1,12 @@
 MLDDIR=../..
-include $(MLDDIR)/Make.inc
+MLDINCDIR=$(MLDDIR)/include
+include $(MLDINCDIR)/Make.inc.mld2p4
 PSBLIBDIR=$(PSBLASDIR)/lib/
 PSBINCDIR=$(PSBLASDIR)/include
 MLDLIBDIR=$(MLDDIR)/lib
 MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
 PSBLAS_LIB= -L$(PSBLIBDIR)  -lpsb_util  -lpsb_base
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).

 PD3DOBJS=ppde3d.o  data_input.o mld_d_tlu_solver.o mld_d_tlu_solver_impl.o
 PSOBJS=spde.o  data_input.o 
--- a/tests/pdegen/Makefile
+++ b/tests/pdegen/Makefile
@ -1,11 +1,12 @@
 MLDDIR=../..
-include $(MLDDIR)/Make.inc
+MLDINCDIR=$(MLDDIR)/include
+include $(MLDINCDIR)/Make.inc.mld2p4
 PSBLIBDIR=$(PSBLASDIR)/lib/
 PSBINCDIR=$(PSBLASDIR)/include
 MLDLIBDIR=$(MLDDIR)/lib
 MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
 PSBLAS_LIB= -L$(PSBLIBDIR)  -lpsb_util  -lpsb_base
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).


 EXEDIR=./runs