Changeset 9547

Timestamp:

09/01/11 07:40:34 (14 years ago)

Author:

Mathieu Morlighem

Message:

Synchronized enums

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (5 diffs)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (5 diffs)
• m/enum/ElementEnum.m (added)
• m/enum/FreeEnum.m (added)
• m/enum/OptionDoubleEnum.m (added)
• m/enum/OptionEnum.m (added)
• m/enum/OptionLogicalEnum.m (added)
• m/enum/ParametersAnalysisEnum.m (deleted)
• m/enum/ParametersSolutionEnum.m (deleted)
• m/enum/ResultsEnum.m (added)
• m/enum/SteadystateAnalysisEnum.m (deleted)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -63 +63 @@
         //melting
         MeltingAnalysisEnum,
-        //parameters
-        ParametersSolutionEnum,
-        ParametersAnalysisEnum,
         //steadystate
         SteadystateSolutionEnum,
-        SteadystateAnalysisEnum,
         //flaim
         FlaimSolutionEnum,

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -23 +23 @@
                 case ParametersEnum : return "Parameters";
                 case VerticesEnum : return "Vertices";
+                case ResultsEnum : return "Results";
                 case SolutionTypeEnum : return "SolutionType";
                 case AnalysisTypeEnum : return "AnalysisType";
@@ -54 +55 @@
                 case PrognosticAnalysisEnum : return "PrognosticAnalysis";
                 case MeltingAnalysisEnum : return "MeltingAnalysis";
-                case ParametersSolutionEnum : return "ParametersSolution";
-                case ParametersAnalysisEnum : return "ParametersAnalysis";
                 case SteadystateSolutionEnum : return "SteadystateSolution";
-                case SteadystateAnalysisEnum : return "SteadystateAnalysis";
                 case FlaimSolutionEnum : return "FlaimSolution";
                 case FlaimAnalysisEnum : return "FlaimAnalysis";
@@ -72 +70 @@
                 case HookEnum : return "Hook";
                 case SegmentEnum : return "Segment";
+                case ElementEnum : return "Element";
                 case DofIndexingEnum : return "DofIndexing";
                 case PentaEnum : return "Penta";
@@ -119 +118 @@
                 case AirEnum : return "Air";
                 case MelangeEnum : return "Melange";
+                case FreeEnum : return "Free";
                 case OpenEnum : return "Open";
                 case ClosedEnum : return "Closed";
@@ -317 +317 @@
                 case BilinearInterpEnum : return "BilinearInterp";
                 case NearestInterpEnum : return "NearestInterp";
+                case OptionEnum : return "Option";
                 case OptionCellEnum : return "OptionCell";
                 case OptionCharEnum : return "OptionChar";
                 case OptionStructEnum : return "OptionStruct";
+                case OptionDoubleEnum : return "OptionDouble";
+                case OptionLogicalEnum : return "OptionLogical";
                 case RheologyLawEnum : return "RheologyLaw";
                 case PatersonEnum : return "Paterson";

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

@@ -21 +21 @@
         else if (strcmp(name,"Parameters")==0) return ParametersEnum;
         else if (strcmp(name,"Vertices")==0) return VerticesEnum;
+        else if (strcmp(name,"Results")==0) return ResultsEnum;
         else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum;
         else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum;
@@ -52 +53 @@
         else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum;
         else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
-        else if (strcmp(name,"ParametersSolution")==0) return ParametersSolutionEnum;
-        else if (strcmp(name,"ParametersAnalysis")==0) return ParametersAnalysisEnum;
         else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
-        else if (strcmp(name,"SteadystateAnalysis")==0) return SteadystateAnalysisEnum;
         else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
         else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
@@ -70 +68 @@
         else if (strcmp(name,"Hook")==0) return HookEnum;
         else if (strcmp(name,"Segment")==0) return SegmentEnum;
+        else if (strcmp(name,"Element")==0) return ElementEnum;
         else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
         else if (strcmp(name,"Penta")==0) return PentaEnum;
@@ -117 +116 @@
         else if (strcmp(name,"Air")==0) return AirEnum;
         else if (strcmp(name,"Melange")==0) return MelangeEnum;
+        else if (strcmp(name,"Free")==0) return FreeEnum;
         else if (strcmp(name,"Open")==0) return OpenEnum;
         else if (strcmp(name,"Closed")==0) return ClosedEnum;
@@ -315 +315 @@
         else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
         else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
+        else if (strcmp(name,"Option")==0) return OptionEnum;
         else if (strcmp(name,"OptionCell")==0) return OptionCellEnum;
         else if (strcmp(name,"OptionChar")==0) return OptionCharEnum;
         else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
+        else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum;
+        else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum;
         else if (strcmp(name,"RheologyLaw")==0) return RheologyLawEnum;
         else if (strcmp(name,"Paterson")==0) return PatersonEnum;