Changeset 17494

Timestamp:

03/20/14 06:31:35 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: working on depthaveraging method

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (2 diffs)
• src/c/analyses/DepthAverageAnalysis.cpp (added)
• src/c/analyses/DepthAverageAnalysis.h (added)
• src/c/analyses/EnumToAnalysis.cpp (modified) (1 diff)
• src/c/analyses/analyses.h (modified) (1 diff)
• src/c/cores/depthaverage_core.cpp (added)
• src/c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (5 diffs)
• src/c/shared/Exceptions/Exceptions.cpp (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -1711 +1711 @@
         AC_MSG_RESULT($HAVE_DAMAGEEVOLUTION)
         dnl }}}
+        dnl with-DepthAverage{{{
+        AC_ARG_WITH([DepthAverage],
+                AS_HELP_STRING([--with-DepthAverage = YES], [compile with DepthAverage capabilities (default is yes)]),
+                [DEPTHAVERAGE=$withval],[DEPTHAVERAGE=yes]) 
+        AC_MSG_CHECKING(for DepthAverage capability compilation)
+
+        HAVE_DEPTHAVERAGE=no
+        if test "x$DEPTHAVERAGE" = "xyes"; then
+                HAVE_DEPTHAVERAGE=yes
+                AC_DEFINE([_HAVE_DEPTHAVERAGE_],[1],[with DepthAverage capability])
+        fi
+        AM_CONDITIONAL([DEPTHAVERAGE], [test x$HAVE_DEPTHAVERAGE = xyes])
+        AC_MSG_RESULT($HAVE_DEPTHAVERAGE)
+        dnl }}}
         dnl with-stressbalance{{{
         AC_ARG_WITH([stressbalance],

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

@@ -368 +368 @@
                                         ./cores/steadystate_core.cpp\
                                         ./cores/masstransport_core.cpp\
+                                        ./cores/depthaverage_core.cpp\
                                         ./cores/extrudefrombase_core.cpp\
                                         ./cores/extrudefromtop_core.cpp\
@@ -574 +575 @@
 issm_sources += ./analyses/ExtrudeFromTopAnalysis.cpp
 endif
+if DEPTHAVERAGE
+issm_sources += ./analyses/DepthAverageAnalysis.cpp
+endif
 if THERMAL
 issm_sources += ./analyses/ThermalAnalysis.cpp

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

@@ -77 +77 @@
                 case ExtrudeFromTopAnalysisEnum : return new ExtrudeFromTopAnalysis();
                 #endif
+                #ifdef _HAVE_DEPTHAVERAGE_
+                case DepthAverageAnalysisEnum : return new DepthAverageAnalysis();
+                #endif
                 #ifdef _HAVE_SMOOTHEDSURFACESLOPEX_
                 case SmoothedSurfaceSlopeXAnalysisEnum : return new SmoothedSurfaceSlopeXAnalysis();

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

@@ -14 +14 @@
 #include "./BalancevelocityAnalysis.h"
 #include "./DamageEvolutionAnalysis.h"
+#include "./DepthAverageAnalysis.h"
 #include "./EnthalpyAnalysis.h"
 #include "./ExtrudeFromBaseAnalysis.h"

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

@@ -346 +346 @@
         ExtrudeFromBaseAnalysisEnum,
         ExtrudeFromTopAnalysisEnum,
+        DepthAverageAnalysisEnum,
         SteadystateSolutionEnum,
         SurfaceSlopeSolutionEnum,
@@ -406 +407 @@
         InputToExtrudeEnum,
         InputToL2ProjectEnum,
+        InputToDepthaverageEnum,
         IntParamEnum,
         IntVecParamEnum,

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

@@ -347 +347 @@
                 case ExtrudeFromBaseAnalysisEnum : return "ExtrudeFromBaseAnalysis";
                 case ExtrudeFromTopAnalysisEnum : return "ExtrudeFromTopAnalysis";
+                case DepthAverageAnalysisEnum : return "DepthAverageAnalysis";
                 case SteadystateSolutionEnum : return "SteadystateSolution";
                 case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution";
@@ -401 +402 @@
                 case InputToExtrudeEnum : return "InputToExtrude";
                 case InputToL2ProjectEnum : return "InputToL2Project";
+                case InputToDepthaverageEnum : return "InputToDepthaverage";
                 case IntParamEnum : return "IntParam";
                 case IntVecParamEnum : return "IntVecParam";

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

@@ -353 +353 @@
               else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
               else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
+              else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum;
               else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
               else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
@@ -382 +383 @@
               else if (strcmp(name,"Loads")==0) return LoadsEnum;
               else if (strcmp(name,"Materials")==0) return MaterialsEnum;
-              else if (strcmp(name,"Nodes")==0) return NodesEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"Contours")==0) return ContoursEnum;
+              if (strcmp(name,"Nodes")==0) return NodesEnum;
+              else if (strcmp(name,"Contours")==0) return ContoursEnum;
               else if (strcmp(name,"Parameters")==0) return ParametersEnum;
               else if (strcmp(name,"Vertices")==0) return VerticesEnum;
@@ -410 +411 @@
               else if (strcmp(name,"InputToExtrude")==0) return InputToExtrudeEnum;
               else if (strcmp(name,"InputToL2Project")==0) return InputToL2ProjectEnum;
+              else if (strcmp(name,"InputToDepthaverage")==0) return InputToDepthaverageEnum;
               else if (strcmp(name,"IntParam")==0) return IntParamEnum;
               else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
@@ -504 +506 @@
               else if (strcmp(name,"Vy")==0) return VyEnum;
               else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
-              else if (strcmp(name,"Vz")==0) return VzEnum;
-              else if (strcmp(name,"VzSSA")==0) return VzSSAEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"VzHO")==0) return VzHOEnum;
+              if (strcmp(name,"Vz")==0) return VzEnum;
+              else if (strcmp(name,"VzSSA")==0) return VzSSAEnum;
+              else if (strcmp(name,"VzHO")==0) return VzHOEnum;
               else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
               else if (strcmp(name,"VzFS")==0) return VzFSEnum;
@@ -627 +629 @@
               else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
               else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
-              else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
-              else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
+              if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
+              else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
+              else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
               else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
               else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;

issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp

@@ -46 +46 @@
         file_line= what_line;
         /*When error messages are not shown properly, uncomment the following line*/
-        //this->Report();
+        this->Report();
 
 }/*}}}*/