Changeset 4032

Timestamp:

06/10/10 10:02:35 (15 years ago)

Author:

Eric.Larour

Message:

New synchronized enums

Location:

issm/trunk/src/c/EnumDefinitions

Files:

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

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

@@ -25 +25 @@
                 case ResultsEnum : return "Results";
                 case VerticesEnum : return "Vertices";
-                case AnalysisEnum : return "Analysis";
+                case SolutionTypeEnum : return "SolutionType";
+                case DiagnosticSolutionEnum : return "DiagnosticSolution";
+                case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution";
+                case BedSlopeSolutionEnum : return "BedSlopeSolution";
                 case AnalysisTypeEnum : return "AnalysisType";
                 case SubAnalysisTypeEnum : return "SubAnalysisType";
@@ -44 +47 @@
                 case TransientAnalysisEnum : return "TransientAnalysis";
                 case SteadyAnalysisEnum : return "SteadyAnalysis";
-                case SurfaceAnalysisEnum : return "SurfaceAnalysis";
                 case SlopeComputeAnalysisEnum : return "SlopeComputeAnalysis";
-                case BedXAnalysisEnum : return "BedXAnalysis";
-                case BedYAnalysisEnum : return "BedYAnalysis";
-                case BedAnalysisEnum : return "BedAnalysis";
-                case SurfaceXAnalysisEnum : return "SurfaceXAnalysis";
-                case SurfaceYAnalysisEnum : return "SurfaceYAnalysis";
+                case BedSlopeXAnalysisEnum : return "BedSlopeXAnalysis";
+                case BedSlopeYAnalysisEnum : return "BedSlopeYAnalysis";
+                case SurfaceSlopeXAnalysisEnum : return "SurfaceSlopeXAnalysis";
+                case SurfaceSlopeYAnalysisEnum : return "SurfaceSlopeYAnalysis";
                 case Balancedthickness2AnalysisEnum : return "Balancedthickness2Analysis";
                 case BalancedthicknessAnalysisEnum : return "BalancedthicknessAnalysis";

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

@@ -23 +23 @@
         else if (strcmp(name,"Results")==0) return ResultsEnum;
         else if (strcmp(name,"Vertices")==0) return VerticesEnum;
-        else if (strcmp(name,"Analysis")==0) return AnalysisEnum;
+        else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum;
+        else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum;
+        else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
+        else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
         else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum;
         else if (strcmp(name,"SubAnalysisType")==0) return SubAnalysisTypeEnum;
@@ -42 +45 @@
         else if (strcmp(name,"TransientAnalysis")==0) return TransientAnalysisEnum;
         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,"BedXAnalysis")==0) return BedXAnalysisEnum;
-        else if (strcmp(name,"BedYAnalysis")==0) return BedYAnalysisEnum;
-        else if (strcmp(name,"BedAnalysis")==0) return BedAnalysisEnum;
-        else if (strcmp(name,"SurfaceXAnalysis")==0) return SurfaceXAnalysisEnum;
-        else if (strcmp(name,"SurfaceYAnalysis")==0) return SurfaceYAnalysisEnum;
+        else if (strcmp(name,"BedSlopeXAnalysis")==0) return BedSlopeXAnalysisEnum;
+        else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum;
+        else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum;
+        else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum;
         else if (strcmp(name,"Balancedthickness2Analysis")==0) return Balancedthickness2AnalysisEnum;
         else if (strcmp(name,"BalancedthicknessAnalysis")==0) return BalancedthicknessAnalysisEnum;