Changeset 17240

Timestamp:

02/07/14 15:58:49 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing some missing analyses (conditional)

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (2 diffs)
• src/c/Makefile.am (modified) (2 diffs)
• src/c/analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -1669 +1669 @@
         AC_MSG_RESULT($HAVE_BALANCEVELOCITY)
         dnl }}}
+        dnl with-L2ProjectionEPL{{{
+        AC_ARG_WITH([L2ProjectionEPL],
+                AS_HELP_STRING([--with-L2ProjectionEPL = YES], [compile with L2ProjectionEPL capabilities (default is yes)]),
+                [L2PROJECTIONEPL=$withval],[L2PROJECTIONEPL=yes]) 
+        AC_MSG_CHECKING(for L2ProjectionEPL capability compilation)
+
+        HAVE_L2PROJECTIONEPL=no
+        if test "x$L2PROJECTIONEPL" = "xyes"; then
+                HAVE_L2PROJECTIONEPL=yes
+                AC_DEFINE([_HAVE_L2PROJECTIONEPL_],[1],[with L2ProjectionEPL capability])
+        fi
+        AM_CONDITIONAL([L2PROJECTIONEPL], [test x$HAVE_L2PROJECTIONEPL = xyes])
+        AC_MSG_RESULT($HAVE_L2PROJECTIONEPL)
+        dnl }}}
         dnl with-L2ProjectionBase{{{
         AC_ARG_WITH([L2ProjectionBase],
@@ -1892 +1906 @@
         AM_CONDITIONAL([THERMAL], [test x$HAVE_THERMAL = xyes])
         AC_MSG_RESULT($HAVE_THERMAL)
+        dnl }}}
+        dnl with-SmoothedSurfaceSlopeX{{{
+        AC_ARG_WITH([SmoothedSurfaceSlopeX],
+                AS_HELP_STRING([--with-SmoothedSurfaceSlopeX = YES], [compile with SmoothedSurfaceSlopeX capabilities (default is yes)]),
+                [SMOOTHEDSURFACESLOPEX=$withval],[SMOOTHEDSURFACESLOPEX=yes]) 
+        AC_MSG_CHECKING(for SmoothedSurfaceSlopeX capability compilation)
+
+        HAVE_SMOOTHEDSURFACESLOPEX=no
+        if test "x$SMOOTHEDSURFACESLOPEX" = "xyes"; then
+                HAVE_SMOOTHEDSURFACESLOPEX=yes
+                AC_DEFINE([_HAVE_SMOOTHEDSURFACESLOPEX_],[1],[with SmoothedSurfaceSlopeX capability])
+        fi
+        AM_CONDITIONAL([SMOOTHEDSURFACESLOPEX], [test x$HAVE_SMOOTHEDSURFACESLOPEX = xyes])
+        AC_MSG_RESULT($HAVE_SMOOTHEDSURFACESLOPEX)
+        dnl }}}
+        dnl with-SmoothedSurfaceSlopeY{{{
+        AC_ARG_WITH([SmoothedSurfaceSlopeY],
+                AS_HELP_STRING([--with-SmoothedSurfaceSlopeY = YES], [compile with SmoothedSurfaceSlopeY capabilities (default is yes)]),
+                [SMOOTHEDSURFACESLOPEY=$withval],[SMOOTHEDSURFACESLOPEY=yes]) 
+        AC_MSG_CHECKING(for SmoothedSurfaceSlopeY capability compilation)
+
+        HAVE_SMOOTHEDSURFACESLOPEY=no
+        if test "x$SMOOTHEDSURFACESLOPEY" = "xyes"; then
+                HAVE_SMOOTHEDSURFACESLOPEY=yes
+                AC_DEFINE([_HAVE_SMOOTHEDSURFACESLOPEY_],[1],[with SmoothedSurfaceSlopeY capability])
+        fi
+        AM_CONDITIONAL([SMOOTHEDSURFACESLOPEY], [test x$HAVE_SMOOTHEDSURFACESLOPEY = xyes])
+        AC_MSG_RESULT($HAVE_SMOOTHEDSURFACESLOPEY)
         dnl }}}
         dnl with-Meshdeformation{{{

issm/trunk-jpl/src/c/Makefile.am

@@ -542 +542 @@
 issm_sources += ./analyses/HydrologyDCEfficientAnalysis.cpp
 endif
+if L2PROJECTIONEPL
+issm_sources += ./analyses/L2ProjectionEPLAnalysis.cpp
+endif
 if MELTING
 issm_sources += ./analyses/MeltingAnalysis.cpp
@@ -562 +565 @@
 if THERMAL
 issm_sources += ./analyses/ThermalAnalysis.cpp
+endif
+if SMOOTHEDSURFACESLOPEX
+issm_sources += ./analyses/SmoothedSurfaceSlopeXAnalysis.cpp
+endif
+if SMOOTHEDSURFACESLOPEY
+issm_sources += ./analyses/SmoothedSurfaceSlopeYAnalysis.cpp
 endif
 if MESHDEFORMATION

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -802 +802 @@
 
         /*Create Riffront loads for rifts: */
-#ifdef _HAVE_RIFTS_
         if(numrifts){
                 iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsRiftstructEnum);
@@ -815 +814 @@
                 xDelete<IssmDouble>(riftinfo);
         }
-#endif
 }/*}}}*/