Index: /issm/trunk-jpl/m4/issm_options.m4 =================================================================== --- /issm/trunk-jpl/m4/issm_options.m4 (revision 11873) +++ /issm/trunk-jpl/m4/issm_options.m4 (revision 11874) @@ -4,17 +4,17 @@ dnl ISSM's internal options - dnl Debugging {{{1 - AC_ARG_ENABLE([debugging],AS_HELP_STRING([--enable-debugging], - [turn debug support on]), - [enable_debugging=$enableval],[enable_debugging=no]) + dnl Debugging {{{ + AC_ARG_ENABLE([debugging], dnl feature + AS_HELP_STRING([--enable-debugging],[turn debug support on]), dnl help string + [enable_debugging=$enableval], dnl action if given + [enable_debugging=no]) dnl action if not given if test "x$enable_debugging" = xyes; then - AC_DEFINE([_ISSM_DEBUG_],[1],[Macro to enable debugging in ISSM.]) - fi - dnl }}} - dnl Serial build {{{1 + AC_DEFINE([_ISSM_DEBUG_],[1],[Macro to enable debugging in ISSM]) + fi + dnl }}} + dnl Serial build {{{ AC_ARG_WITH([serial], - AS_HELP_STRING([--with-serial = value], - [serial compilation. ]), - [SERIAL_VALUE=$withval],[SERIAL_VALUE="yes"]) + AS_HELP_STRING([--with-serial = value],[serial compilation. ]), + [SERIAL_VALUE=$withval],[SERIAL_VALUE="yes"]) AC_MSG_CHECKING(for serial compilation) AM_CONDITIONAL([NOSERIAL], [test $SERIAL_VALUE = no]) @@ -22,9 +22,8 @@ AC_MSG_RESULT($SERIAL_VALUE) dnl }}} - dnl Parallel build {{{1 + dnl Parallel build {{{ AC_ARG_WITH([parallel], - AS_HELP_STRING([--with-parallel = value], - [parallel compilation. ]), - [PARALLEL_VALUE=$withval],[PARALLEL_VALUE="yes"]) + AS_HELP_STRING([--with-parallel = value], [parallel compilation. ]), + [PARALLEL_VALUE=$withval],[PARALLEL_VALUE="yes"]) AC_MSG_CHECKING(for parallel compilation) AM_CONDITIONAL([NOPARALLEL], [test $PARALLEL_VALUE = no]) @@ -34,9 +33,9 @@ AC_SUBST([ISSMEXT]) dnl }}} - dnl Serial or Parallel check {{{1 + dnl Serial or Parallel check {{{ dnl Check that at least serial or parallel builds have been requested! if test "$SERIAL_VALUE" != "yes" ; then if test "$PARALLEL_VALUE" != "yes"; then - AC_MSG_ERROR([cannot request --with-serial=no and --with-parallel=no at the same time!]) + AC_MSG_ERROR([cannot request --with-serial=no and --with-parallel=no at the same time!]) fi fi @@ -44,7 +43,8 @@ dnl ISSM's externalpackages - dnl vendor{{{1 + dnl vendor{{{ AC_ARG_WITH([vendor], - AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]), [VENDOR=$withval],[VENDOR=""]) + AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]), + [VENDOR=$withval],[VENDOR=""]) AC_MSG_CHECKING(for vendor compilers) if test -n "$VENDOR"; then @@ -92,7 +92,6 @@ dnl 1. See if matlab has been provided AC_ARG_WITH([matlab-dir], - AS_HELP_STRING([--with-matlab-dir = DIR], - [matlab root directory. necessary for serial build.]), - [MATLAB_ROOT=$withval],[MATLAB_ROOT=""]) + AS_HELP_STRING([--with-matlab-dir = DIR], [matlab root directory. necessary for serial build.]), + [MATLAB_ROOT=$withval],[MATLAB_ROOT=""]) AC_MSG_CHECKING([wether Matlab is enabled]) @@ -219,7 +218,6 @@ AC_SUBST([MEXLINK]) fi - - dnl }}} - dnl triangle {{{1 + dnl }}} + dnl triangle {{{ AC_ARG_WITH([triangle-dir], AS_HELP_STRING([--with-triangle-dir = DIR], [triangle root directory. necessary for serial build]), @@ -262,8 +260,8 @@ AC_MSG_RESULT(ok) dnl }}} - dnl dakota{{{1 + dnl dakota{{{ AC_ARG_WITH([dakota-dir], - AS_HELP_STRING([--with-dakota-dir = DIR], [dakota root directory. necessary for serial build]), - [DAKOTA_ROOT=$withval],[DAKOTA_ROOT=""]) + AS_HELP_STRING([--with-dakota-dir = DIR], [dakota root directory. necessary for serial build]), + [DAKOTA_ROOT=$withval],[DAKOTA_ROOT=""]) AC_MSG_CHECKING(for Dakota) @@ -295,8 +293,8 @@ AC_MSG_RESULT($HAVE_DAKOTA) dnl }}} - dnl boost{{{1 + dnl boost{{{ AC_ARG_WITH([boost-dir], - AS_HELP_STRING([--with-boost-dir = DIR], [boost root directory.]), - [BOOST_ROOT=$withval],[BOOST_ROOT=""]) + AS_HELP_STRING([--with-boost-dir = DIR], [boost root directory.]), + [BOOST_ROOT=$withval],[BOOST_ROOT=""]) AC_MSG_CHECKING(for Boost) @@ -316,8 +314,8 @@ AC_MSG_RESULT($HAVE_BOOST) dnl }}} - dnl python{{{1 + dnl python{{{ AC_ARG_WITH([python-dir], - AS_HELP_STRING([--with-python-dir = DIR], [python root directory.]), - [PYTHON_ROOT=$withval],[PYTHON_ROOT=""]) + AS_HELP_STRING([--with-python-dir = DIR], [python root directory.]), + [PYTHON_ROOT=$withval],[PYTHON_ROOT=""]) AC_MSG_CHECKING(for Python) @@ -342,8 +340,8 @@ AC_MSG_RESULT($HAVE_PYTHON) dnl }}} - dnl python-numpy{{{1 + dnl python-numpy{{{ AC_ARG_WITH([python-numpy-dir], - AS_HELP_STRING([--with-python-numpy-dir = DIR], [python-numpy root directory.]), - [PYTHON_NUMPY_ROOT=$withval],[PYTHON_NUMPY_ROOT=""]) + AS_HELP_STRING([--with-python-numpy-dir = DIR], [python-numpy root directory.]), + [PYTHON_NUMPY_ROOT=$withval],[PYTHON_NUMPY_ROOT=""]) AC_MSG_CHECKING(for Python-Numpy) @@ -360,8 +358,8 @@ AC_MSG_RESULT($HAVE_PYTHON_NUMPY) dnl }}} - dnl chaco{{{1 + dnl chaco{{{ AC_ARG_WITH([chaco-dir], - AS_HELP_STRING([--with-chaco-dir = DIR], [chaco root directory.]), - [CHACO_ROOT=$withval],[CHACO_ROOT=""]) + AS_HELP_STRING([--with-chaco-dir = DIR], [chaco root directory.]), + [CHACO_ROOT=$withval],[CHACO_ROOT=""]) AC_MSG_CHECKING(for Chaco) @@ -382,8 +380,8 @@ AC_MSG_RESULT($HAVE_CHACO) dnl }}} - dnl scotch{{{1 + dnl scotch{{{ AC_ARG_WITH([scotch-dir], - AS_HELP_STRING([--with-scotch-dir = DIR], [scotch root directory.]), - [SCOTCH_ROOT=$withval],[SCOTCH_ROOT=""]) + AS_HELP_STRING([--with-scotch-dir = DIR], [scotch root directory.]), + [SCOTCH_ROOT=$withval],[SCOTCH_ROOT=""]) AC_MSG_CHECKING(for Scotch) @@ -395,5 +393,4 @@ SCOTCHLIB="-L$SCOTCH_ROOT/lib -lnfioscotch -lnfioscotcherr -lnfioscotcherrexit -lscotchmetis" - AC_DEFINE([_HAVE_SCOTCH_],[1],[with Scotch in ISSM src]) AC_SUBST([SCOTCHINCL]) @@ -405,8 +402,8 @@ AC_MSG_RESULT($HAVE_SCOTCH) dnl }}} - dnl adolc{{{1 + dnl adolc{{{ AC_ARG_WITH([adolc-dir], - AS_HELP_STRING([--with-adolc-dir = DIR], [adolc root directory.]), - [ADOLC_ROOT=$withval],[ADOLC_ROOT="no"]) + AS_HELP_STRING([--with-adolc-dir = DIR], [adolc root directory.]), + [ADOLC_ROOT=$withval],[ADOLC_ROOT="no"]) AC_MSG_CHECKING(for ADOLC) @@ -433,8 +430,8 @@ AC_MSG_RESULT($HAVE_ADOLC) dnl }}} - dnl adic2{{{1 + dnl adic2{{{ AC_ARG_WITH([adic2-dir], - AS_HELP_STRING([--with-adic2-dir = DIR], [adic2 root directory.]), - [ADIC2_ROOT=$withval],[ADIC2_ROOT="no"]) + AS_HELP_STRING([--with-adic2-dir = DIR], [adic2 root directory.]), + [ADIC2_ROOT=$withval],[ADIC2_ROOT="no"]) AC_MSG_CHECKING(for ADIC2) @@ -461,8 +458,8 @@ AC_MSG_RESULT($HAVE_ADIC2) dnl }}} - dnl gsl{{{1 + dnl gsl{{{ AC_ARG_WITH([gsl-dir], - AS_HELP_STRING([--with-gsl-dir = DIR], [gsl root directory.]), - [GSL_ROOT=$withval],[GSL_ROOT=""]) + AS_HELP_STRING([--with-gsl-dir = DIR], [gsl root directory.]), + [GSL_ROOT=$withval],[GSL_ROOT=""]) AC_MSG_CHECKING(for Gsl) @@ -484,8 +481,8 @@ AC_MSG_RESULT($HAVE_GSL) dnl }}} - dnl rose{{{1 + dnl rose{{{ AC_ARG_WITH([rose-dir], - AS_HELP_STRING([--with-rose-dir = DIR], [rose root directory.]), - [ROSE_ROOT=$withval],[ROSE_ROOT=""]) + AS_HELP_STRING([--with-rose-dir = DIR], [rose root directory.]), + [ROSE_ROOT=$withval],[ROSE_ROOT=""]) AC_MSG_CHECKING(for Rose) @@ -507,9 +504,8 @@ AC_MSG_RESULT($HAVE_ROSE) dnl }}} - dnl metis{{{1 + dnl metis{{{ AC_ARG_WITH([metis-dir], - AS_HELP_STRING([--with-metis-dir = DIR], - [metis root directory. necessary for serial build]), - [METIS_ROOT=$withval],[METIS_ROOT=""]) + AS_HELP_STRING([--with-metis-dir = DIR],[metis root directory. necessary for serial build]), + [METIS_ROOT=$withval],[METIS_ROOT=""]) if test -d "$METIS_ROOT"; then @@ -526,6 +522,5 @@ dnl defaults HAVE_METIS=yes - - + if test "$METIS_VERSION" = "4" ; then @@ -563,5 +558,4 @@ fi - AC_DEFINE([_HAVE_METIS_],[1],[with Metis in ISSM src]) AC_SUBST([METISINCL]) @@ -572,20 +566,18 @@ if test $HAVE_METIS = no; then - AC_MSG_ERROR([--with-metis-dir missing. Metis is needed to run ISSM]); - else - AC_MSG_RESULT($HAVE_METIS) - fi - dnl }}} - dnl mpi{{{1 + AC_MSG_ERROR([--with-metis-dir missing. Metis is needed to run ISSM]); + else + AC_MSG_RESULT($HAVE_METIS) + fi + dnl }}} + dnl mpi{{{ AC_MSG_CHECKING(for mpi) AC_ARG_WITH([mpi-lib], - AS_HELP_STRING([--with-mpi-lib = otions], - [mpi options, for ex: "-L$MPIROOT -lmpich]), - [MPILIB=$withval],[MPILIB=""]) + AS_HELP_STRING([--with-mpi-lib = otions],[mpi options, for ex: "-L$MPIROOT -lmpich]), + [MPILIB=$withval],[MPILIB=""]) AC_ARG_WITH([mpi-include], - AS_HELP_STRING([--with-mpi-include = DIR], - [mpi include directory, necessary for parallel build]), - [MPI_INCLUDE=$withval],[MPI_INCLUDE=""]) + AS_HELP_STRING([--with-mpi-include = DIR],[mpi include directory, necessary for parallel build]), + [MPI_INCLUDE=$withval],[MPI_INCLUDE=""]) if test -z "$MPILIB" ; then @@ -603,17 +595,9 @@ AC_MSG_RESULT(done) dnl }}} - dnl petsc{{{1 + dnl petsc{{{ AC_ARG_WITH([petsc-dir], - AS_HELP_STRING([--with-petsc-dir = DIR], - [petsc root directory, necessary for parallel build]), - [PETSC_ROOT=$withval],[PETSC_ROOT=""]) + AS_HELP_STRING([--with-petsc-dir = DIR],[petsc root directory, necessary for parallel build]), + [PETSC_ROOT=$withval],[PETSC_ROOT=""]) - dnl Used to be necessary, not anymore. - dnl if test "$PARALLEL_VALUE" = "yes" ; then - dnl if test "$PETSC_ROOT" = "" ; then - dnl AC_MSG_ERROR([missing --with-petsc-dir argument for parallel compilation!]) - dnl fi - dnl fi - if test -d "$PETSC_ROOT"; then AC_MSG_CHECKING(for petsc version) @@ -626,17 +610,8 @@ AC_ARG_WITH([petsc-arch], - AS_HELP_STRING([--with-petsc-arch = DIR], - [petsc arch , necessary for parallel build]), - [PETSC_ARCH=$withval],[PETSC_ARCH=""]) - - dnl Used to be necessary, not anymore. - dnl if test "$PARALLEL_VALUE" = "yes" ; then - dnl if test "$PETSC_ARCH" = "" ; then - dnl AC_MSG_ERROR([missing --with-petsc-arch argument for parallel compilation!]) - dnl fi - dnl fi - + AS_HELP_STRING([--with-petsc-arch = DIR],[petsc arch , necessary for parallel build]), + [PETSC_ARCH=$withval],[PETSC_ARCH=""]) + AC_MSG_CHECKING(for Petsc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH) - if test -d "$PETSC_ROOT"; then @@ -676,38 +651,29 @@ HAVE_PETSC=no fi - - dnl used to e necessary, not anymore. - dnl if test $HAVE_PETSC = no; then - dnl AC_MSG_ERROR([could not find petsc. user should specify --with-petsc-dir and --with-petsc-arch options. Petsc is needed to run ISSM!]) - dnl else - dnl AC_MSG_RESULT($HAVE_PETSC) - dnl fi AM_CONDITIONAL([PETSC], [test x$HAVE_PETSC = xyes]) AC_MSG_RESULT($HAVE_PETSC) dnl }}} - dnl tao{{{1 + dnl tao{{{ AC_ARG_WITH([tao-dir], - AS_HELP_STRING([--with-tao-dir = DIR], [tao root directory.]), - [TAO_ROOT=$withval],[TAO_ROOT=""]) - AC_MSG_CHECKING(for Tao) - - if test -d "$TAO_ROOT"; then - - dnl defaults - HAVE_TAO=yes - TAOINCL="-I$TAO_ROOT/ -I$TAO_ROOT/include -I$TAO_ROOT/bmake/ " - TAOLIB="-L$TAO_ROOT/lib -ltao -lpetsc" - - AC_DEFINE([_HAVE_TAO_],[1],[with Tao in ISSM src]) - AC_SUBST([TAOINCL]) - AC_SUBST([TAOLIB]) - - else + AS_HELP_STRING([--with-tao-dir = DIR], [tao root directory.]), + [TAO_ROOT=$withval],[TAO_ROOT=""]) + AC_MSG_CHECKING(for Tao) + + if test -d "$TAO_ROOT"; then + + HAVE_TAO=yes + TAOINCL="-I$TAO_ROOT/ -I$TAO_ROOT/include -I$TAO_ROOT/bmake/ " + TAOLIB="-L$TAO_ROOT/lib -ltao -lpetsc" + + AC_DEFINE([_HAVE_TAO_],[1],[with Tao in ISSM src]) + AC_SUBST([TAOINCL]) + AC_SUBST([TAOLIB]) + else HAVE_TAO=no - fi - AC_MSG_RESULT($HAVE_TAO) - dnl }}} - dnl mpiuni{{{1 + fi + AC_MSG_RESULT($HAVE_TAO) + dnl }}} + dnl mpiuni{{{ dnl when running in serial mode, MPI must be ignored, and set to internal petsc mpiuni: if test "$PARALLEL_VALUE" = "no" ; then @@ -732,15 +698,11 @@ fi dnl }}} - dnl slepc{{{1 + dnl slepc{{{ AC_ARG_WITH([slepc-dir], - AS_HELP_STRING([--with-slepc-dir = DIR], - [slepc root directory]), - [SLEPC_ROOT=$withval],[SLEPC_ROOT=""]) + AS_HELP_STRING([--with-slepc-dir = DIR],[slepc root directory]), + [SLEPC_ROOT=$withval],[SLEPC_ROOT=""]) AC_MSG_CHECKING(for Slepc headers and libraries in $SLEPC_ROOT) if test -d "$SLEPC_ROOT"; then - - - dnl defaults HAVE_SLEPC=yes SLEPCINCL=-I"$SLEPC_ROOT/include" @@ -755,14 +717,12 @@ AC_MSG_RESULT($HAVE_SLEPC) dnl }}} - dnl shapelib{{{1 + dnl shapelib{{{ AC_ARG_WITH([shapelib-dir], - AS_HELP_STRING([--with-shapelib-dir = DIR], - [shapelib root directory]), - [SHAPELIB_ROOT=$withval],[SHAPELIB_ROOT=""]) + AS_HELP_STRING([--with-shapelib-dir = DIR], [shapelib root directory]), + [SHAPELIB_ROOT=$withval],[SHAPELIB_ROOT=""]) AC_MSG_CHECKING(for Shapelib headers and libraries in $SHAPELIB_ROOT) if test -d "$SHAPELIB_ROOT"; then - dnl defaults HAVE_SHAPELIB=yes @@ -778,14 +738,12 @@ AC_MSG_RESULT($HAVE_SHAPELIB) dnl }}} - dnl scalapack{{{1 + dnl scalapack{{{ AC_ARG_WITH([scalapack-dir], - AS_HELP_STRING([--with-scalapack-dir = DIR], - [scalapack root directory]), - [SCALAPACK_ROOT=$withval],[SCALAPACK_ROOT=""]) + AS_HELP_STRING([--with-scalapack-dir = DIR],[scalapack root directory]), + [SCALAPACK_ROOT=$withval],[SCALAPACK_ROOT=""]) AC_MSG_CHECKING(for Scalapack headers and libraries in $SCALAPACK_ROOT) if test -d "$SCALAPACK_ROOT"; then - dnl defaults HAVE_SCALAPACK=yes @@ -799,13 +757,11 @@ AC_MSG_RESULT($HAVE_SCALAPACK) dnl }}} - dnl blas{{{1 + dnl blas{{{ AC_ARG_WITH([blas-lapack-dir], - AS_HELP_STRING([--with-blas-lapack-dir = DIR], - [blas-lapack root directory]), - [BLASLAPACK_ROOT=$withval],[BLASLAPACK_ROOT=""]) + AS_HELP_STRING([--with-blas-lapack-dir = DIR],[blas-lapack root directory]), + [BLASLAPACK_ROOT=$withval],[BLASLAPACK_ROOT=""]) AC_MSG_CHECKING(for Blas and Lapack headers and libraries in $BLASLAPACK_ROOT) if test -d "$BLASLAPACK_ROOT"; then - dnl defaults @@ -825,6 +781,4 @@ ;; esac - - AC_DEFINE([_HAVE_BLASLAPACK_],[1],[with blas lapack in ISSM src]) @@ -836,9 +790,8 @@ AC_MSG_RESULT($HAVE_BLASLAPACK) dnl }}} - dnl mkl{{{1 + dnl mkl{{{ AC_ARG_WITH([mkl-dir], - AS_HELP_STRING([--with-mkl-dir = DIR], - [mkl root directory]), - [MKL_ROOT=$withval],[MKL_ROOT=""]) + AS_HELP_STRING([--with-mkl-dir = DIR],[mkl root directory]), + [MKL_ROOT=$withval],[MKL_ROOT=""]) AC_MSG_CHECKING(for mkl headers and libraries in $MKL_ROOT) @@ -857,9 +810,8 @@ AC_MSG_RESULT($HAVE_MKL) dnl }}} - dnl plapack{{{1 + dnl plapack{{{ AC_ARG_WITH([plapack-lib], - AS_HELP_STRING([--with-plapack-lib = lib], - [plapack library]), - [PLAPACK_LIB=$withval],[PLAPACK_LIB=""]) + AS_HELP_STRING([--with-plapack-lib = lib],[plapack library]), + [PLAPACK_LIB=$withval],[PLAPACK_LIB=""]) AC_MSG_CHECKING(for Plapack libraries) @@ -889,11 +841,8 @@ AC_MSG_RESULT($HAVE_PLAPACK) dnl }}} - dnl mumps{{{1 - - dnl Mumps directory + dnl mumps{{{ AC_ARG_WITH([mumps-dir], - AS_HELP_STRING([--with-mumps-dir = DIR], - [mumps root directory]), - [MUMPS_ROOT=$withval],[MUMPS_ROOT=""]) + AS_HELP_STRING([--with-mumps-dir = DIR],[mumps root directory]), + [MUMPS_ROOT=$withval],[MUMPS_ROOT=""]) AC_MSG_CHECKING(for Mumps headers and libraries in $MUMPS_ROOT) @@ -917,8 +866,7 @@ AC_MSG_RESULT($HAVE_MUMPS) dnl }}} - dnl blacs{{{1 + dnl blacs{{{ AC_ARG_WITH([blacs-dir], - AS_HELP_STRING([--with-blacs-dir = DIR], - [blacs root directory]), + AS_HELP_STRING([--with-blacs-dir = DIR],[blacs root directory]), [BLACS_ROOT=$withval],[BLACS_ROOT=""]) @@ -939,8 +887,7 @@ AC_MSG_RESULT($HAVE_BLACS) dnl }}} - dnl hypre{{{1 + dnl hypre{{{ AC_ARG_WITH([hypre-dir], - AS_HELP_STRING([--with-hypre-dir = DIR], - [hypre root directory]), + AS_HELP_STRING([--with-hypre-dir = DIR],[hypre root directory]), [HYPRE_ROOT=$withval],[HYPRE_ROOT=""]) @@ -961,8 +908,7 @@ AC_MSG_RESULT($HAVE_HYPRE) dnl }}} - dnl ml{{{1 + dnl ml{{{ AC_ARG_WITH([ml-dir], - AS_HELP_STRING([--with-ml-dir = DIR], - [ml root directory]), + AS_HELP_STRING([--with-ml-dir = DIR],[ml root directory]), [ML_ROOT=$withval],[ML_ROOT=""]) @@ -983,10 +929,9 @@ AC_MSG_RESULT($HAVE_ML) dnl }}} - dnl math{{{1 + dnl math{{{ AC_MSG_CHECKING(for math library) AC_ARG_WITH([math-lib], - AS_HELP_STRING([--with-math-lib = otions], - [math options, for ex: "/usr/lib/libm.a]), - [MATH_LIB=$withval],[MATH_LIB=""]) + AS_HELP_STRING([--with-math-lib = otions],[math options, for ex: "/usr/lib/libm.a]), + [MATH_LIB=$withval],[MATH_LIB=""]) dnl check that --with-math-lib may have been provided @@ -1000,11 +945,10 @@ AC_MSG_RESULT(done) dnl }}} - dnl fortran{{{1 + dnl fortran{{{ dnl fortran library option AC_MSG_CHECKING(for fortran library) AC_ARG_WITH([fortran-lib], - AS_HELP_STRING([--with-fortran-lib = options], - [fortran options, for ex: "/usr/lib/gfortran.a]), - [FORTRAN_LIB=$withval],[FORTRAN_LIB=""]) + AS_HELP_STRING([--with-fortran-lib = options],[fortran options, for ex: "/usr/lib/gfortran.a]), + [FORTRAN_LIB=$withval],[FORTRAN_LIB=""]) dnl check that --with-fortran-lib may have been provided @@ -1018,10 +962,9 @@ AC_MSG_RESULT(done) dnl }}} - dnl graphics{{{1 + dnl graphics{{{ AC_MSG_CHECKING(for graphics library) AC_ARG_WITH([graphics-lib], - AS_HELP_STRING([--with-graphics-lib = options], - [graphics options, for ex: "/usr/X11/lib/libX11.a]), - [GRAPHICS_LIB=$withval],[GRAPHICS_LIB=""]) + AS_HELP_STRING([--with-graphics-lib = options],[graphics options, for ex: "/usr/X11/lib/libX11.a]), + [GRAPHICS_LIB=$withval],[GRAPHICS_LIB=""]) dnl check that --with-graphics-lib may have been provided @@ -1035,6 +978,8 @@ AC_MSG_RESULT(done) dnl }}} - dnl with-steadystate{{{1 - AC_ARG_WITH([steadystate],AS_HELP_STRING([--with-steadystate = YES], [compile with steadystate capabilities (default is yes)]),[STEADYSTATE=$withval],[STEADYSTATE=yes]) + dnl with-steadystate{{{ + AC_ARG_WITH([steadystate], + AS_HELP_STRING([--with-steadystate = YES],[compile with steadystate capabilities (default is yes)]), + [STEADYSTATE=$withval],[STEADYSTATE=yes]) AC_MSG_CHECKING(for steadystate capability compilation) @@ -1051,6 +996,8 @@ AC_MSG_RESULT($HAVE_STEADYSTATE) dnl }}} - dnl with-transient{{{1 - AC_ARG_WITH([transient],AS_HELP_STRING([--with-transient = YES], [compile with transient capabilities (default is yes)]),[TRANSIENT=$withval],[TRANSIENT=yes]) + dnl with-transient{{{ + AC_ARG_WITH([transient], + AS_HELP_STRING([--with-transient = YES], [compile with transient capabilities (default is yes)]), + [TRANSIENT=$withval],[TRANSIENT=yes]) AC_MSG_CHECKING(for transient capability compilation) @@ -1067,6 +1014,8 @@ AC_MSG_RESULT($HAVE_TRANSIENT) dnl }}} - dnl with-thermal{{{1 - AC_ARG_WITH([thermal],AS_HELP_STRING([--with-thermal = YES], [compile with thermal capabilities (default is yes)]),[THERMAL=$withval],[THERMAL=yes]) + dnl with-thermal{{{ + AC_ARG_WITH([thermal], + AS_HELP_STRING([--with-thermal = YES], [compile with thermal capabilities (default is yes)]), + [THERMAL=$withval],[THERMAL=yes]) AC_MSG_CHECKING(for thermal capability compilation) @@ -1083,6 +1032,8 @@ AC_MSG_RESULT($HAVE_THERMAL) dnl }}} - dnl with-prognostic{{{1 - AC_ARG_WITH([prognostic],AS_HELP_STRING([--with-prognostic = YES], [compile with prognostic capabilities (default is yes)]),[PROGNOSTIC=$withval],[PROGNOSTIC=yes]) + dnl with-prognostic{{{ + AC_ARG_WITH([prognostic], + AS_HELP_STRING([--with-prognostic = YES], [compile with prognostic capabilities (default is yes)]), + [PROGNOSTIC=$withval],[PROGNOSTIC=yes]) AC_MSG_CHECKING(for prognostic capability compilation) @@ -1099,6 +1050,8 @@ AC_MSG_RESULT($HAVE_PROGNOSTIC) dnl }}} - dnl with-control{{{1 - AC_ARG_WITH([control],AS_HELP_STRING([--with-control = YES], [compile with control capabilities (default is yes)]),[CONTROL=$withval],[CONTROL=yes]) + dnl with-control{{{ + AC_ARG_WITH([control], + AS_HELP_STRING([--with-control = YES], [compile with control capabilities (default is yes)]), + [CONTROL=$withval],[CONTROL=yes]) AC_MSG_CHECKING(for control capability compilation) @@ -1115,6 +1068,8 @@ AC_MSG_RESULT($HAVE_CONTROL) dnl }}} - dnl with-hydrology{{{1 - AC_ARG_WITH([hydrology],AS_HELP_STRING([--with-hydrology = YES], [compile with hydrology capabilities (default is yes)]),[HYDROLOGY=$withval],[HYDROLOGY=yes]) + dnl with-hydrology{{{ + AC_ARG_WITH([hydrology], + AS_HELP_STRING([--with-hydrology = YES], [compile with hydrology capabilities (default is yes)]), + [HYDROLOGY=$withval],[HYDROLOGY=yes]) AC_MSG_CHECKING(for hydrology capability compilation) @@ -1131,6 +1086,8 @@ AC_MSG_RESULT($HAVE_HYDROLOGY) dnl }}} - dnl with-diagnostic{{{1 - AC_ARG_WITH([diagnostic],AS_HELP_STRING([--with-diagnostic = YES], [compile with diagnostic capabilities (default is yes)]),[DIAGNOSTIC=$withval],[DIAGNOSTIC=yes]) + dnl with-diagnostic{{{ + AC_ARG_WITH([diagnostic], + AS_HELP_STRING([--with-diagnostic = YES], [compile with diagnostic capabilities (default is yes)]), + [DIAGNOSTIC=$withval],[DIAGNOSTIC=yes]) AC_MSG_CHECKING(for diagnostic capability compilation) @@ -1147,6 +1104,8 @@ AC_MSG_RESULT($HAVE_DIAGNOSTIC) dnl }}} - dnl with-balanced{{{1 - AC_ARG_WITH([balanced],AS_HELP_STRING([--with-balanced = YES], [compile with balanced capabilities (default is yes)]),[BALANCED=$withval],[BALANCED=yes]) + dnl with-balanced{{{ + AC_ARG_WITH([balanced], + AS_HELP_STRING([--with-balanced = YES], [compile with balanced capabilities (default is yes)]), + [BALANCED=$withval],[BALANCED=yes]) AC_MSG_CHECKING(for balanced capability compilation) @@ -1163,6 +1122,8 @@ AC_MSG_RESULT($HAVE_BALANCED) dnl }}} - dnl with-responses{{{1 - AC_ARG_WITH([responses],AS_HELP_STRING([--with-responses = YES], [compile with responses capabilities (default is yes)]),[RESPONSES=$withval],[RESPONSES=yes]) + dnl with-responses{{{ + AC_ARG_WITH([responses], + AS_HELP_STRING([--with-responses = YES], [compile with responses capabilities (default is yes)]), + [RESPONSES=$withval],[RESPONSES=yes]) AC_MSG_CHECKING(for responses capability compilation) @@ -1179,6 +1140,8 @@ AC_MSG_RESULT($HAVE_RESPONSES) dnl }}} - dnl with-slope{{{1 - AC_ARG_WITH([slope],AS_HELP_STRING([--with-slope = YES], [compile with slope capabilities (default is yes)]),[SLOPE=$withval],[SLOPE=yes]) + dnl with-slope{{{ + AC_ARG_WITH([slope], + AS_HELP_STRING([--with-slope = YES], [compile with slope capabilities (default is yes)]), + [SLOPE=$withval],[SLOPE=yes]) AC_MSG_CHECKING(for slope capability compilation) @@ -1195,6 +1158,8 @@ AC_MSG_RESULT($HAVE_SLOPE) dnl }}} - dnl with-groundingline{{{1 - AC_ARG_WITH([groundingline],AS_HELP_STRING([--with-groundingline = YES], [compile with groundingline capabilities (default is yes)]),[GROUNDINGLINE=$withval],[GROUNDINGLINE=yes]) + dnl with-groundingline{{{ + AC_ARG_WITH([groundingline], + AS_HELP_STRING([--with-groundingline = YES], [compile with groundingline capabilities (default is yes)]), + [GROUNDINGLINE=$withval],[GROUNDINGLINE=yes]) AC_MSG_CHECKING(for groundingline capability compilation) @@ -1211,6 +1176,8 @@ AC_MSG_RESULT($HAVE_GROUNDINGLINE) dnl }}} - dnl with-rifts{{{1 - AC_ARG_WITH([rifts],AS_HELP_STRING([--with-rifts = YES], [compile with rifts capabilities (default is yes)]),[RIFTS=$withval],[RIFTS=yes]) + dnl with-rifts{{{ + AC_ARG_WITH([rifts], + AS_HELP_STRING([--with-rifts = YES], [compile with rifts capabilities (default is yes)]), + [RIFTS=$withval],[RIFTS=yes]) AC_MSG_CHECKING(for rifts capability compilation) @@ -1227,6 +1194,8 @@ AC_MSG_RESULT($HAVE_RIFTS) dnl }}} - dnl with-3d{{{1 - AC_ARG_WITH([3d],AS_HELP_STRING([--with-3d = YES], [compile with 3d capabilities (default is yes)]),[THREED=$withval],[THREED=yes]) + dnl with-3d{{{ + AC_ARG_WITH([3d], + AS_HELP_STRING([--with-3d = YES], [compile with 3d capabilities (default is yes)]), + [THREED=$withval],[THREED=yes]) AC_MSG_CHECKING(for 3d capability compilation) @@ -1234,14 +1203,14 @@ dnl defaults - HAVE_THREED=yes - - AC_DEFINE([_HAVE_THREED_],[1],[with 3d capability]) - else - HAVE_THREED=no - fi - AM_CONDITIONAL([THREED], [test x$HAVE_THREED = xyes]) - AC_MSG_RESULT($HAVE_THREED) - dnl }}} - dnl checks{{{1 + HAVE_3D=yes + + AC_DEFINE([_HAVE_3D_],[1],[with 3d capability]) + else + HAVE_3D=no + fi + AM_CONDITIONAL([THREED], [test x$HAVE_3D = xyes]) + AC_MSG_RESULT($HAVE_3D) + dnl }}} + dnl checks{{{ AC_MSG_CHECKING(checking consistency between all libraries) @@ -1269,9 +1238,9 @@ dnl other options - dnl optimization{{{1 + dnl optimization{{{ dnl bypass standard optimization -g -O2 ? AC_ARG_WITH([cxxoptflags], - AS_HELP_STRING([--with-cxxoptflags = CXXOPTFLAGS], [optimization using CXX flags, ex: --with-cxxoptflags=-march=opteron -O3]), - [CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2"]) + AS_HELP_STRING([--with-cxxoptflags = CXXOPTFLAGS], [optimization using CXX flags, ex: --with-cxxoptflags=-march=opteron -O3]), + [CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2"]) AC_MSG_CHECKING(for C++ optimization flags) AC_SUBST([CXXOPTFLAGS]) @@ -1279,9 +1248,8 @@ dnl }}} - dnl multithreading{{{1 + dnl multithreading{{{ AC_ARG_WITH([numthreads], - AS_HELP_STRING([--with-numthreads = NUMTHREADS_VALUE], - [numthreads, default is 1. ]), - [NUMTHREADS_VALUE=$withval],[NUMTHREADS_VALUE=1]) + AS_HELP_STRING([--with-numthreads = NUMTHREADS_VALUE],[numthreads, default is 1. ]), + [NUMTHREADS_VALUE=$withval],[NUMTHREADS_VALUE=1]) AC_MSG_CHECKING(for number of threads) dnl defaults @@ -1309,10 +1277,9 @@ AC_MSG_RESULT($NUMTHREADS_VALUE) dnl }}} - dnl 64bit {{{1 + dnl 64bit {{{ AC_ARG_WITH([64bit-indices], - AS_HELP_STRING([--with-64bit-indices = bool], [use 64 bit integers, default 0, ex: --with-64bit-indices=1]), - [USE_64BIT_INDICES=$withval],[USE_64BIT_INDICES=0]) + AS_HELP_STRING([--with-64bit-indices = bool], [use 64 bit integers, default 0, ex: --with-64bit-indices=1]), + [USE_64BIT_INDICES=$withval],[USE_64BIT_INDICES=0]) AC_MSG_CHECKING(for 64 bit indices) - if test "$USE_64BIT_INDICES" == "1"; then @@ -1323,4 +1290,3 @@ AC_MSG_RESULT($USE_64BIT_INDICES) dnl }}} - ]) Index: /issm/trunk-jpl/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 11873) +++ /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 11874) @@ -230,5 +230,5 @@ dataset->AddObject(triavertexinput);} break; - #ifdef _HAVE_THREED_ + #ifdef _HAVE_3D_ case PentaP1InputEnum:{ PentaP1Input* pentavertexinput=NULL; @@ -264,5 +264,5 @@ dataset->AddObject(triavertexelementresult);} break; - #ifdef _HAVE_THREED_ + #ifdef _HAVE_3D_ case PentaP1ElementResultEnum:{ PentaP1ElementResult* pentavertexelementresult=NULL; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 11873) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 11874) @@ -46,5 +46,5 @@ /*Fetch data needed: */ iomodel->FetchData(4,MeshElementsEnum,MeshElementconnectivityEnum,MaterialsRheologyBEnum,MaterialsRheologyNEnum); - #ifdef _HAVE_THREED_ + #ifdef _HAVE_3D_ if(dim==3)iomodel->FetchData(2,MeshUpperelementsEnum,MeshLowerelementsEnum); #endif @@ -57,5 +57,5 @@ /*Create and add tria element to elements dataset: */ if(dim==2) elements->AddObject(new Tria(i+1,i,i,iomodel,nummodels)); - #ifdef _HAVE_THREED_ + #ifdef _HAVE_3D_ else elements->AddObject(new Penta(i+1,i,i,iomodel,nummodels)); #endif Index: /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 11873) +++ /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 11874) @@ -458,5 +458,5 @@ case MacAyeal2dIceFrontEnum: return CreatePVectorDiagnosticMacAyeal2d(); - #ifdef _HAVE_THREED_ + #ifdef _HAVE_3D_ case MacAyeal3dIceFrontEnum: return CreatePVectorDiagnosticMacAyeal3d(); @@ -563,5 +563,5 @@ /*}}}*/ #endif -#ifdef _HAVE_THREED_ +#ifdef _HAVE_3D_ /*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{1*/ ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal3d(void){ Index: /issm/trunk-jpl/src/c/objects/Loads/Icefront.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 11873) +++ /issm/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 11874) @@ -93,5 +93,5 @@ ElementVector* CreatePVectorDiagnosticMacAyeal2d(void); #endif - #ifdef _HAVE_THREED_ + #ifdef _HAVE_3D_ ElementVector* CreatePVectorDiagnosticMacAyeal3d(void); ElementVector* CreatePVectorDiagnosticPattyn(void); Index: /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 11873) +++ /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 11874) @@ -778,5 +778,5 @@ /*if 3d*/ - #ifdef _HAVE_THREED_ + #ifdef _HAVE_3D_ else if(dim==3){