Changeset 17984

Timestamp:

05/13/14 11:40:46 (11 years ago)

Author:

schlegel

Message:

CHG: add timestepping enum

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -283 +283 @@
         TimesteppingTimeAdaptEnum,
         TimesteppingTimeStepEnum,
+        TimesteppingInterpForcingsEnum,
         TransientIsstressbalanceEnum,
         TransientIsgroundinglineEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -291 +291 @@
                 case TimesteppingTimeAdaptEnum : return "TimesteppingTimeAdapt";
                 case TimesteppingTimeStepEnum : return "TimesteppingTimeStep";
+                case TimesteppingInterpForcingsEnum : return "TimesteppingInterpForcings";
                 case TransientIsstressbalanceEnum : return "TransientIsstressbalance";
                 case TransientIsgroundinglineEnum : return "TransientIsgroundingline";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -297 +297 @@
               else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
               else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
+              else if (strcmp(name,"TimesteppingInterpForcings")==0) return TimesteppingInterpForcingsEnum;
               else if (strcmp(name,"TransientIsstressbalance")==0) return TransientIsstressbalanceEnum;
               else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
@@ -382 +383 @@
               else if (strcmp(name,"SmoothedSurfaceSlopeXAnalysis")==0) return SmoothedSurfaceSlopeXAnalysisEnum;
               else if (strcmp(name,"SmoothedSurfaceSlopeYAnalysis")==0) return SmoothedSurfaceSlopeYAnalysisEnum;
-              else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
+              if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
+              else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
               else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
@@ -505 +506 @@
               else if (strcmp(name,"QmuBase")==0) return QmuBaseEnum;
               else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum;
-              else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"QmuVxMesh")==0) return QmuVxMeshEnum;
+              if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum;
+              else if (strcmp(name,"QmuVxMesh")==0) return QmuVxMeshEnum;
               else if (strcmp(name,"QmuVyMesh")==0) return QmuVyMeshEnum;
               else if (strcmp(name,"QmuVzMesh")==0) return QmuVzMeshEnum;
@@ -628 +629 @@
               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
               else if (strcmp(name,"MinVx")==0) return MinVxEnum;
-              else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum;
+              if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
+              else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum;
               else if (strcmp(name,"MinVy")==0) return MinVyEnum;
               else if (strcmp(name,"MaxVy")==0) return MaxVyEnum;