Changeset 16659

Timestamp:

11/07/13 12:03:32 (11 years ago)

Author:

bdef

Message:

adding an Enum for slope computation in EPL

Location:

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

Files:

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

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

@@ -303 +303 @@
         BalancevelocitySolutionEnum,
         L2ProjectionBaseAnalysisEnum,
+        L2ProjectionEPLAnalysisEnum,
         BedSlopeSolutionEnum,
         DamageEvolutionSolutionEnum,

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

@@ -309 +309 @@
                 case BalancevelocitySolutionEnum : return "BalancevelocitySolution";
                 case L2ProjectionBaseAnalysisEnum : return "L2ProjectionBaseAnalysis";
+                case L2ProjectionEPLAnalysisEnum : return "L2ProjectionEPLAnalysis";
                 case BedSlopeSolutionEnum : return "BedSlopeSolution";
                 case DamageEvolutionSolutionEnum : return "DamageEvolutionSolution";

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

@@ -315 +315 @@
               else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
               else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
+              else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum;
               else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
               else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
@@ -382 +383 @@
               else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
               else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
-              else if (strcmp(name,"Element")==0) return ElementEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
+              if (strcmp(name,"Element")==0) return ElementEnum;
+              else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
               else if (strcmp(name,"FileParam")==0) return FileParamEnum;
               else if (strcmp(name,"Input")==0) return InputEnum;
@@ -505 +506 @@
               else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
               else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
-              else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
+              if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
+              else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
               else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
               else if (strcmp(name,"StressTensor")==0) return StressTensorEnum;