Changeset 16030

Timestamp:

08/30/13 09:14:10 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: synchronized StringToEnum

File:

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

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

@@ -247 +247 @@
               else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum;
               else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum;
+              else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum;
+              else if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum;
               else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
               else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
@@ -253 +255 @@
               else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
               else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
-              else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum;
               else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
               else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
@@ -259 +260 @@
               else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
               else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
-              else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
+              if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
+              else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
               else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
               else if (strcmp(name,"TransientIsstressbalance")==0) return TransientIsstressbalanceEnum;
@@ -382 +383 @@
               else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
               else if (strcmp(name,"Profiler")==0) return ProfilerEnum;
-              else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
+              if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
+              else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
               else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
               else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
@@ -505 +506 @@
               else if (strcmp(name,"P1DG")==0) return P1DGEnum;
               else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
-              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"P2")==0) return P2Enum;
+              if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
+              else if (strcmp(name,"P2")==0) return P2Enum;
               else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
               else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;