Changeset 21098

Timestamp:

08/05/16 10:47:45 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some missing enums

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (4 diffs)

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

@@ -558 +558 @@
         /*}}}*/
         /*Output Definitions{{{*/
+        SurfaceObservationEnum,
+        WeightsSurfaceObservationEnum,
         OutputdefinitionEnum,
         Outputdefinition1Enum,

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

@@ -553 +553 @@
                 case TimeEnum : return "Time";
                 case WaterColumnOldEnum : return "WaterColumnOld";
+                case SurfaceObservationEnum : return "SurfaceObservation";
+                case WeightsSurfaceObservationEnum : return "WeightsSurfaceObservation";
                 case OutputdefinitionEnum : return "Outputdefinition";
                 case Outputdefinition1Enum : return "Outputdefinition1";

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

@@ -565 +565 @@
               else if (strcmp(name,"Time")==0) return TimeEnum;
               else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
+              else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
+              else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
               else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
               else if (strcmp(name,"Outputdefinition1")==0) return Outputdefinition1Enum;
@@ -627 +629 @@
               else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum;
               else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
-              else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
-              else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
+              if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
+              else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
+              else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
               else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
               else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
@@ -750 +752 @@
               else if (strcmp(name,"SealevelEustatic")==0) return SealevelEustaticEnum;
               else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
-              else if (strcmp(name,"SealevelriseMaxiter")==0) return SealevelriseMaxiterEnum;
-              else if (strcmp(name,"SealevelriseReltol")==0) return SealevelriseReltolEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
+              if (strcmp(name,"SealevelriseMaxiter")==0) return SealevelriseMaxiterEnum;
+              else if (strcmp(name,"SealevelriseReltol")==0) return SealevelriseReltolEnum;
+              else if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
               else if (strcmp(name,"SealevelriseRigid")==0) return SealevelriseRigidEnum;
               else if (strcmp(name,"SealevelriseElastic")==0) return SealevelriseElasticEnum;
@@ -873 +875 @@
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
               else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum;
-              else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
-              else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
+              if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
+              else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
+              else if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
               else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
               else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;