Changeset 12004 for issm/branches/trunk-jpl-damage/src/c/modules/EnumToStringx/EnumToStringx.cpp

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (5 diffs)

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

@@ -155 +155 @@
                 case SettingsResultsAsPatchesEnum : return "SettingsResultsAsPatches";
                 case SettingsWaitonlockEnum : return "SettingsWaitonlock";
+                case DebugPetscProfilingEnum : return "DebugPetscProfiling";
+                case PetscProfilingCurrentMemEnum : return "PetscProfilingCurrentMem";
+                case PetscProfilingCurrentFlopsEnum : return "PetscProfilingCurrentFlops";
+                case PetscProfilingSolutionTimeEnum : return "PetscProfilingSolutionTime";
                 case SteadystateMaxiterEnum : return "SteadystateMaxiter";
                 case SteadystateNumRequestedOutputsEnum : return "SteadystateNumRequestedOutputs";
@@ -170 +174 @@
                 case ThermalIsenthalpyEnum : return "ThermalIsenthalpy";
                 case ThicknessEnum : return "Thickness";
+                case TimesteppingStartTimeEnum : return "TimesteppingStartTime";
+                case TimesteppingFinalTimeEnum : return "TimesteppingFinalTime";
                 case TimesteppingCflCoefficientEnum : return "TimesteppingCflCoefficient";
-                case TimesteppingFinalTimeEnum : return "TimesteppingFinalTime";
                 case TimesteppingTimeAdaptEnum : return "TimesteppingTimeAdapt";
                 case TimesteppingTimeStepEnum : return "TimesteppingTimeStep";
@@ -233 +238 @@
                 case BoolInputEnum : return "BoolInput";
                 case BoolParamEnum : return "BoolParam";
+                case ContourEnum : return "Contour";
                 case ControlInputEnum : return "ControlInput";
                 case DatasetInputEnum : return "DatasetInput";
@@ -373 +379 @@
                 case P1Enum : return "P1";
                 case P1DGEnum : return "P1DG";
+                case SaveResultsEnum : return "SaveResults";
                 case BoolElementResultEnum : return "BoolElementResult";
                 case BoolExternalResultEnum : return "BoolExternalResult";
@@ -387 +394 @@
                 case PetscVecExternalResultEnum : return "PetscVecExternalResult";
                 case StringExternalResultEnum : return "StringExternalResult";
+                case StepEnum : return "Step";
                 case TimeEnum : return "Time";
                 case TriaP1ElementResultEnum : return "TriaP1ElementResult";