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

Timestamp:

07/02/13 11:43:54 (12 years ago)

Author:

seroussi

Message:

NEW: start to work on dynamic ice front

File:

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

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

@@ -155 +155 @@
               else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum;
               else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum;
+              else if (strcmp(name,"Icelevelset")==0) return IcelevelsetEnum;
               else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
               else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum;
@@ -259 +260 @@
               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 stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
+              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;
@@ -382 +383 @@
               else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
               else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
-              else if (strcmp(name,"Segment")==0) return SegmentEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
+              if (strcmp(name,"Segment")==0) return SegmentEnum;
+              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
               else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
               else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
@@ -505 +506 @@
               else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
               else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
-              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
+              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;