Changeset 12253

Timestamp:

05/16/12 12:42:42 (13 years ago)

Author:

cborstad

Message:

minor update after re-running synchronize.sh

File:

• issm/branches/trunk-jpl-damage/src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -260 +260 @@
               else if (strcmp(name,"IntInput")==0) return IntInputEnum;
               else if (strcmp(name,"IntParam")==0) return IntParamEnum;
-              else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
-              else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;
-              else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"Matice")==0) return MaticeEnum;
+              if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
+              else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;
+              else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
+              else if (strcmp(name,"Matice")==0) return MaticeEnum;
               else if (strcmp(name,"Matpar")==0) return MatparEnum;
               else if (strcmp(name,"Node")==0) return NodeEnum;
-         else stage=3;
-   }
-   if(stage==3){
-              if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
+              else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
               else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
@@ -386 +383 @@
               else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
               else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
-              else if (strcmp(name,"P0")==0) return P0Enum;
-              else if (strcmp(name,"P1")==0) return P1Enum;
-              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
+              if (strcmp(name,"P0")==0) return P0Enum;
+              else if (strcmp(name,"P1")==0) return P1Enum;
+              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
+              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
               else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
               else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
               else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
-         else stage=4;
-   }
-   if(stage==4){
-              if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
+              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
               else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
               else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;