Changeset 20342

Timestamp:

Mar 24, 2016, 2:41:32 PM (11 years ago)

Author:

Eric.Larour

Message:

CHG: starting to add enums necessary to handle perturbation to the rotational potential in slr solution.

Location:

issm/trunk-jpl/src

Files:

• c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• c/shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
• c/shared/Enum/StringToEnumx.cpp (modified) (2 diffs)
• m/enum/EnumDefinitions.js (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/SealevelEustaticEnum.m (added)
• m/enum/SealevelriseRotationEnum.m (added)
• m/enum/SealevelriseTideLoveHEnum.m (added)
• m/enum/SealevelriseTideLoveKEnum.m (added)

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

@@ -1055 +1055 @@
         SealevelriseAnalysisEnum,
         SealevelEnum,
+        SealevelEustaticEnum,
         SealevelriseDeltathicknessEnum,
         SealevelriseMaxiterEnum,
@@ -1061 +1062 @@
         SealevelriseLoveHEnum,
         SealevelriseLoveKEnum,
+        SealevelriseTideLoveHEnum,
+        SealevelriseTideLoveKEnum,
         SealevelriseRigidEnum,
         SealevelriseElasticEnum,
-        SealevelriseEustaticEnum,
+        SealevelriseRotationEnum,
         SealevelriseGElasticEnum,
         SealevelriseDegaccEnum,

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

@@ -1007 +1007 @@
                 case SealevelriseAnalysisEnum : return "SealevelriseAnalysis";
                 case SealevelEnum : return "Sealevel";
+                case SealevelEustaticEnum : return "SealevelEustatic";
                 case SealevelriseDeltathicknessEnum : return "SealevelriseDeltathickness";
                 case SealevelriseMaxiterEnum : return "SealevelriseMaxiter";
@@ -1013 +1014 @@
                 case SealevelriseLoveHEnum : return "SealevelriseLoveH";
                 case SealevelriseLoveKEnum : return "SealevelriseLoveK";
+                case SealevelriseTideLoveHEnum : return "SealevelriseTideLoveH";
+                case SealevelriseTideLoveKEnum : return "SealevelriseTideLoveK";
                 case SealevelriseRigidEnum : return "SealevelriseRigid";
                 case SealevelriseElasticEnum : return "SealevelriseElastic";
-                case SealevelriseEustaticEnum : return "SealevelriseEustatic";
+                case SealevelriseRotationEnum : return "SealevelriseRotation";
                 case SealevelriseGElasticEnum : return "SealevelriseGElastic";
                 case SealevelriseDegaccEnum : return "SealevelriseDegacc";

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

@@ -1031 +1031 @@
               else if (strcmp(name,"SealevelriseAnalysis")==0) return SealevelriseAnalysisEnum;
               else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
+              else if (strcmp(name,"SealevelEustatic")==0) return SealevelEustaticEnum;
               else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
               else if (strcmp(name,"SealevelriseMaxiter")==0) return SealevelriseMaxiterEnum;
@@ -1037 +1038 @@
               else if (strcmp(name,"SealevelriseLoveH")==0) return SealevelriseLoveHEnum;
               else if (strcmp(name,"SealevelriseLoveK")==0) return SealevelriseLoveKEnum;
+              else if (strcmp(name,"SealevelriseTideLoveH")==0) return SealevelriseTideLoveHEnum;
+              else if (strcmp(name,"SealevelriseTideLoveK")==0) return SealevelriseTideLoveKEnum;
               else if (strcmp(name,"SealevelriseRigid")==0) return SealevelriseRigidEnum;
               else if (strcmp(name,"SealevelriseElastic")==0) return SealevelriseElasticEnum;
-              else if (strcmp(name,"SealevelriseEustatic")==0) return SealevelriseEustaticEnum;
+              else if (strcmp(name,"SealevelriseRotation")==0) return SealevelriseRotationEnum;
               else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum;
               else if (strcmp(name,"SealevelriseDegacc")==0) return SealevelriseDegaccEnum;

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

@@ -992 +992 @@
 function SealevelriseAnalysisEnum(){ return 988;}
 function SealevelEnum(){ return 989;}
-function SealevelriseDeltathicknessEnum(){ return 990;}
-function SealevelriseMaxiterEnum(){ return 991;}
-function SealevelriseReltolEnum(){ return 992;}
-function SealevelriseAbstolEnum(){ return 993;}
-function SealevelriseLoveHEnum(){ return 994;}
-function SealevelriseLoveKEnum(){ return 995;}
-function SealevelriseRigidEnum(){ return 996;}
-function SealevelriseElasticEnum(){ return 997;}
-function SealevelriseEustaticEnum(){ return 998;}
-function SealevelriseGElasticEnum(){ return 999;}
-function SealevelriseDegaccEnum(){ return 1000;}
-function SealevelriseTransitionsEnum(){ return 1001;}
-function SealevelriseRequestedOutputsEnum(){ return 1002;}
-function SealevelriseNumRequestedOutputsEnum(){ return 1003;}
-function MaximumNumberOfDefinitionsEnum(){ return 1004;}
+function SealevelEustaticEnum(){ return 990;}
+function SealevelriseDeltathicknessEnum(){ return 991;}
+function SealevelriseMaxiterEnum(){ return 992;}
+function SealevelriseReltolEnum(){ return 993;}
+function SealevelriseAbstolEnum(){ return 994;}
+function SealevelriseLoveHEnum(){ return 995;}
+function SealevelriseLoveKEnum(){ return 996;}
+function SealevelriseTideLoveHEnum(){ return 997;}
+function SealevelriseTideLoveKEnum(){ return 998;}
+function SealevelriseRigidEnum(){ return 999;}
+function SealevelriseElasticEnum(){ return 1000;}
+function SealevelriseRotationEnum(){ return 1001;}
+function SealevelriseGElasticEnum(){ return 1002;}
+function SealevelriseDegaccEnum(){ return 1003;}
+function SealevelriseTransitionsEnum(){ return 1004;}
+function SealevelriseRequestedOutputsEnum(){ return 1005;}
+function SealevelriseNumRequestedOutputsEnum(){ return 1006;}
+function MaximumNumberOfDefinitionsEnum(){ return 1007;}

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

@@ -999 +999 @@
 def SealevelriseAnalysisEnum(): return StringToEnum("SealevelriseAnalysis")[0]
 def SealevelEnum(): return StringToEnum("Sealevel")[0]
+def SealevelEustaticEnum(): return StringToEnum("SealevelEustatic")[0]
 def SealevelriseDeltathicknessEnum(): return StringToEnum("SealevelriseDeltathickness")[0]
 def SealevelriseMaxiterEnum(): return StringToEnum("SealevelriseMaxiter")[0]
@@ -1005 +1006 @@
 def SealevelriseLoveHEnum(): return StringToEnum("SealevelriseLoveH")[0]
 def SealevelriseLoveKEnum(): return StringToEnum("SealevelriseLoveK")[0]
+def SealevelriseTideLoveHEnum(): return StringToEnum("SealevelriseTideLoveH")[0]
+def SealevelriseTideLoveKEnum(): return StringToEnum("SealevelriseTideLoveK")[0]
 def SealevelriseRigidEnum(): return StringToEnum("SealevelriseRigid")[0]
 def SealevelriseElasticEnum(): return StringToEnum("SealevelriseElastic")[0]
-def SealevelriseEustaticEnum(): return StringToEnum("SealevelriseEustatic")[0]
+def SealevelriseRotationEnum(): return StringToEnum("SealevelriseRotation")[0]
 def SealevelriseGElasticEnum(): return StringToEnum("SealevelriseGElastic")[0]
 def SealevelriseDegaccEnum(): return StringToEnum("SealevelriseDegacc")[0]