Changeset 4019

Timestamp:

06/03/10 15:01:19 (15 years ago)

Author:

Mathieu Morlighem

Message:

updated enums

Location:

issm/trunk/src/c/EnumDefinitions

Files:

• EnumAsString.cpp (modified) (4 diffs)
• StringAsEnum.cpp (modified) (4 diffs)

issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp

@@ -45 +45 @@
                 case SteadyAnalysisEnum : return "SteadyAnalysis";
                 case SurfaceAnalysisEnum : return "SurfaceAnalysis";
-                case SlopecomputeAnalysisEnum : return "SlopecomputeAnalysis";
+                case SlopeComputeAnalysisEnum : return "SlopeComputeAnalysis";
                 case BedXAnalysisEnum : return "BedXAnalysis";
                 case BedYAnalysisEnum : return "BedYAnalysis";
@@ -127 +127 @@
                 case ArtDiffEnum : return "ArtDiff";
                 case BedEnum : return "Bed";
-                case BedSlopexEnum : return "BedSlopex";
-                case BedSlopeyEnum : return "BedSlopey";
+                case BedSlopeXEnum : return "BedSlopeX";
+                case BedSlopeYEnum : return "BedSlopeY";
                 case BoundaryEnum : return "Boundary";
                 case CmMaxDmpSlopeEnum : return "CmMaxDmpSlope";
@@ -169 +169 @@
                 case PflagEnum : return "Pflag";
                 case PressureEnum : return "Pressure";
+                case PressureOldEnum : return "PressureOld";
                 case ResetPenaltiesEnum : return "ResetPenalties";
                 case RheologyBEnum : return "RheologyB";
@@ -177 +178 @@
                 case SurfaceAreaEnum : return "SurfaceArea";
                 case SurfaceEnum : return "Surface";
-                case SurfaceSlopexEnum : return "SurfaceSlopex";
-                case SurfaceSlopeyEnum : return "SurfaceSlopey";
+                case SurfaceSlopeXEnum : return "SurfaceSlopeX";
+                case SurfaceSlopeYEnum : return "SurfaceSlopeY";
                 case TemperatureEnum : return "Temperature";
                 case TemperatureAverageEnum : return "TemperatureAverage";

issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp

@@ -43 +43 @@
         else if (strcmp(name,"SteadyAnalysis")==0) return SteadyAnalysisEnum;
         else if (strcmp(name,"SurfaceAnalysis")==0) return SurfaceAnalysisEnum;
-        else if (strcmp(name,"SlopecomputeAnalysis")==0) return SlopecomputeAnalysisEnum;
+        else if (strcmp(name,"SlopeComputeAnalysis")==0) return SlopeComputeAnalysisEnum;
         else if (strcmp(name,"BedXAnalysis")==0) return BedXAnalysisEnum;
         else if (strcmp(name,"BedYAnalysis")==0) return BedYAnalysisEnum;
@@ -125 +125 @@
         else if (strcmp(name,"ArtDiff")==0) return ArtDiffEnum;
         else if (strcmp(name,"Bed")==0) return BedEnum;
-        else if (strcmp(name,"BedSlopex")==0) return BedSlopexEnum;
-        else if (strcmp(name,"BedSlopey")==0) return BedSlopeyEnum;
+        else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum;
+        else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum;
         else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
         else if (strcmp(name,"CmMaxDmpSlope")==0) return CmMaxDmpSlopeEnum;
@@ -167 +167 @@
         else if (strcmp(name,"Pflag")==0) return PflagEnum;
         else if (strcmp(name,"Pressure")==0) return PressureEnum;
+        else if (strcmp(name,"PressureOld")==0) return PressureOldEnum;
         else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
         else if (strcmp(name,"RheologyB")==0) return RheologyBEnum;
@@ -175 +176 @@
         else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
         else if (strcmp(name,"Surface")==0) return SurfaceEnum;
-        else if (strcmp(name,"SurfaceSlopex")==0) return SurfaceSlopexEnum;
-        else if (strcmp(name,"SurfaceSlopey")==0) return SurfaceSlopeyEnum;
+        else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
+        else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
         else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
         else if (strcmp(name,"TemperatureAverage")==0) return TemperatureAverageEnum;