Changeset 12270

Timestamp:

05/18/12 16:30:33 (13 years ago)

Author:

habbalf

Message:

Added convergence flag for reaching maximum number of iterations

File:

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

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

@@ -160 +160 @@
               else if (strcmp(name,"PetscProfilingCurrentFlops")==0) return PetscProfilingCurrentFlopsEnum;
               else if (strcmp(name,"PetscProfilingSolutionTime")==0) return PetscProfilingSolutionTimeEnum;
+              else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
               else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
               else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
@@ -259 +260 @@
               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,"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;
@@ -382 +383 @@
               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,"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;