Changeset 9768

Timestamp:

09/12/11 10:05:03 (14 years ago)

Author:

Eric.Larour

Message:

Extensive changes to issm options.
For automatic differentiation, the code needs to be compiled according
to functionalities. Therefore, added following flags (more to come):

--with-control
--with-diagnostic
--with-thermal
--with-balanced
--with-dakota

Code should compile seamlessly without these options. But for ex, one can
specify:
--without-dakota, which will strip all code from dakota related functionalities.

File:

• issm/trunk/m4/issm_options.m4 (modified) (5 diffs)

issm/trunk/m4/issm_options.m4

@@ -174 +174 @@
                 HAVE_DAKOTA=yes
                 DAKOTAINCL=-I$DAKOTA_ROOT/include
+                DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs -levidence -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -lopt -lpsuade -lnewmat -lncsuopt -lgsl -lquadrature -lcoliny -lcolin -lpebbl -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver"
                 dnl DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs -levidence -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -lopt -lpsuade -lnewmat -lncsuopt -lgsl -lgslcblas -lquadrature -lcoliny -lcolin -lpebbl -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver"
-                DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs -levidence -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -lopt -lpsuade -lnewmat -lncsuopt -lgsl -lquadrature -lcoliny -lcolin -lpebbl -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver "
-
                 AC_DEFINE([_HAVE_DAKOTA_],[1],[with Dakota in ISSM src])
                 AC_SUBST([DAKOTAINCL])
@@ -184 +183 @@
                 HAVE_DAKOTA=no
         fi
+        AM_CONDITIONAL([DAKOTA], [test x$HAVE_DAKOTA = xyes])
         AC_MSG_RESULT($HAVE_DAKOTA)
         dnl }}}
@@ -230 +230 @@
         fi
         AC_MSG_RESULT($HAVE_SCOTCH)
+        dnl }}}
+        dnl adic{{{1
+        AC_ARG_WITH([adic-dir],
+                          AS_HELP_STRING([--with-adic-dir = DIR], [adic root directory.]),
+                         [ADIC_ROOT=$withval],[ADIC_ROOT=""]) 
+        AC_MSG_CHECKING(for Scotch)
+        
+        if test -d "$ADIC_ROOT"; then
+
+                dnl defaults
+                HAVE_ADIC=yes
+                ADICINCL="-DADIC_DENSE -I$ADIC_ROOT/include -I$ADIC_ROOT/share/runtime_dense/"
+                ADICLIB=""
+
+                AC_DEFINE([_HAVE_ADIC_],[1],[with Scotch in ISSM src])
+                AC_SUBST([ADICINCL])
+                AC_SUBST([ADICLIB])
+
+        else
+                HAVE_ADIC=no
+        fi
+        AM_CONDITIONAL([AD], [test x$HAVE_ADIC = xyes])
+        AC_MSG_RESULT($HAVE_ADIC)
         dnl }}}
         dnl metis{{{1
@@ -719 +742 @@
         dnl vendor{{{1
         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
@@ -741 +763 @@
         fi
         AC_MSG_RESULT(done)
+        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]) 
+        AC_MSG_CHECKING(for thermal capability compilation)
+
+        if test "x$THERMAL" = "xyes"; then
+
+                dnl defaults
+                HAVE_THERMAL=yes
+
+                AC_DEFINE([_HAVE_THERMAL_],[1],[with thermal capability])
+        else
+                HAVE_THERMAL=no
+        fi
+        AM_CONDITIONAL([THERMAL], [test x$HAVE_THERMAL = xyes])
+        AC_MSG_RESULT($HAVE_THERMAL)
+        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]) 
+        AC_MSG_CHECKING(for control capability compilation)
+
+        if test "x$CONTROL" = "xyes"; then
+
+                dnl defaults
+                HAVE_CONTROL=yes
+
+                AC_DEFINE([_HAVE_CONTROL_],[1],[with control capability])
+        else
+                HAVE_CONTROL=no
+        fi
+        AM_CONDITIONAL([CONTROL], [test x$HAVE_CONTROL = xyes])
+        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]) 
+        AC_MSG_CHECKING(for hydrology capability compilation)
+
+        if test "x$HYDROLOGY" = "xyes"; then
+
+                dnl defaults
+                HAVE_HYDROLOGY=yes
+
+                AC_DEFINE([_HAVE_HYDROLOGY_],[1],[with hydrology capability])
+        else
+                HAVE_HYDROLOGY=no
+        fi
+        AM_CONDITIONAL([HYDROLOGY], [test x$HAVE_HYDROLOGY = xyes])
+        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]) 
+        AC_MSG_CHECKING(for diagnostic capability compilation)
+
+        if test "x$DIAGNOSTIC" = "xyes"; then
+
+                dnl defaults
+                HAVE_DIAGNOSTIC=yes
+
+                AC_DEFINE([_HAVE_DIAGNOSTIC_],[1],[with diagnostic capability])
+        else
+                HAVE_DIAGNOSTIC=no
+        fi
+        AM_CONDITIONAL([DIAGNOSTIC], [test x$HAVE_DIAGNOSTIC = xyes])
+        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]) 
+        AC_MSG_CHECKING(for balanced capability compilation)
+
+        if test "x$BALANCED" = "xyes"; then
+
+                dnl defaults
+                HAVE_BALANCED=yes
+
+                AC_DEFINE([_HAVE_BALANCED_],[1],[with balanced capability])
+        else
+                HAVE_BALANCED=no
+        fi
+        AM_CONDITIONAL([BALANCED], [test x$HAVE_BALANCED = xyes])
+        AC_MSG_RESULT($HAVE_BALANCED)
         dnl }}}