Changeset 18718

Timestamp:

10/31/14 11:10:37 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed Enums

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (4 diffs)

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

@@ -383 +383 @@
               else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum;
               else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
-              else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
-              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
-              else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
+              if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
+              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
+              else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
+              else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
+              else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
+              else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;
+              else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
               else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
               else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
@@ -503 +506 @@
               else if (strcmp(name,"VertexSId")==0) return VertexSIdEnum;
               else if (strcmp(name,"Air")==0) return AirEnum;
-              else if (strcmp(name,"Ice")==0) return IceEnum;
-              else if (strcmp(name,"Melange")==0) return MelangeEnum;
-              else if (strcmp(name,"Water")==0) return WaterEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
+              if (strcmp(name,"Ice")==0) return IceEnum;
+              else if (strcmp(name,"Melange")==0) return MelangeEnum;
+              else if (strcmp(name,"Water")==0) return WaterEnum;
+              else if (strcmp(name,"Closed")==0) return ClosedEnum;
+              else if (strcmp(name,"Free")==0) return FreeEnum;
+              else if (strcmp(name,"Open")==0) return OpenEnum;
+              else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
               else if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
               else if (strcmp(name,"Adjointy")==0) return AdjointyEnum;
@@ -623 +629 @@
               else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
               else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
-              else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
-              else if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum;
-              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
+              if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
+              else if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum;
+              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
+              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
+              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
+              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
+              else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
               else if (strcmp(name,"J")==0) return JEnum;
               else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
@@ -743 +752 @@
               else if (strcmp(name,"SeaiceMinThickness")==0) return SeaiceMinThicknessEnum;
               else if (strcmp(name,"SeaiceMaxThickness")==0) return SeaiceMaxThicknessEnum;
-              else if (strcmp(name,"SeaiceSpcvx")==0) return SeaiceSpcvxEnum;
-              else if (strcmp(name,"SeaiceSpcvy")==0) return SeaiceSpcvyEnum;
-              else if (strcmp(name,"SeaiceCoriolisFactor")==0) return SeaiceCoriolisFactorEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"BasalforcingsOceanQuadDragCoef")==0) return BasalforcingsOceanQuadDragCoefEnum;
+              if (strcmp(name,"SeaiceSpcvx")==0) return SeaiceSpcvxEnum;
+              else if (strcmp(name,"SeaiceSpcvy")==0) return SeaiceSpcvyEnum;
+              else if (strcmp(name,"SeaiceCoriolisFactor")==0) return SeaiceCoriolisFactorEnum;
+              else if (strcmp(name,"BasalforcingsRhoOcean")==0) return BasalforcingsRhoOceanEnum;
+              else if (strcmp(name,"BasalforcingsOceanCoef")==0) return BasalforcingsOceanCoefEnum;
+              else if (strcmp(name,"BasalforcingsOceanLinDragCoef")==0) return BasalforcingsOceanLinDragCoefEnum;
+              else if (strcmp(name,"BasalforcingsOceanQuadDragCoef")==0) return BasalforcingsOceanQuadDragCoefEnum;
               else if (strcmp(name,"BasalforcingsOceanTurningAngle")==0) return BasalforcingsOceanTurningAngleEnum;
               else if (strcmp(name,"BasalforcingsOceanSsh")==0) return BasalforcingsOceanSshEnum;