Changeset 11965

Timestamp:

04/11/12 15:48:28 (13 years ago)

Author:

habbalf

Message:

Removed stray remarks

File:

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

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

@@ -260 +260 @@
               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 stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"Node")==0) return NodeEnum;
+              if (strcmp(name,"Matice")==0) return MaticeEnum;
+              else if (strcmp(name,"Matpar")==0) return MatparEnum;
+              else if (strcmp(name,"Node")==0) return NodeEnum;
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
-<<<<<<< .mine
-              else if (strcmp(name,"Pengrid")==0) return PengridEnum;
-=======
-         else stage=3;
-   }
-   if(stage==3){
-              if (strcmp(name,"Param")==0) return ParamEnum;
+              else if (strcmp(name,"Param")==0) return ParamEnum;
               else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
               else if (strcmp(name,"Pengrid")==0) return PengridEnum;
->>>>>>> .r11959
               else if (strcmp(name,"Penpair")==0) return PenpairEnum;
               else if (strcmp(name,"Penta")==0) return PentaEnum;
@@ -390 +383 @@
               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 stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
-<<<<<<< .mine
-              else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
-=======
-         else stage=4;
-   }
-   if(stage==4){
-              if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
+              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 if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
               else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
               else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
               else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
->>>>>>> .r11959
               else if (strcmp(name,"J")==0) return JEnum;
               else if (strcmp(name,"Patch")==0) return PatchEnum;