mld2p4-2:

config/pac.m4
 configure.ac
 configure
 mlprec/Makefile
 tests/fileread/Makefile
 tests/pdegen/Makefile
 tests/pdegen/runs/ppde.inp
Now accepts the install path of PSBLAS.

config/pac.m4

@@ -309,7 +309,7 @@ dnl
 AC_DEFUN(PAC_FORTRAN_HAVE_PSBLAS,
 ac_objext='.o'
 ac_ext='f90'
-ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/lib  conftest.$ac_ext  1>&5'
+ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/include $FMFLAG$PSBLAS_DIR/lib conftest.$ac_ext  1>&5'
 dnl Warning : square brackets are EVIL!
 [AC_MSG_CHECKING([for working source dir of PSBLAS])
 cat > conftest.$ac_ext <<EOF
@@ -342,7 +342,7 @@ dnl
 AC_DEFUN(PAC_FORTRAN_HAVE_PSB_LONG_INT,
 ac_objext='.o'
 ac_ext='f90'
-ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/lib  conftest.$ac_ext  1>&5'
+ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/include $FMFLAG$PSBLAS_DIR/lib  conftest.$ac_ext  1>&5'
 dnl Warning : square brackets are EVIL!
 [AC_MSG_CHECKING([for version of PSBLAS supporting psb_long_int_k_])
 cat > conftest.$ac_ext <<EOF

configure.ac

@@ -70,17 +70,16 @@ PSBLAS_DIR="$pac_cv_psblas_dir";
 AC_MSG_CHECKING([for PSBLAS build dir])
 case $PSBLAS_DIR in 
      /*) ;; 
-     *) AC_MSG_ERROR([The PSBLAS build dir must be an absolute pathname
-which must be specified  --with-psblas=/path/to/psblas])
+     *) AC_MSG_ERROR([The PSBLAS installation dir must be an absolute pathname
+ specified with --with-psblas=/path/to/psblas])
 esac
 if test ! -d "$PSBLAS_DIR" ; then 
    AC_MSG_ERROR([Could not find PSBLAS build dir $PSBLAS_DIR!])	
 fi
 AC_MSG_RESULT([$PSBLAS_DIR])
-pac_cv_status_file="$PSBLAS_DIR/config.status"
+pac_cv_status_file="$PSBLAS_DIR/Make.inc"
 if test ! -f "$pac_cv_status_file" ; then 
-   AC_MSG_ERROR([Could not find configure output in $PSBLAS_DIR. 
-You must first run the configure script in $PSBLAS_DIR $pac_cv_status_file.])		
+   AC_MSG_ERROR([Could not find an installation  in $PSBLAS_DIR.])		
 fi
 dnl. $pac_cv_status_file
 dnl AC_MSG_NOTICE([Loaded $pac_cv_status_file $FC $MPIFC $BLACS_LIBS])

mlprec/Makefile

@@ -1,9 +1,10 @@
 include ../Make.inc
 LIBDIR=../lib
 PSBLIBDIR=$(PSBLASDIR)/lib
+PSBINCDIR=$(PSBLASDIR)/include
 HERE=.
 
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBLIBDIR)
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) $(FMFLAG)$(PSBINCDIR) $(FMFLAG)$(PSBLIBDIR)
 
 
 MODOBJS=mld_base_prec_type.o \
@@ -114,7 +115,7 @@ mld_dprecinit.o mld_dprecset.o: mld_d_diag_solver.o mld_d_ilu_solver.o \
 		mld_d_as_smoother.o mld_d_jac_smoother.o
 
 
-$(MODOBJS): $(PSBLIBDIR)/psb_sparse_mod$(.mod)
+$(MODOBJS): $(PSBINCDIR)/psb_sparse_mod$(.mod)
  
 mpobjs: $(MODOBJS)
 	(make $(MPFOBJS) F90="$(MPF90)" F90COPT="$(F90COPT)")

tests/fileread/Makefile

@@ -1,10 +1,11 @@
 MLDDIR=../..
 include $(MLDDIR)/Make.inc
-PSBDIR=$(PSBLASDIR)/lib/
+PSBLIBDIR=$(PSBLASDIR)/lib/
+PSBINCDIR=$(PSBLASDIR)/include
 MLDLIBDIR=$(MLDDIR)/lib
 MLD_LIB=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
-PSBLAS_LIB= -L$(PSBDIR)  -lpsb_util  -lpsb_base
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBDIR) $(FIFLAG).
+PSBLAS_LIB= -L$(PSBLIBDIR)  -lpsb_util  -lpsb_base
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
 
 DFSOBJS=df_sample.o data_input.o
 SFSOBJS=sf_sample.o data_input.o

tests/pdegen/Makefile

@@ -1,10 +1,12 @@
 MLDDIR=../..
 include $(MLDDIR)/Make.inc
-PSBDIR=$(PSBLASDIR)/lib/
+include $(MLDDIR)/Make.inc
+PSBLIBDIR=$(PSBLASDIR)/lib/
+PSBINCDIR=$(PSBLASDIR)/include
 MLDLIBDIR=$(MLDDIR)/lib
-MLD_LIB=-L$(MLDLIBDIR)  -lmld_prec
-PSBLAS_LIB= -L$(PSBDIR) -lpsb_krylov -lpsb_prec  -lpsb_util  -lpsb_base
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBDIR) $(FIFLAG).
+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).
 
 
 EXEDIR=./runs

tests/pdegen/runs/ppde.inp

@@ -1,9 +1,9 @@
 BICGSTAB                    ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG
 CSR                         ! Storage format CSR COO JAD 
-40                          ! IDIM; domain size is idim**3
+100                          ! IDIM; domain size is idim**3
 2                           ! ISTOPC
-0010                        ! ITMAX
-01                          ! ITRACE
+0200                        ! ITMAX
+-1                          ! ITRACE
 30                          ! IRST     (restart for RGMRES and BiCGSTABL) 
 1.d-6                       ! EPS
 3L-M-RAS-I-D4               ! Longer descriptive name for preconditioner (up to 20 chars)