Changeset 18662

Timestamp:

10/20/14 15:09:16 (10 years ago)

Author:

srebuffi

Message:

CHG: added new Enums

Location:

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

Files:

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

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

@@ -206 +206 @@
         NewDamageEnum,
         StressIntensityFactorEnum,
+        StrainRateparallelEnum,
+        StrainRateperpendicularEnum,
         MaterialsRhoIceEnum,
         MaterialsRhoSeawaterEnum,

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

@@ -214 +214 @@
                 case NewDamageEnum : return "NewDamage";
                 case StressIntensityFactorEnum : return "StressIntensityFactor";
+                case StrainRateparallelEnum : return "StrainRateparallel";
+                case StrainRateperpendicularEnum : return "StrainRateperpendicular";
                 case MaterialsRhoIceEnum : return "MaterialsRhoIce";
                 case MaterialsRhoSeawaterEnum : return "MaterialsRhoSeawater";

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

@@ -217 +217 @@
               else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
               else if (strcmp(name,"StressIntensityFactor")==0) return StressIntensityFactorEnum;
+              else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
+              else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
               else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
               else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum;
@@ -258 +260 @@
               else if (strcmp(name,"MasstransportCalvingrate")==0) return MasstransportCalvingrateEnum;
               else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
-              else if (strcmp(name,"MasstransportVertexPairing")==0) return MasstransportVertexPairingEnum;
-              else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
+              if (strcmp(name,"MasstransportVertexPairing")==0) return MasstransportVertexPairingEnum;
+              else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
+              else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
               else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
               else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
@@ -381 +383 @@
               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;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
+              if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
+              else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
+              else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
               else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;
               else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
@@ -504 +506 @@
               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;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
+              if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
+              else if (strcmp(name,"Adjointy")==0) return AdjointyEnum;
+              else if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
               else if (strcmp(name,"BalancethicknessMisfit")==0) return BalancethicknessMisfitEnum;
               else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum;
@@ -627 +629 @@
               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;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Step")==0) return StepEnum;
+              if (strcmp(name,"J")==0) return JEnum;
+              else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
+              else if (strcmp(name,"Step")==0) return StepEnum;
               else if (strcmp(name,"Time")==0) return TimeEnum;
               else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
@@ -750 +752 @@
               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;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"BasalforcingsOceanVx")==0) return BasalforcingsOceanVxEnum;
+              if (strcmp(name,"BasalforcingsOceanTurningAngle")==0) return BasalforcingsOceanTurningAngleEnum;
+              else if (strcmp(name,"BasalforcingsOceanSsh")==0) return BasalforcingsOceanSshEnum;
+              else if (strcmp(name,"BasalforcingsOceanVx")==0) return BasalforcingsOceanVxEnum;
               else if (strcmp(name,"BasalforcingsOceanVy")==0) return BasalforcingsOceanVyEnum;
               else if (strcmp(name,"SurfaceforcingsRhoAir")==0) return SurfaceforcingsRhoAirEnum;