Changeset 18383

Timestamp:

08/13/14 14:16:02 (11 years ago)

Author:

Mathieu Morlighem

Message:

DEL: duplicate enums

Location:

issm/trunk-jpl/src

Files:

• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (3 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/StressEnum.m (deleted)
• m/enum/StressxxEnum.m (deleted)
• m/enum/StressxyEnum.m (deleted)
• m/enum/StressxzEnum.m (deleted)
• m/enum/StressyyEnum.m (deleted)
• m/enum/StressyzEnum.m (deleted)
• m/enum/StresszzEnum.m (deleted)

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

@@ -570 +570 @@
         DeviatoricStressyzEnum,
         DeviatoricStresszzEnum,
-        StressEnum,
-        StressxxEnum,
-        StressxyEnum,
-        StressxzEnum,
-        StressyyEnum,
-        StressyzEnum,
-        StresszzEnum,
         StrainRateEnum,
         StrainRatexxEnum,

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

@@ -561 +561 @@
                 case DeviatoricStressyzEnum : return "DeviatoricStressyz";
                 case DeviatoricStresszzEnum : return "DeviatoricStresszz";
-                case StressEnum : return "Stress";
-                case StressxxEnum : return "Stressxx";
-                case StressxyEnum : return "Stressxy";
-                case StressxzEnum : return "Stressxz";
-                case StressyyEnum : return "Stressyy";
-                case StressyzEnum : return "Stressyz";
-                case StresszzEnum : return "Stresszz";
                 case StrainRateEnum : return "StrainRate";
                 case StrainRatexxEnum : return "StrainRatexx";

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

@@ -573 +573 @@
               else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
               else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
-              else if (strcmp(name,"Stress")==0) return StressEnum;
-              else if (strcmp(name,"Stressxx")==0) return StressxxEnum;
-              else if (strcmp(name,"Stressxy")==0) return StressxyEnum;
-              else if (strcmp(name,"Stressxz")==0) return StressxzEnum;
-              else if (strcmp(name,"Stressyy")==0) return StressyyEnum;
-              else if (strcmp(name,"Stressyz")==0) return StressyzEnum;
-              else if (strcmp(name,"Stresszz")==0) return StresszzEnum;
               else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
               else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
@@ -629 +622 @@
               else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
               else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
-         else stage=6;
-   }
-   if(stage==6){
-              if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
+              else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
               else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
               else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
@@ -639 +629 @@
               else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
               else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
-              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
+         else stage=6;
+   }
+   if(stage==6){
+              if (strcmp(name,"MinVel")==0) return MinVelEnum;
               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
               else if (strcmp(name,"MinVx")==0) return MinVxEnum;

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -553 +553 @@
 def DeviatoricStressyzEnum(): return StringToEnum("DeviatoricStressyz")[0]
 def DeviatoricStresszzEnum(): return StringToEnum("DeviatoricStresszz")[0]
-def StressEnum(): return StringToEnum("Stress")[0]
-def StressxxEnum(): return StringToEnum("Stressxx")[0]
-def StressxyEnum(): return StringToEnum("Stressxy")[0]
-def StressxzEnum(): return StringToEnum("Stressxz")[0]
-def StressyyEnum(): return StringToEnum("Stressyy")[0]
-def StressyzEnum(): return StringToEnum("Stressyz")[0]
-def StresszzEnum(): return StringToEnum("Stresszz")[0]
 def StrainRateEnum(): return StringToEnum("StrainRate")[0]
 def StrainRatexxEnum(): return StringToEnum("StrainRatexx")[0]