Changeset 11963

Timestamp:

04/11/12 13:49:07 (13 years ago)

Author:

habbalf

Message:

StringToEnum for PETSc profiling

File:

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

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

@@ -156 +156 @@
               else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum;
               else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
+              else if (strcmp(name,"DebugPetscProfiling")==0) return DebugPetscProfilingEnum;
+              else if (strcmp(name,"PetscProfilingCurrentMem")==0) return PetscProfilingCurrentMemEnum;
+              else if (strcmp(name,"PetscProfilingCurrentFlops")==0) return PetscProfilingCurrentFlopsEnum;
+              else if (strcmp(name,"PetscProfilingSolutionTime")==0) return PetscProfilingSolutionTimeEnum;
               else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
               else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
@@ -258 +262 @@
               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,"Node")==0) return NodeEnum;
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
+<<<<<<< .mine
+              else if (strcmp(name,"Pengrid")==0) return PengridEnum;
+=======
          else stage=3;
    }
@@ -266 +276 @@
               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;
@@ -382 +393 @@
               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,"DoubleElementResult")==0) return DoubleElementResultEnum;
+<<<<<<< .mine
+              else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
+=======
          else stage=4;
    }
@@ -390 +407 @@
               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;