mld2p4-2:

Make.inc.in
 config/pac.m4
 configure.ac
 configure
 tests/pdegen/runs/ppde.inp

Updated configry stuff.
stopcriterion
Salvatore Filippone 11 years ago
parent 52ce9d084c
commit c9de38bbce

@ -5,7 +5,8 @@
# # # #
########################################################## ##########################################################
PSBLASDIR=@PSBLAS_DIR@ PSBLASDIR=@PSBLAS_DIR@
include $(PSBLASDIR)/Make.inc PSBLAS_INCDIR=@PSBLAS_INCDIR@
include $(PSBLAS_INCDIR)/Make.inc.psblas
INSTALL=@INSTALL@ INSTALL=@INSTALL@

@ -328,8 +328,20 @@ AC_HELP_STRING([--with-psblas], [The install directory for PSBLAS, for example,
--with-psblas=/opt/packages/psblas-3.1]), --with-psblas=/opt/packages/psblas-3.1]),
[pac_cv_psblas_dir=$withval], [pac_cv_psblas_dir=$withval],
[pac_cv_psblas_dir='']) [pac_cv_psblas_dir=''])
] AC_ARG_WITH(psblas-incdir, AC_HELP_STRING([--with-psblas-incdir=DIR], [Specify the directory for PSBLAS includes.]),
) [pac_cv_psblas_incdir=$withval],
[pac_cv_psblas_incdir=''])
AC_ARG_WITH(psblas-libdir, AC_HELP_STRING([--with-psblas-libdir=DIR], [Specify the directory for PSBLAS library.]),
[pac_cv_psblas_libdir=$withval],
[pac_cv_psblas_libdir=''])
if test x"$pac_cv_psblas_incdir" == "x" ; then
pac_cv_psblas_incdir="$pac_cv_psblas_dir/include";
fi
if test x"$pac_cv_psblas_libdir" == "x" ; then
pac_cv_psblas_libdir="$pac_cv_psblas_dir/lib";
fi
])
dnl @synopsis PAC_FORTRAN_HAVE_PSBLAS( [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl @synopsis PAC_FORTRAN_HAVE_PSBLAS( [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl dnl

34
configure vendored

@ -652,6 +652,7 @@ INSTALL_INCLUDEDIR
INSTALL_LIBDIR INSTALL_LIBDIR
INSTALL_DIR INSTALL_DIR
INSTALL INSTALL
PSBLAS_INCDIR
PSBLAS_DIR PSBLAS_DIR
MPIFC MPIFC
ac_ct_F77 ac_ct_F77
@ -717,6 +718,8 @@ ac_subst_files=''
ac_user_opts=' ac_user_opts='
enable_option_checking enable_option_checking
with_psblas with_psblas
with_psblas_incdir
with_psblas_libdir
with_extra_libs with_extra_libs
with_umfpack with_umfpack
with_umfpackdir with_umfpackdir
@ -1377,6 +1380,10 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-psblas The install directory for PSBLAS, for example, --with-psblas The install directory for PSBLAS, for example,
--with-psblas=/opt/packages/psblas-3.1 --with-psblas=/opt/packages/psblas-3.1
--with-psblas-incdir=DIR
Specify the directory for PSBLAS includes.
--with-psblas-libdir=DIR
Specify the directory for PSBLAS library.
--with-extra-libs List additional link flags here. For example, --with-extra-libs List additional link flags here. For example,
--with-extra-libs=-lspecial_system_lib or --with-extra-libs=-lspecial_system_lib or
--with-extra-libs=-L/path/to/libs --with-extra-libs=-L/path/to/libs
@ -1919,8 +1926,32 @@ else
fi fi
# Check whether --with-psblas-incdir was given.
if test "${with_psblas_incdir+set}" = set; then
withval=$with_psblas_incdir; pac_cv_psblas_incdir=$withval
else
pac_cv_psblas_incdir=''
fi
# Check whether --with-psblas-libdir was given.
if test "${with_psblas_libdir+set}" = set; then
withval=$with_psblas_libdir; pac_cv_psblas_libdir=$withval
else
pac_cv_psblas_libdir=''
fi
if test x"$pac_cv_psblas_incdir" == "x" ; then
pac_cv_psblas_incdir="$pac_cv_psblas_dir/include";
fi
if test x"$pac_cv_psblas_libdir" == "x" ; then
pac_cv_psblas_libdir="$pac_cv_psblas_dir/lib";
fi
PSBLAS_DIR="$pac_cv_psblas_dir"; PSBLAS_DIR="$pac_cv_psblas_dir";
PSBLAS_INCDIR="$pac_cv_psblas_incdir";
PSBLAS_LIBDIR="$pac_cv_psblas_libdir";
{ $as_echo "$as_me:$LINENO: checking for PSBLAS install dir" >&5 { $as_echo "$as_me:$LINENO: checking for PSBLAS install dir" >&5
$as_echo_n "checking for PSBLAS install dir... " >&6; } $as_echo_n "checking for PSBLAS install dir... " >&6; }
case $PSBLAS_DIR in case $PSBLAS_DIR in
@ -1938,7 +1969,7 @@ $as_echo "$as_me: error: Could not find PSBLAS build dir $PSBLAS_DIR!" >&2;}
fi fi
{ $as_echo "$as_me:$LINENO: result: $PSBLAS_DIR" >&5 { $as_echo "$as_me:$LINENO: result: $PSBLAS_DIR" >&5
$as_echo "$PSBLAS_DIR" >&6; } $as_echo "$PSBLAS_DIR" >&6; }
pac_cv_status_file="$PSBLAS_DIR/Make.inc" pac_cv_status_file="$PSBLAS_INCDIR/Make.inc.psblas"
if test ! -f "$pac_cv_status_file" ; then if test ! -f "$pac_cv_status_file" ; then
{ { $as_echo "$as_me:$LINENO: error: Could not find an installation in $PSBLAS_DIR." >&5 { { $as_echo "$as_me:$LINENO: error: Could not find an installation in $PSBLAS_DIR." >&5
$as_echo "$as_me: error: Could not find an installation in $PSBLAS_DIR." >&2;} $as_echo "$as_me: error: Could not find an installation in $PSBLAS_DIR." >&2;}
@ -7300,6 +7331,7 @@ rm -f conftest*
############################################################################### ###############################################################################
# the following files will be created by Automake # the following files will be created by Automake

@ -67,6 +67,8 @@ AC_MSG_NOTICE([
dnl NOTE : no spaces before the comma, and no brackets before the second argument! dnl NOTE : no spaces before the comma, and no brackets before the second argument!
PAC_ARG_WITH_PSBLAS PAC_ARG_WITH_PSBLAS
PSBLAS_DIR="$pac_cv_psblas_dir"; PSBLAS_DIR="$pac_cv_psblas_dir";
PSBLAS_INCDIR="$pac_cv_psblas_incdir";
PSBLAS_LIBDIR="$pac_cv_psblas_libdir";
AC_MSG_CHECKING([for PSBLAS install dir]) AC_MSG_CHECKING([for PSBLAS install dir])
case $PSBLAS_DIR in case $PSBLAS_DIR in
/*) ;; /*) ;;
@ -77,7 +79,7 @@ if test ! -d "$PSBLAS_DIR" ; then
AC_MSG_ERROR([Could not find PSBLAS build dir $PSBLAS_DIR!]) AC_MSG_ERROR([Could not find PSBLAS build dir $PSBLAS_DIR!])
fi fi
AC_MSG_RESULT([$PSBLAS_DIR]) AC_MSG_RESULT([$PSBLAS_DIR])
pac_cv_status_file="$PSBLAS_DIR/Make.inc" pac_cv_status_file="$PSBLAS_INCDIR/Make.inc.psblas"
if test ! -f "$pac_cv_status_file" ; then if test ! -f "$pac_cv_status_file" ; then
AC_MSG_ERROR([Could not find an installation in $PSBLAS_DIR.]) AC_MSG_ERROR([Could not find an installation in $PSBLAS_DIR.])
fi fi
@ -257,6 +259,7 @@ PAC_FORTRAN_HAVE_PSBLAS([AC_MSG_RESULT([yes.])],
# substituted. # substituted.
AC_SUBST(PSBLAS_DIR) AC_SUBST(PSBLAS_DIR)
AC_SUBST(PSBLAS_INCDIR)
AC_SUBST(INSTALL) AC_SUBST(INSTALL)
AC_SUBST(INSTALL_DATA) AC_SUBST(INSTALL_DATA)

@ -3,7 +3,7 @@ CSR ! Storage format CSR COO JAD
080 ! IDIM; domain size is idim**3 080 ! IDIM; domain size is idim**3
2 ! ISTOPC 2 ! ISTOPC
0100 ! ITMAX 0100 ! ITMAX
-1 ! ITRACE 1 ! ITRACE
30 ! IRST (restart for RGMRES and BiCGSTABL) 30 ! IRST (restart for RGMRES and BiCGSTABL)
1.d-6 ! EPS 1.d-6 ! EPS
3L-MUL-RAS-BJAC4-ILU ! Descriptive name for preconditioner (up to 40 chars) 3L-MUL-RAS-BJAC4-ILU ! Descriptive name for preconditioner (up to 40 chars)
@ -15,17 +15,17 @@ ILU ! Subdomain solver DSCALE ILU MILU ILUT UMF SLU
0 ! Level-set N for ILU(N), and P for ILUT 0 ! Level-set N for ILU(N), and P for ILUT
1.d-4 ! Threshold T for ILU(T,P) 1.d-4 ! Threshold T for ILU(T,P)
4 ! Smoother/Jacobi sweeps 4 ! Smoother/Jacobi sweeps
BJAC ! Smoother type JACOBI BJAC AS; ignored for non-ML AS ! Smoother type JACOBI BJAC AS; ignored for non-ML
3 ! Number of levels in a multilevel preconditioner 3 ! Number of levels in a multilevel preconditioner
SMOOTHED ! Kind of aggregation: SMOOTHED, NONSMOOTHED, MINENERGY SMOOTHED ! Kind of aggregation: SMOOTHED, NONSMOOTHED, MINENERGY
DEC ! Type of aggregation DEC SYMDEC GLB DEC ! Type of aggregation DEC SYMDEC GLB
MULT ! Type of multilevel correction: ADD MULT MULT ! Type of multilevel correction: ADD MULT
TWOSIDE ! Side of correction PRE POST TWOSIDE (ignored for ADD) TWOSIDE ! Side of correction PRE POST TWOSIDE (ignored for ADD)
REPL ! Coarse level: matrix distribution DIST REPL DIST ! Coarse level: matrix distribution DIST REPL
BJAC ! Coarse level: solver JACOBI BJAC UMF SLU SLUDIST BJAC ! Coarse level: solver JACOBI BJAC UMF SLU SLUDIST
ILU ! Coarse level: subsolver DSCALE ILU UMF SLU SLUDIST SLU ! Coarse level: subsolver DSCALE ILU UMF SLU SLUDIST
1 ! Coarse level: Level-set N for ILU(N) 1 ! Coarse level: Level-set N for ILU(N)
1.d-4 ! Coarse level: Threshold T for ILU(T,P) 1.d-4 ! Coarse level: Threshold T for ILU(T,P)
4 ! Coarse level: Number of Jacobi sweeps 4 ! Coarse level: Number of Jacobi sweeps
-0.10d0 ! Smoother Aggregation Threshold: >= 0.0 default if <0 -0.10d0 ! Smoother Aggregation Threshold: >= 0.0 default if <0
100 ! Coarse size limit to determine levels. If <0, then use NL 200 ! Coarse size limit to determine levels. If <0, then use NL

Loading…
Cancel
Save