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

Timestamp:

07/15/14 11:59:29 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing useless Dakota Enums, now that we have FemModel::Copy

File:

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

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

@@ -178 +178 @@
               else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum;
               else if (strcmp(name,"MaskIceLevelset")==0) return MaskIceLevelsetEnum;
-              else if (strcmp(name,"QmuMaskIceLevelset")==0) return QmuMaskIceLevelsetEnum;
               else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
               else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum;
@@ -191 +190 @@
               else if (strcmp(name,"DamageD")==0) return DamageDEnum;
               else if (strcmp(name,"DamageF")==0) return DamageFEnum;
-              else if (strcmp(name,"QmuDamageD")==0) return QmuDamageDEnum;
               else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
               else if (strcmp(name,"DamageLaw")==0) return DamageLawEnum;
@@ -260 +258 @@
               else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
               else if (strcmp(name,"QmuMassFluxSegmentsPresent")==0) return QmuMassFluxSegmentsPresentEnum;
+              else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
+              else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
-              else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
-              else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
+              if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
               else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
               else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
-              else if (strcmp(name,"QmuMaterialsRheologyB")==0) return QmuMaterialsRheologyBEnum;
               else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
               else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
@@ -383 +380 @@
               else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
               else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
+              else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
+              else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
+              else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
-              else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
-              else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
-              else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
+              if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
               else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
               else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
@@ -506 +503 @@
               else if (strcmp(name,"Fill")==0) return FillEnum;
               else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
+              else if (strcmp(name,"Friction")==0) return FrictionEnum;
+              else if (strcmp(name,"Internal")==0) return InternalEnum;
+              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Friction")==0) return FrictionEnum;
-              else if (strcmp(name,"Internal")==0) return InternalEnum;
-              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
-              else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
+              if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
               else if (strcmp(name,"Misfit")==0) return MisfitEnum;
               else if (strcmp(name,"Pressure")==0) return PressureEnum;
               else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
-              else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
-              else if (strcmp(name,"QmuVx")==0) return QmuVxEnum;
-              else if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
-              else if (strcmp(name,"QmuVz")==0) return QmuVzEnum;
-              else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum;
-              else if (strcmp(name,"QmuBase")==0) return QmuBaseEnum;
-              else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum;
-              else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum;
-              else if (strcmp(name,"QmuVxMesh")==0) return QmuVxMeshEnum;
-              else if (strcmp(name,"QmuVyMesh")==0) return QmuVyMeshEnum;
-              else if (strcmp(name,"QmuVzMesh")==0) return QmuVzMeshEnum;
               else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
               else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
@@ -570 +556 @@
               else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
               else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
-              else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
               else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
               else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
@@ -629 +614 @@
               else if (strcmp(name,"Step")==0) return StepEnum;
               else if (strcmp(name,"Time")==0) return TimeEnum;
-         else stage=6;
-   }
-   if(stage==6){
-              if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
+              else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
               else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
               else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
@@ -647 +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;
@@ -675 +660 @@
               else if (strcmp(name,"Contact")==0) return ContactEnum;
               else if (strcmp(name,"MaskGroundediceLevelset")==0) return MaskGroundediceLevelsetEnum;
-              else if (strcmp(name,"QmuMaskGroundediceLevelset")==0) return QmuMaskGroundediceLevelsetEnum;
               else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
               else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;