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

Timestamp:

01/13/14 13:45:05 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added results as patch so that we can have nodal values

File:

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

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

@@ -244 +244 @@
               else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
               else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
+              else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
               else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
               else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
@@ -259 +260 @@
               else if (strcmp(name,"Surface")==0) return SurfaceEnum;
               else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum;
-              else if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
+              if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum;
+              else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
               else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
               else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum;
@@ -382 +383 @@
               else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
               else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
-              else if (strcmp(name,"Contour")==0) return ContourEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
+              if (strcmp(name,"Contour")==0) return ContourEnum;
+              else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
               else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
               else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
@@ -505 +506 @@
               else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
               else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
-              else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
+              if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
+              else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
               else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
               else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
@@ -628 +629 @@
               else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
               else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
-              else if (strcmp(name,"XY")==0) return XYEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"XYZ")==0) return XYZEnum;
+              if (strcmp(name,"XY")==0) return XYEnum;
+              else if (strcmp(name,"XYZ")==0) return XYZEnum;
               else if (strcmp(name,"Dense")==0) return DenseEnum;
               else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;