Changeset 17139

Timestamp:

01/17/14 11:53:28 (11 years ago)

Author:

jbondzio

Message:

ADD: Shell for extrapolation: ExtrapolationAnalysis

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/analyses/ExtrapolationAnalysis.cpp (added)
• c/analyses/ExtrapolationAnalysis.h (added)
• c/analyses/analyses.h (modified) (1 diff)
• c/cores/transient_core.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (1 diff)

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

@@ -370 +370 @@
                                                         ./cores/transient_core.cpp\
               ./analyses/LevelsetAnalysis.h\
-              ./analyses/LevelsetAnalysis.cpp
+              ./analyses/LevelsetAnalysis.cpp\
+                          ./analyses/ExtrapolationAnalysis.h\
+                          ./analyses/ExtrapolationAnalysis.cpp
 #}}}
 #Steadystate sources  {{{

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

@@ -17 +17 @@
 #include "./ExtrudeFromBaseAnalysis.h"
 #include "./ExtrudeFromTopAnalysis.h"
+#include "./ExtrapolationAnalysis.h"
 #include "./FreeSurfaceBaseAnalysis.h"
 #include "./FreeSurfaceTopAnalysis.h"

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

@@ -114 +114 @@
 
                 if(isthermal && meshtype==Mesh3DEnum){
-                        if(VerboseSolution()) _printf0_("   computing temperatures\n");
+                        if(VerboseSolution()) _printf0_("   computing thermal regime\n");
                         #ifdef _HAVE_THERMAL_
                         thermal_core(femmodel);

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

@@ -676 +676 @@
         LevelsetAnalysisEnum,
         TransientIslevelsetEnum,
+        ExtrapolationAnalysisEnum,
+        ExtrapolationVariableEnum,
         /*}}}*/
         MaximumNumberOfDefinitionsEnum

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

@@ -635 +635 @@
                 case LevelsetAnalysisEnum : return "LevelsetAnalysis";
                 case TransientIslevelsetEnum : return "TransientIslevelset";
+                case ExtrapolationAnalysisEnum : return "ExtrapolationAnalysis";
+                case ExtrapolationVariableEnum : return "ExtrapolationVariable";
                 case MaximumNumberOfDefinitionsEnum : return "MaximumNumberOfDefinitions";
                 default : return "unknown";

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

@@ -650 +650 @@
               else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
               else if (strcmp(name,"TransientIslevelset")==0) return TransientIslevelsetEnum;
+              else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
+              else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
               else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
          else stage=7;

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

@@ -627 +627 @@
 def LevelsetAnalysisEnum(): return StringToEnum("LevelsetAnalysis")[0]
 def TransientIslevelsetEnum(): return StringToEnum("TransientIslevelset")[0]
+def ExtrapolationAnalysisEnum(): return StringToEnum("ExtrapolationAnalysis")[0]
+def ExtrapolationVariableEnum(): return StringToEnum("ExtrapolationVariable")[0]
 def MaximumNumberOfDefinitionsEnum(): return StringToEnum("MaximumNumberOfDefinitions")[0]