Changeset 17883

Timestamp:

04/29/14 14:48:51 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing unused 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) (6 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/HydrologyshreveCREnum.m (deleted)
• m/enum/HydrologyshreveKnEnum.m (deleted)
• m/enum/HydrologyshreveNEnum.m (deleted)
• m/enum/HydrologyshrevePEnum.m (deleted)
• m/enum/HydrologyshreveQEnum.m (deleted)

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

@@ -87 +87 @@
         HydrologyModelEnum,
         HydrologyshreveEnum,
-        HydrologyshreveCREnum,
-        HydrologyshreveKnEnum,
-        HydrologyshreveNEnum,
-        HydrologyshrevePEnum,
-        HydrologyshreveQEnum,
         HydrologyshreveSpcwatercolumnEnum,
         HydrologyshreveStabilizationEnum,

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

@@ -95 +95 @@
                 case HydrologyModelEnum : return "HydrologyModel";
                 case HydrologyshreveEnum : return "Hydrologyshreve";
-                case HydrologyshreveCREnum : return "HydrologyshreveCR";
-                case HydrologyshreveKnEnum : return "HydrologyshreveKn";
-                case HydrologyshreveNEnum : return "HydrologyshreveN";
-                case HydrologyshrevePEnum : return "HydrologyshreveP";
-                case HydrologyshreveQEnum : return "HydrologyshreveQ";
                 case HydrologyshreveSpcwatercolumnEnum : return "HydrologyshreveSpcwatercolumn";
                 case HydrologyshreveStabilizationEnum : return "HydrologyshreveStabilization";

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

@@ -95 +95 @@
               else if (strcmp(name,"HydrologyModel")==0) return HydrologyModelEnum;
               else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum;
-              else if (strcmp(name,"HydrologyshreveCR")==0) return HydrologyshreveCREnum;
-              else if (strcmp(name,"HydrologyshreveKn")==0) return HydrologyshreveKnEnum;
-              else if (strcmp(name,"HydrologyshreveN")==0) return HydrologyshreveNEnum;
-              else if (strcmp(name,"HydrologyshreveP")==0) return HydrologyshrevePEnum;
-              else if (strcmp(name,"HydrologyshreveQ")==0) return HydrologyshreveQEnum;
               else if (strcmp(name,"HydrologyshreveSpcwatercolumn")==0) return HydrologyshreveSpcwatercolumnEnum;
               else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum;
@@ -137 +132 @@
               else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
               else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
-         else stage=2;
-   }
-   if(stage==2){
-              if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
+              else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
               else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;
               else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum;
               else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum;
               else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
-              else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
+         else stage=2;
+   }
+   if(stage==2){
+              if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
               else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum;
               else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
@@ -260 +255 @@
               else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
               else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
-         else stage=3;
-   }
-   if(stage==3){
-              if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
+              else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
               else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
               else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
               else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
               else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
-              else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
+         else stage=3;
+   }
+   if(stage==3){
+              if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
               else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
               else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
@@ -383 +378 @@
               else if (strcmp(name,"MeshdeformationSolution")==0) return MeshdeformationSolutionEnum;
               else if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
-         else stage=4;
-   }
-   if(stage==4){
-              if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
+              else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
               else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
               else if (strcmp(name,"LsfReinitializationAnalysis")==0) return LsfReinitializationAnalysisEnum;
               else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
               else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
-              else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
+         else stage=4;
+   }
+   if(stage==4){
+              if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
               else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
               else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
@@ -506 +501 @@
               else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
               else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
-         else stage=5;
-   }
-   if(stage==5){
-              if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
+              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
               else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
               else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
               else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
-              else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
+         else stage=5;
+   }
+   if(stage==5){
+              if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
               else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
               else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
@@ -629 +624 @@
               else if (strcmp(name,"MinVz")==0) return MinVzEnum;
               else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
-         else stage=6;
-   }
-   if(stage==6){
-              if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
+              else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
               else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
               else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
               else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
               else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
-              else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
+         else stage=6;
+   }
+   if(stage==6){
+              if (strcmp(name,"Incremental")==0) return IncrementalEnum;
               else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
               else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;

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

@@ -87 +87 @@
 def HydrologyModelEnum(): return StringToEnum("HydrologyModel")[0]
 def HydrologyshreveEnum(): return StringToEnum("Hydrologyshreve")[0]
-def HydrologyshreveCREnum(): return StringToEnum("HydrologyshreveCR")[0]
-def HydrologyshreveKnEnum(): return StringToEnum("HydrologyshreveKn")[0]
-def HydrologyshreveNEnum(): return StringToEnum("HydrologyshreveN")[0]
-def HydrologyshrevePEnum(): return StringToEnum("HydrologyshreveP")[0]
-def HydrologyshreveQEnum(): return StringToEnum("HydrologyshreveQ")[0]
 def HydrologyshreveSpcwatercolumnEnum(): return StringToEnum("HydrologyshreveSpcwatercolumn")[0]
 def HydrologyshreveStabilizationEnum(): return StringToEnum("HydrologyshreveStabilization")[0]