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

Timestamp:

08/27/13 16:12:21 (12 years ago)

Author:

Mathieu Morlighem

Message:

DEL: getting rid of MaskVertexon* and MaskElementon* in the code'

File:

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

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

@@ -153 +153 @@
               else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
               else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum;
-              else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum;
-              else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum;
-              else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum;
-              else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum;
               else if (strcmp(name,"MaskIceLevelset")==0) return MaskIceLevelsetEnum;
               else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
@@ -260 +256 @@
               else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
               else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
+              else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
+              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,"Thickness")==0) return ThicknessEnum;
-              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 if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
+              if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
               else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
               else if (strcmp(name,"TransientIsstressbalance")==0) return TransientIsstressbalanceEnum;
@@ -383 +379 @@
               else if (strcmp(name,"Profiler")==0) return ProfilerEnum;
               else 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;
+              else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
-              else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
-              else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
-              else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
-              else if (strcmp(name,"Segment")==0) return SegmentEnum;
+              if (strcmp(name,"Segment")==0) return SegmentEnum;
               else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
               else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
@@ -487 +483 @@
               else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
               else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
-              else if (strcmp(name,"BasalMeltrate")==0) return BasalMeltrateEnum;
               else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
               else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
@@ -506 +501 @@
               else if (strcmp(name,"P1DG")==0) return P1DGEnum;
               else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
-         else stage=5;
-   }
-   if(stage==5){
-              if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
+              else 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;
               else if (strcmp(name,"P1P1")==0) return P1P1Enum;
-              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
+         else stage=5;
+   }
+   if(stage==5){
+              if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
               else if (strcmp(name,"MINI")==0) return MINIEnum;
               else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;