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

Timestamp:

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

Author:

Mathieu Morlighem

Message:

DEL: duplicate enums

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (3 diffs)

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;