Changeset 17305

Timestamp:

02/19/14 10:14:05 (11 years ago)

Author:

jbondzio

Message:

ADD: shell for levelset function reinitialization analysis

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)
• src/c/analyses/EnumToAnalysis.cpp (modified) (1 diff)
• src/c/analyses/LsfReinitializationAnalysis.cpp (added)
• src/c/analyses/LsfReinitializationAnalysis.h (added)
• src/c/analyses/analyses.h (modified) (1 diff)
• src/c/cores/AnalysisConfiguration.cpp (modified) (2 diffs)
• src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (4 diffs)
• src/m/enum/EnumDefinitions.py (modified) (1 diff)
• src/m/enum/LsfReinitializationAnalysisEnum.m (added)

issm/trunk-jpl/m4/issm_options.m4

@@ -1977 +1977 @@
         AC_MSG_RESULT($HAVE_EXTRAPOLATION)
         dnl }}}
+        dnl with-LsfReinitialization{{{
+        AC_ARG_WITH([LsfReinitialization],
+                AS_HELP_STRING([--with-LsfReinitialization = YES], [compile with LsfReinitialization capabilities (default is yes)]),
+                [LSFREINITIALIZATION=$withval],[LSFREINITIALIZATION=yes]) 
+        AC_MSG_CHECKING(for LsfReinitialization capability compilation)
+
+        HAVE_LSFREINITIALIZATION=no
+        if test "x$LSFREINITIALIZATION" = "xyes"; then
+                HAVE_LSFREINITIALIZATION=yes
+                AC_DEFINE([_HAVE_LSFREINITIALIZATION_],[1],[with LsfReinitialization capability])
+        fi
+        AM_CONDITIONAL([LSFREINITIALIZATION], [test x$HAVE_LSFREINITIALIZATION = xyes])
+        AC_MSG_RESULT($HAVE_LSFREINITIALIZATION)
+        dnl }}}
 
         dnl Platform specifics

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

@@ -583 +583 @@
 issm_sources += ./analyses/ExtrapolationAnalysis.cpp
 endif
+if LSFREINITIALIZATION
+issm_sources += ./analyses/LsfReinitializationAnalysis.cpp
+endif
 #}}}
 #Gia sources  {{{

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

@@ -98 +98 @@
                 case ExtrapolationAnalysisEnum : return new ExtrapolationAnalysis();
                 #endif
+                #ifdef _HAVE_LSFREINITIALIZATION_
+                case LsfReinitializationAnalysisEnum : return new LsfReinitializationAnalysis();
+                #endif
                 default : _error_("enum provided not supported ("<<EnumToStringx(analysis_enum)<<")");
         }

issm/trunk-jpl/src/c/analyses/analyses.h

@@ -25 +25 @@
 #include "./HydrologyShreveAnalysis.h"
 #include "./LevelsetAnalysis.h"
+#include "./LsfReinitializationAnalysis.h"
 #include "./MasstransportAnalysis.h"
 #include "./MeltingAnalysis.h"

issm/trunk-jpl/src/c/cores/AnalysisConfiguration.cpp

@@ -116 +116 @@
 
                 case TransientSolutionEnum:
-                        numanalyses=14;
+                        numanalyses=15;
                         analyses=xNew<int>(numanalyses);
                         analyses[ 0]=StressbalanceAnalysisEnum;
@@ -132 +132 @@
                         analyses[12]=LevelsetAnalysisEnum;
                         analyses[13]=ExtrapolationAnalysisEnum;
+                        analyses[14]=LsfReinitializationAnalysisEnum;
                         break;
 

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -354 +354 @@
         LevelsetAnalysisEnum,
         ExtrapolationAnalysisEnum,
+        LsfReinitializationAnalysisEnum,
         /*}}}*/
         /*Approximations {{{*/

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -355 +355 @@
                 case LevelsetAnalysisEnum : return "LevelsetAnalysis";
                 case ExtrapolationAnalysisEnum : return "ExtrapolationAnalysis";
+                case LsfReinitializationAnalysisEnum : return "LsfReinitializationAnalysis";
                 case ApproximationEnum : return "Approximation";
                 case NoneApproximationEnum : return "NoneApproximation";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -361 +361 @@
               else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
               else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
+              else if (strcmp(name,"LsfReinitializationAnalysis")==0) return LsfReinitializationAnalysisEnum;
               else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
               else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
@@ -382 +383 @@
               else if (strcmp(name,"Results")==0) return ResultsEnum;
               else if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
-              else if (strcmp(name,"AdolcParam")==0) return AdolcParamEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
+              if (strcmp(name,"AdolcParam")==0) return AdolcParamEnum;
+              else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
               else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
               else if (strcmp(name,"Contour")==0) return ContourEnum;
@@ -505 +506 @@
               else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
               else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
-              else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
+              if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
+              else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
               else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
               else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
@@ -628 +629 @@
               else if (strcmp(name,"Sset")==0) return SsetEnum;
               else if (strcmp(name,"Verbose")==0) return VerboseEnum;
-              else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
+              if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
+              else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
               else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
               else if (strcmp(name,"XY")==0) return XYEnum;

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -347 +347 @@
 def LevelsetAnalysisEnum(): return StringToEnum("LevelsetAnalysis")[0]
 def ExtrapolationAnalysisEnum(): return StringToEnum("ExtrapolationAnalysis")[0]
+def LsfReinitializationAnalysisEnum(): return StringToEnum("LsfReinitializationAnalysis")[0]
 def ApproximationEnum(): return StringToEnum("Approximation")[0]
 def NoneApproximationEnum(): return StringToEnum("NoneApproximation")[0]