Changeset 18945

Timestamp:

12/04/14 16:55:45 (10 years ago)

Author:

Eric.Larour

Message:

CHG: new enums.

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/VxObsEnum.m (added)
• m/enum/VyObsEnum.m (added)
• m/enum/WeightsVxObsEnum.m (added)
• m/enum/WeightsVyObsEnum.m (added)

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

@@ -698 +698 @@
         SurfaceObservationEnum,
         WeightsSurfaceObservationEnum,
+        VxObsEnum,
+        WeightsVxObsEnum,
+        VyObsEnum,
+        WeightsVyObsEnum,
         /*}}}*/
         /*Responses{{{*/

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

@@ -683 +683 @@
                 case SurfaceObservationEnum : return "SurfaceObservation";
                 case WeightsSurfaceObservationEnum : return "WeightsSurfaceObservation";
+                case VxObsEnum : return "VxObs";
+                case WeightsVxObsEnum : return "WeightsVxObs";
+                case VyObsEnum : return "VyObs";
+                case WeightsVyObsEnum : return "WeightsVyObs";
                 case MinVelEnum : return "MinVel";
                 case MaxVelEnum : return "MaxVel";

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

@@ -698 +698 @@
               else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
               else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
+              else if (strcmp(name,"VxObs")==0) return VxObsEnum;
+              else if (strcmp(name,"WeightsVxObs")==0) return WeightsVxObsEnum;
+              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
+              else if (strcmp(name,"WeightsVyObs")==0) return WeightsVyObsEnum;
               else if (strcmp(name,"MinVel")==0) return MinVelEnum;
               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
@@ -748 +752 @@
               else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
               else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
-              else if (strcmp(name,"ToolkitsFileName")==0) return ToolkitsFileNameEnum;
+         else stage=7;
+   }
+   if(stage==7){
+              if (strcmp(name,"ToolkitsFileName")==0) return ToolkitsFileNameEnum;
               else if (strcmp(name,"RootPath")==0) return RootPathEnum;
               else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
               else if (strcmp(name,"InputFileName")==0) return InputFileNameEnum;
-         else stage=7;
-   }
-   if(stage==7){
-              if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
+              else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
               else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
               else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;

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

@@ -675 +675 @@
 def SurfaceObservationEnum(): return StringToEnum("SurfaceObservation")[0]
 def WeightsSurfaceObservationEnum(): return StringToEnum("WeightsSurfaceObservation")[0]
+def VxObsEnum(): return StringToEnum("VxObs")[0]
+def WeightsVxObsEnum(): return StringToEnum("WeightsVxObs")[0]
+def VyObsEnum(): return StringToEnum("VyObs")[0]
+def WeightsVyObsEnum(): return StringToEnum("WeightsVyObs")[0]
 def MinVelEnum(): return StringToEnum("MinVel")[0]
 def MaxVelEnum(): return StringToEnum("MaxVel")[0]