Changeset 16767

Timestamp:

11/14/13 16:14:16 (11 years ago)

Author:

Eric.Larour

Message:

NEW: new enums for misfit class.

Location:

issm/trunk-jpl/src

Files:

• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (2 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/MisfitModelEnum.m (added)
• m/enum/MisfitNameEnum.m (added)
• m/enum/MisfitObservationsEnum.m (added)
• m/enum/MisfitTimeinterpolationEnum.m (added)
• m/enum/MisfitWeightsEnum.m (added)

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

@@ -551 +551 @@
         MassfluxatgateNameEnum,
         MassfluxatgateSegmentsEnum,
+        MisfitNameEnum,
+        MisfitModelEnum,
+        MisfitObservationsEnum,
+        MisfitTimeinterpolationEnum,
+        MisfitWeightsEnum,
         /*}}}*/
         /*Responses{{{*/

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

@@ -539 +539 @@
                 case MassfluxatgateNameEnum : return "MassfluxatgateName";
                 case MassfluxatgateSegmentsEnum : return "MassfluxatgateSegments";
+                case MisfitNameEnum : return "MisfitName";
+                case MisfitModelEnum : return "MisfitModel";
+                case MisfitObservationsEnum : return "MisfitObservations";
+                case MisfitTimeinterpolationEnum : return "MisfitTimeinterpolation";
+                case MisfitWeightsEnum : return "MisfitWeights";
                 case MinVelEnum : return "MinVel";
                 case MaxVelEnum : return "MaxVel";

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

@@ -551 +551 @@
               else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
               else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
+              else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
+              else if (strcmp(name,"MisfitModel")==0) return MisfitModelEnum;
+              else if (strcmp(name,"MisfitObservations")==0) return MisfitObservationsEnum;
+              else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
+              else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
               else if (strcmp(name,"MinVel")==0) return MinVelEnum;
               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
@@ -624 +629 @@
               else if (strcmp(name,"Paterson")==0) return PatersonEnum;
               else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
-              else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
+         else stage=6;
+   }
+   if(stage==6){
+              if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
               else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
-         else stage=6;
+         else stage=7;
    }
         /*If we reach this point, the string provided has not been found*/

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

@@ -531 +531 @@
 def MassfluxatgateNameEnum(): return StringToEnum("MassfluxatgateName")[0]
 def MassfluxatgateSegmentsEnum(): return StringToEnum("MassfluxatgateSegments")[0]
+def MisfitNameEnum(): return StringToEnum("MisfitName")[0]
+def MisfitModelEnum(): return StringToEnum("MisfitModel")[0]
+def MisfitObservationsEnum(): return StringToEnum("MisfitObservations")[0]
+def MisfitTimeinterpolationEnum(): return StringToEnum("MisfitTimeinterpolation")[0]
+def MisfitWeightsEnum(): return StringToEnum("MisfitWeights")[0]
 def MinVelEnum(): return StringToEnum("MinVel")[0]
 def MaxVelEnum(): return StringToEnum("MaxVel")[0]