Changeset 9546

Timestamp:

09/01/11 07:31:02 (14 years ago)

Author:

Mathieu Morlighem

Message:

removed all fake enums

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (33 diffs)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (32 diffs)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (32 diffs)
• m/enum/BorderstokesEnum.m (deleted)
• m/enum/DakotaParameterEnum.m (deleted)
• m/enum/DatasetsEnum.m (deleted)
• m/enum/DiagnosticAnalysisEnum.m (deleted)
• m/enum/ElementEnum.m (deleted)
• m/enum/ElementOnIceSheetEnum.m (deleted)
• m/enum/ElementPropertiesEnum.m (deleted)
• m/enum/Fake0Enum.m (deleted)
• m/enum/Fake10Enum.m (deleted)
• m/enum/Fake11Enum.m (deleted)
• m/enum/Fake12Enum.m (deleted)
• m/enum/Fake13Enum.m (deleted)
• m/enum/Fake14Enum.m (deleted)
• m/enum/Fake16Enum.m (deleted)
• m/enum/Fake17Enum.m (deleted)
• m/enum/Fake18Enum.m (deleted)
• m/enum/Fake19Enum.m (deleted)
• m/enum/Fake1Enum.m (deleted)
• m/enum/Fake20Enum.m (deleted)
• m/enum/Fake21Enum.m (deleted)
• m/enum/Fake22Enum.m (deleted)
• m/enum/Fake23Enum.m (deleted)
• m/enum/Fake24Enum.m (deleted)
• m/enum/Fake25Enum.m (deleted)
• m/enum/Fake26Enum.m (deleted)
• m/enum/Fake27Enum.m (deleted)
• m/enum/Fake28Enum.m (deleted)
• m/enum/Fake29Enum.m (deleted)
• m/enum/Fake2Enum.m (deleted)
• m/enum/Fake30Enum.m (deleted)
• m/enum/Fake31Enum.m (deleted)
• m/enum/Fake32Enum.m (deleted)
• m/enum/Fake33Enum.m (deleted)
• m/enum/Fake34Enum.m (deleted)
• m/enum/Fake35Enum.m (deleted)
• m/enum/Fake36Enum.m (deleted)
• m/enum/Fake37Enum.m (deleted)
• m/enum/Fake38Enum.m (deleted)
• m/enum/Fake39Enum.m (deleted)
• m/enum/Fake3Enum.m (deleted)
• m/enum/Fake40Enum.m (deleted)
• m/enum/Fake41Enum.m (deleted)
• m/enum/Fake42Enum.m (deleted)
• m/enum/Fake43Enum.m (deleted)
• m/enum/Fake44Enum.m (deleted)
• m/enum/Fake4Enum.m (deleted)
• m/enum/Fake5Enum.m (deleted)
• m/enum/Fake6Enum.m (deleted)
• m/enum/Fake7Enum.m (deleted)
• m/enum/Fake8Enum.m (deleted)
• m/enum/Fake9Enum.m (deleted)
• m/enum/FreeEnum.m (deleted)
• m/enum/GeographyEnum.m (deleted)
• m/enum/GlMeltingRateEnum.m (deleted)
• m/enum/GradientAnalysisEnum.m (deleted)
• m/enum/InputfilenameEnum.m (deleted)
• m/enum/InverseAnalysisEnum.m (deleted)
• m/enum/KflagEnum.m (deleted)
• m/enum/LoadEnum.m (deleted)
• m/enum/MaterialEnum.m (deleted)
• m/enum/MiniEnum.m (deleted)
• m/enum/NodePropertiesEnum.m (deleted)
• m/enum/NumOutputEnum.m (deleted)
• m/enum/NumberOfNodesEnum.m (deleted)
• m/enum/NumberOfVariablesEnum.m (deleted)
• m/enum/ObjectEnum.m (deleted)
• m/enum/OptionDoubleEnum.m (deleted)
• m/enum/OptionEnum.m (deleted)
• m/enum/OptionLogicalEnum.m (deleted)
• m/enum/PetscRcEnum.m (deleted)
• m/enum/PflagEnum.m (deleted)
• m/enum/QmuMassFluxNumProfilesEnum.m (deleted)
• m/enum/QmuRheologyBEnum.m (deleted)
• m/enum/QuadRiftFrontEnum.m (deleted)
• m/enum/ResidualEnum.m (deleted)
• m/enum/ResultsEnum.m (deleted)
• m/enum/SteadyAnalysisEnum.m (deleted)
• m/enum/TransientAnalysisEnum.m (deleted)
• m/enum/VelAbsGradientEnum.m (deleted)
• m/enum/VerboseBinaryEnum.m (deleted)
• m/enum/VzAverageEnum.m (deleted)

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

@@ -13 +13 @@
         /*Datasets {{{1*/
         ConstraintsEnum,
-        DatasetsEnum,
         ElementsEnum,
         LoadsEnum,
@@ -19 +18 @@
         NodesEnum,
         ParametersEnum,
+        VerticesEnum,
         ResultsEnum,
-        VerticesEnum,
         /*}}}*/
         /*Solution types {{{1 */
@@ -31 +30 @@
         //diagnostic
         DiagnosticSolutionEnum,
-        DiagnosticAnalysisEnum,
         DiagnosticHorizAnalysisEnum,
         DiagnosticVertAnalysisEnum,
@@ -40 +38 @@
         AdjointBalancethicknessAnalysisEnum,
         ControlAnalysisEnum,
-        GradientAnalysisEnum,
-        InverseAnalysisEnum,
         //thermal
         ThermalSolutionEnum,
@@ -51 +47 @@
         TransientSolutionEnum,
         GroundinglineMigration2DSolutionEnum,
-        SteadyAnalysisEnum,
-        TransientAnalysisEnum, // needed by nighly run (to be removed at some point?)
         //slope
         BedSlopeSolutionEnum,
@@ -65 +59 @@
         BalancethicknessSolutionEnum,
         BalancethicknessAnalysisEnum,
-        Fake31Enum,
-        Fake32Enum,
         PrognosticSolutionEnum,
         PrognosticAnalysisEnum,
@@ -95 +87 @@
         /*}}}*/
         /*Objects {{{1*/
-        ObjectEnum,
         HookEnum,
         SegmentEnum,
@@ -101 +92 @@
         ElementEnum,
         DofIndexingEnum,
-        ElementPropertiesEnum,
-        NodePropertiesEnum,
         PentaEnum,
         TriaEnum,
@@ -109 +98 @@
         VertexEnum,
         /*Loads: */
-        LoadEnum,
         IcefrontEnum,
         NumericalfluxEnum,
         PengridEnum,
         PenpairEnum,
-        QuadRiftFrontEnum,
         RiftfrontEnum,
         SegmentRiftfrontEnum,
@@ -122 +109 @@
         StokesIceFrontEnum,
         /*Materials: */
-        MaterialEnum,
         MaticeEnum,
         MatparEnum,
@@ -132 +118 @@
         PentaVertexInputEnum,
         TriaVertexInputEnum,
-        Fake0Enum, 
-        Fake1Enum,
         ControlInputEnum,
         /*Params: */
@@ -157 +141 @@
         /*}}}*/
         /*Geography {{{1*/
-        GeographyEnum,
         IceSheetEnum,
         IceShelfEnum,
@@ -177 +160 @@
         AdjointzEnum,
         AdjointpEnum,
-        Fake35Enum,
         BedEnum,
         BathymetryEnum,
@@ -185 +167 @@
         CmResponseEnum,
         CmResponsesEnum,
-        Fake2Enum,
         ConstantEnum,
-        Fake37Enum,
         ControlTypeEnum,
         ConvergedEnum,
-        Fake3Enum,
         DragCoefficientEnum,
         DragPEnum,
         DragQEnum,
-        Fake41Enum,
         DtEnum,
         TimeAdaptEnum,
@@ -202 +180 @@
         ElementOnSurfaceEnum,
         ElementOnWaterEnum,
-        Fake4Enum,
         FillEnum,
         FractionIncrementEnum,
         FrictionEnum,
-        Fake5Enum,
         HydrostaticAdjustmentEnum,
         InternalEnum,
-        KflagEnum,
         IuToExtEnum,
         ExtToIuEnum,
@@ -220 +195 @@
         SurfaceAverageVelMisfitEnum,
         MaxPenetrationEnum,
-        Fake6Enum,
         MeltingOffsetEnum,
         GroundinglineMeltingRateEnum,
@@ -231 +205 @@
         NumberNodeToElementConnectivityEnum,
         PenaltyOffsetEnum,
-        PflagEnum,
         PressureEnum,
         PressurePicardEnum,
@@ -243 +216 @@
         ShelfDampeningEnum,
         StabilizeConstraintsEnum,
-        Fake7Enum,
         SurfaceAccumulationRateEnum,
         SurfaceAblationRateEnum,
@@ -271 +243 @@
         VyPicardEnum,
         QmuVyEnum,
-        VzAverageEnum,
         VzEnum,
         VzObsEnum,
@@ -285 +256 @@
         P1Enum,
         P1DGEnum,
-        MiniEnum,
         /*}}}*/
         /*Results{{{1*/
@@ -305 +275 @@
         TimeEnum,
         OutputFrequencyEnum,
-        Fake8Enum,
         WaterColumnOldEnum,
-        Fake34Enum,
         /*}}}*/
         /*Io{{{1*/
@@ -327 +295 @@
         /*Convergence{{{1*/
         RelativeEnum,
-        ResidualEnum,
         AbsoluteEnum,
         IncrementalEnum,
@@ -340 +307 @@
         RhoWaterEnum,
         GravityEnum,
-        Fake9Enum,
         BasalMeltingRateCorrectionEnum,
-        Fake44Enum,
         MixedLayerCapacityEnum,
         ThermalExchangeVelocityEnum,
@@ -366 +331 @@
         ConnectivityEnum,
         ControlSteadyEnum,
-        DakotaParameterEnum,
         DimEnum,
         EpsAbsEnum,
@@ -372 +336 @@
         EpsRelEnum,
         EpsResEnum,
-        Fake10Enum,
-        Fake29Enum,
-        Fake11Enum,
-        Fake12Enum,
-        Fake13Enum,
-        Fake14Enum,
         LowmemEnum,
-        Fake16Enum,
         MaxNonlinearIterationsEnum,
-        Fake17Enum,
         MinMechanicalConstraintsEnum,
         MinThermalConstraintsEnum,
-        Fake18Enum,
         NdtEnum,
-        NumOutputEnum,
         NumriftsEnum,
         NumberOfElementsEnum,
-        NumberOfNodesEnum,
         NumberOfVerticesEnum,
-        Fake19Enum,
         OutputFilePointerEnum,
-        Fake20Enum,
-        Fake21Enum,
-        Fake42Enum,
         QmuAnalysisEnum,
         QmuErrNameEnum,
         QmuInNameEnum,
         QmuMassFluxSegmentsEnum,
-        Fake39Enum,
         QmuOutNameEnum,
         QmuPartEnum,
         QmuNumberOfResponsesEnum,
-        Fake43Enum,
         IndexedEnum,
         RegularEnum,
@@ -411 +358 @@
         NodalEnum,
         ResponsedescriptorsEnum,
-        PetscRcEnum,
-        Fake40Enum,
-        Fake22Enum,
         VariabledescriptorsEnum,
         VerboseEnum,
-        Fake23Enum,
         PetscOptionsStringsEnum,
         PetscOptionsAnalysesEnum,
@@ -434 +377 @@
         OptionCellEnum,
         OptionCharEnum,
+        OptionStructEnum,
         OptionDoubleEnum,
         OptionLogicalEnum,
-        OptionStructEnum,
         /*}}}*/
         /*Rheology law (move too Material) {{{1*/
@@ -446 +389 @@
         VyMeshEnum,
         VzMeshEnum,
-        Fake24Enum,
-        Fake25Enum,
-        Fake26Enum,
         EnthalpySolutionEnum,
         EnthalpyAnalysisEnum,
         EnthalpyEnum,
         EnthalpyPicardEnum,
-        Fake27Enum,
-        Fake28Enum,
         ThicknessAbsGradientEnum,
-        VelAbsGradientEnum,
         DatasetInputEnum,
-        Fake38Enum,
         StepResponsesEnum,
         IntMatParamEnum,
@@ -469 +405 @@
         SpcvyEnum,
         HydroQEnum,
-        VerboseBinaryEnum,
         NodeOnWaterEnum,
         YEnum,
-        GlMeltingRateEnum,
         ElementsTypeEnum,
         PenaltiesEnum,
@@ -482 +416 @@
         HydroKnEnum,
         GEnum,
-        InputfilenameEnum,
         SpcvzEnum,
-        Fake33Enum,
         NumberOfNodes2DEnum,
         NodeOnStokesEnum,
         NodeOnHutterEnum,
         ZEnum,
-        Fake36Enum,
         RiftsEnum,
-        ElementOnIceSheetEnum,
         SpcthicknessEnum,
         SpctemperatureEnum,
@@ -508 +438 @@
         ArtificialDiffusivityEnum,
         HydroNEnum,
-        BorderstokesEnum,
         NumlayersEnum,
         DiagnosticRefEnum,
@@ -532 +461 @@
         EpsvelEnum,
         MeanvelEnum,
-        Fake30Enum,
         OutputfilenameEnum,
         WaterfractionEnum,
         WatercolumnEnum,
         WaitonlockEnum,
-        NumberOfVariablesEnum,
         NumberOfResponsesEnum,
         NpartEnum,
-        QmuMassFluxNumProfilesEnum,
         PartEnum,
         MaxSteadystateIterationsEnum,
@@ -548 +474 @@
         ViscousHeatingEnum,
         QmuTemperatureEnum,
-        QmuRheologyBEnum,
         HydrologyWaterVxEnum,
         HydrologyWaterVyEnum,

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

@@ -17 +17 @@
 
                 case ConstraintsEnum : return "Constraints";
-                case DatasetsEnum : return "Datasets";
                 case ElementsEnum : return "Elements";
                 case LoadsEnum : return "Loads";
@@ -23 +22 @@
                 case NodesEnum : return "Nodes";
                 case ParametersEnum : return "Parameters";
-                case ResultsEnum : return "Results";
                 case VerticesEnum : return "Vertices";
                 case SolutionTypeEnum : return "SolutionType";
@@ -30 +28 @@
                 case AnalysisCounterEnum : return "AnalysisCounter";
                 case DiagnosticSolutionEnum : return "DiagnosticSolution";
-                case DiagnosticAnalysisEnum : return "DiagnosticAnalysis";
                 case DiagnosticHorizAnalysisEnum : return "DiagnosticHorizAnalysis";
                 case DiagnosticVertAnalysisEnum : return "DiagnosticVertAnalysis";
@@ -38 +35 @@
                 case AdjointBalancethicknessAnalysisEnum : return "AdjointBalancethicknessAnalysis";
                 case ControlAnalysisEnum : return "ControlAnalysis";
-                case GradientAnalysisEnum : return "GradientAnalysis";
-                case InverseAnalysisEnum : return "InverseAnalysis";
                 case ThermalSolutionEnum : return "ThermalSolution";
                 case ThermalAnalysisEnum : return "ThermalAnalysis";
@@ -46 +41 @@
                 case TransientSolutionEnum : return "TransientSolution";
                 case GroundinglineMigration2DSolutionEnum : return "GroundinglineMigration2DSolution";
-                case SteadyAnalysisEnum : return "SteadyAnalysis";
-                case TransientAnalysisEnum : return "TransientAnalysis";
                 case BedSlopeSolutionEnum : return "BedSlopeSolution";
                 case BedSlopeAnalysisEnum : return "BedSlopeAnalysis";
@@ -58 +51 @@
                 case BalancethicknessSolutionEnum : return "BalancethicknessSolution";
                 case BalancethicknessAnalysisEnum : return "BalancethicknessAnalysis";
-                case Fake31Enum : return "Fake31";
-                case Fake32Enum : return "Fake32";
                 case PrognosticSolutionEnum : return "PrognosticSolution";
                 case PrognosticAnalysisEnum : return "PrognosticAnalysis";
@@ -79 +70 @@
                 case PattynStokesApproximationEnum : return "PattynStokesApproximation";
                 case StokesApproximationEnum : return "StokesApproximation";
-                case ObjectEnum : return "Object";
                 case HookEnum : return "Hook";
                 case SegmentEnum : return "Segment";
-                case ElementEnum : return "Element";
                 case DofIndexingEnum : return "DofIndexing";
-                case ElementPropertiesEnum : return "ElementProperties";
-                case NodePropertiesEnum : return "NodeProperties";
                 case PentaEnum : return "Penta";
                 case TriaEnum : return "Tria";
                 case NodeEnum : return "Node";
                 case VertexEnum : return "Vertex";
-                case LoadEnum : return "Load";
                 case IcefrontEnum : return "Icefront";
                 case NumericalfluxEnum : return "Numericalflux";
                 case PengridEnum : return "Pengrid";
                 case PenpairEnum : return "Penpair";
-                case QuadRiftFrontEnum : return "QuadRiftFront";
                 case RiftfrontEnum : return "Riftfront";
                 case SegmentRiftfrontEnum : return "SegmentRiftfront";
@@ -102 +87 @@
                 case PattynIceFrontEnum : return "PattynIceFront";
                 case StokesIceFrontEnum : return "StokesIceFront";
-                case MaterialEnum : return "Material";
                 case MaticeEnum : return "Matice";
                 case MatparEnum : return "Matpar";
@@ -111 +95 @@
                 case PentaVertexInputEnum : return "PentaVertexInput";
                 case TriaVertexInputEnum : return "TriaVertexInput";
-                case Fake0Enum : return "Fake0";
-                case Fake1Enum : return "Fake1";
                 case ControlInputEnum : return "ControlInput";
                 case ParamEnum : return "Param";
@@ -131 +113 @@
                 case SpcStaticEnum : return "SpcStatic";
                 case SpcTransientEnum : return "SpcTransient";
-                case GeographyEnum : return "Geography";
                 case IceSheetEnum : return "IceSheet";
                 case IceShelfEnum : return "IceShelf";
@@ -138 +119 @@
                 case AirEnum : return "Air";
                 case MelangeEnum : return "Melange";
-                case FreeEnum : return "Free";
                 case OpenEnum : return "Open";
                 case ClosedEnum : return "Closed";
@@ -145 +125 @@
                 case AdjointzEnum : return "Adjointz";
                 case AdjointpEnum : return "Adjointp";
-                case Fake35Enum : return "Fake35";
                 case BedEnum : return "Bed";
                 case BathymetryEnum : return "Bathymetry";
@@ -153 +132 @@
                 case CmResponseEnum : return "CmResponse";
                 case CmResponsesEnum : return "CmResponses";
-                case Fake2Enum : return "Fake2";
                 case ConstantEnum : return "Constant";
-                case Fake37Enum : return "Fake37";
                 case ControlTypeEnum : return "ControlType";
                 case ConvergedEnum : return "Converged";
-                case Fake3Enum : return "Fake3";
                 case DragCoefficientEnum : return "DragCoefficient";
                 case DragPEnum : return "DragP";
                 case DragQEnum : return "DragQ";
-                case Fake41Enum : return "Fake41";
                 case DtEnum : return "Dt";
                 case TimeAdaptEnum : return "TimeAdapt";
@@ -170 +145 @@
                 case ElementOnSurfaceEnum : return "ElementOnSurface";
                 case ElementOnWaterEnum : return "ElementOnWater";
-                case Fake4Enum : return "Fake4";
                 case FillEnum : return "Fill";
                 case FractionIncrementEnum : return "FractionIncrement";
                 case FrictionEnum : return "Friction";
-                case Fake5Enum : return "Fake5";
                 case HydrostaticAdjustmentEnum : return "HydrostaticAdjustment";
                 case InternalEnum : return "Internal";
-                case KflagEnum : return "Kflag";
                 case IuToExtEnum : return "IuToExt";
                 case ExtToIuEnum : return "ExtToIu";
@@ -188 +160 @@
                 case SurfaceAverageVelMisfitEnum : return "SurfaceAverageVelMisfit";
                 case MaxPenetrationEnum : return "MaxPenetration";
-                case Fake6Enum : return "Fake6";
                 case MeltingOffsetEnum : return "MeltingOffset";
                 case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate";
@@ -199 +170 @@
                 case NumberNodeToElementConnectivityEnum : return "NumberNodeToElementConnectivity";
                 case PenaltyOffsetEnum : return "PenaltyOffset";
-                case PflagEnum : return "Pflag";
                 case PressureEnum : return "Pressure";
                 case PressurePicardEnum : return "PressurePicard";
@@ -211 +181 @@
                 case ShelfDampeningEnum : return "ShelfDampening";
                 case StabilizeConstraintsEnum : return "StabilizeConstraints";
-                case Fake7Enum : return "Fake7";
                 case SurfaceAccumulationRateEnum : return "SurfaceAccumulationRate";
                 case SurfaceAblationRateEnum : return "SurfaceAblationRate";
@@ -239 +208 @@
                 case VyPicardEnum : return "VyPicard";
                 case QmuVyEnum : return "QmuVy";
-                case VzAverageEnum : return "VzAverage";
                 case VzEnum : return "Vz";
                 case VzObsEnum : return "VzObs";
@@ -251 +219 @@
                 case P1Enum : return "P1";
                 case P1DGEnum : return "P1DG";
-                case MiniEnum : return "Mini";
                 case DoubleElementResultEnum : return "DoubleElementResult";
                 case TriaVertexElementResultEnum : return "TriaVertexElementResult";
@@ -269 +236 @@
                 case TimeEnum : return "Time";
                 case OutputFrequencyEnum : return "OutputFrequency";
-                case Fake8Enum : return "Fake8";
                 case WaterColumnOldEnum : return "WaterColumnOld";
-                case Fake34Enum : return "Fake34";
                 case IoGatherEnum : return "IoGather";
                 case MinVelEnum : return "MinVel";
@@ -285 +250 @@
                 case MaxAbsVzEnum : return "MaxAbsVz";
                 case RelativeEnum : return "Relative";
-                case ResidualEnum : return "Residual";
                 case AbsoluteEnum : return "Absolute";
                 case IncrementalEnum : return "Incremental";
@@ -294 +258 @@
                 case RhoWaterEnum : return "RhoWater";
                 case GravityEnum : return "Gravity";
-                case Fake9Enum : return "Fake9";
                 case BasalMeltingRateCorrectionEnum : return "BasalMeltingRateCorrection";
-                case Fake44Enum : return "Fake44";
                 case MixedLayerCapacityEnum : return "MixedLayerCapacity";
                 case ThermalExchangeVelocityEnum : return "ThermalExchangeVelocity";
@@ -316 +278 @@
                 case ConnectivityEnum : return "Connectivity";
                 case ControlSteadyEnum : return "ControlSteady";
-                case DakotaParameterEnum : return "DakotaParameter";
                 case DimEnum : return "Dim";
                 case EpsAbsEnum : return "EpsAbs";
@@ -322 +283 @@
                 case EpsRelEnum : return "EpsRel";
                 case EpsResEnum : return "EpsRes";
-                case Fake10Enum : return "Fake10";
-                case Fake29Enum : return "Fake29";
-                case Fake11Enum : return "Fake11";
-                case Fake12Enum : return "Fake12";
-                case Fake13Enum : return "Fake13";
-                case Fake14Enum : return "Fake14";
                 case LowmemEnum : return "Lowmem";
-                case Fake16Enum : return "Fake16";
                 case MaxNonlinearIterationsEnum : return "MaxNonlinearIterations";
-                case Fake17Enum : return "Fake17";
                 case MinMechanicalConstraintsEnum : return "MinMechanicalConstraints";
                 case MinThermalConstraintsEnum : return "MinThermalConstraints";
-                case Fake18Enum : return "Fake18";
                 case NdtEnum : return "Ndt";
-                case NumOutputEnum : return "NumOutput";
                 case NumriftsEnum : return "Numrifts";
                 case NumberOfElementsEnum : return "NumberOfElements";
-                case NumberOfNodesEnum : return "NumberOfNodes";
                 case NumberOfVerticesEnum : return "NumberOfVertices";
-                case Fake19Enum : return "Fake19";
                 case OutputFilePointerEnum : return "OutputFilePointer";
-                case Fake20Enum : return "Fake20";
-                case Fake21Enum : return "Fake21";
-                case Fake42Enum : return "Fake42";
                 case QmuAnalysisEnum : return "QmuAnalysis";
                 case QmuErrNameEnum : return "QmuErrName";
                 case QmuInNameEnum : return "QmuInName";
                 case QmuMassFluxSegmentsEnum : return "QmuMassFluxSegments";
-                case Fake39Enum : return "Fake39";
                 case QmuOutNameEnum : return "QmuOutName";
                 case QmuPartEnum : return "QmuPart";
                 case QmuNumberOfResponsesEnum : return "QmuNumberOfResponses";
-                case Fake43Enum : return "Fake43";
                 case IndexedEnum : return "Indexed";
                 case RegularEnum : return "Regular";
@@ -361 +305 @@
                 case NodalEnum : return "Nodal";
                 case ResponsedescriptorsEnum : return "Responsedescriptors";
-                case PetscRcEnum : return "PetscRc";
-                case Fake40Enum : return "Fake40";
-                case Fake22Enum : return "Fake22";
                 case VariabledescriptorsEnum : return "Variabledescriptors";
                 case VerboseEnum : return "Verbose";
-                case Fake23Enum : return "Fake23";
                 case PetscOptionsStringsEnum : return "PetscOptionsStrings";
                 case PetscOptionsAnalysesEnum : return "PetscOptionsAnalyses";
@@ -377 +317 @@
                 case BilinearInterpEnum : return "BilinearInterp";
                 case NearestInterpEnum : return "NearestInterp";
-                case OptionEnum : return "Option";
                 case OptionCellEnum : return "OptionCell";
                 case OptionCharEnum : return "OptionChar";
-                case OptionDoubleEnum : return "OptionDouble";
-                case OptionLogicalEnum : return "OptionLogical";
                 case OptionStructEnum : return "OptionStruct";
                 case RheologyLawEnum : return "RheologyLaw";
@@ -389 +326 @@
                 case VyMeshEnum : return "VyMesh";
                 case VzMeshEnum : return "VzMesh";
-                case Fake24Enum : return "Fake24";
-                case Fake25Enum : return "Fake25";
-                case Fake26Enum : return "Fake26";
                 case EnthalpySolutionEnum : return "EnthalpySolution";
                 case EnthalpyAnalysisEnum : return "EnthalpyAnalysis";
                 case EnthalpyEnum : return "Enthalpy";
                 case EnthalpyPicardEnum : return "EnthalpyPicard";
-                case Fake27Enum : return "Fake27";
-                case Fake28Enum : return "Fake28";
                 case ThicknessAbsGradientEnum : return "ThicknessAbsGradient";
-                case VelAbsGradientEnum : return "VelAbsGradient";
                 case DatasetInputEnum : return "DatasetInput";
-                case Fake38Enum : return "Fake38";
                 case StepResponsesEnum : return "StepResponses";
                 case IntMatParamEnum : return "IntMatParam";
@@ -411 +341 @@
                 case SpcvyEnum : return "Spcvy";
                 case HydroQEnum : return "HydroQ";
-                case VerboseBinaryEnum : return "VerboseBinary";
                 case NodeOnWaterEnum : return "NodeOnWater";
                 case YEnum : return "Y";
-                case GlMeltingRateEnum : return "GlMeltingRate";
                 case ElementsTypeEnum : return "ElementsType";
                 case PenaltiesEnum : return "Penalties";
@@ -424 +352 @@
                 case HydroKnEnum : return "HydroKn";
                 case GEnum : return "G";
-                case InputfilenameEnum : return "Inputfilename";
                 case SpcvzEnum : return "Spcvz";
-                case Fake33Enum : return "Fake33";
                 case NumberOfNodes2DEnum : return "NumberOfNodes2D";
                 case NodeOnStokesEnum : return "NodeOnStokes";
                 case NodeOnHutterEnum : return "NodeOnHutter";
                 case ZEnum : return "Z";
-                case Fake36Enum : return "Fake36";
                 case RiftsEnum : return "Rifts";
-                case ElementOnIceSheetEnum : return "ElementOnIceSheet";
                 case SpcthicknessEnum : return "Spcthickness";
                 case SpctemperatureEnum : return "Spctemperature";
@@ -450 +374 @@
                 case ArtificialDiffusivityEnum : return "ArtificialDiffusivity";
                 case HydroNEnum : return "HydroN";
-                case BorderstokesEnum : return "Borderstokes";
                 case NumlayersEnum : return "Numlayers";
                 case DiagnosticRefEnum : return "DiagnosticRef";
@@ -474 +397 @@
                 case EpsvelEnum : return "Epsvel";
                 case MeanvelEnum : return "Meanvel";
-                case Fake30Enum : return "Fake30";
                 case OutputfilenameEnum : return "Outputfilename";
                 case WaterfractionEnum : return "Waterfraction";
                 case WatercolumnEnum : return "Watercolumn";
                 case WaitonlockEnum : return "Waitonlock";
-                case NumberOfVariablesEnum : return "NumberOfVariables";
                 case NumberOfResponsesEnum : return "NumberOfResponses";
                 case NpartEnum : return "Npart";
-                case QmuMassFluxNumProfilesEnum : return "QmuMassFluxNumProfiles";
                 case PartEnum : return "Part";
                 case MaxSteadystateIterationsEnum : return "MaxSteadystateIterations";
@@ -490 +410 @@
                 case ViscousHeatingEnum : return "ViscousHeating";
                 case QmuTemperatureEnum : return "QmuTemperature";
-                case QmuRheologyBEnum : return "QmuRheologyB";
                 case HydrologyWaterVxEnum : return "HydrologyWaterVx";
                 case HydrologyWaterVyEnum : return "HydrologyWaterVy";

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

@@ -15 +15 @@
 
         if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
-        else if (strcmp(name,"Datasets")==0) return DatasetsEnum;
         else if (strcmp(name,"Elements")==0) return ElementsEnum;
         else if (strcmp(name,"Loads")==0) return LoadsEnum;
@@ -21 +20 @@
         else if (strcmp(name,"Nodes")==0) return NodesEnum;
         else if (strcmp(name,"Parameters")==0) return ParametersEnum;
-        else if (strcmp(name,"Results")==0) return ResultsEnum;
         else if (strcmp(name,"Vertices")==0) return VerticesEnum;
         else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum;
@@ -28 +26 @@
         else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum;
         else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum;
-        else if (strcmp(name,"DiagnosticAnalysis")==0) return DiagnosticAnalysisEnum;
         else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum;
         else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum;
@@ -36 +33 @@
         else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
         else if (strcmp(name,"ControlAnalysis")==0) return ControlAnalysisEnum;
-        else if (strcmp(name,"GradientAnalysis")==0) return GradientAnalysisEnum;
-        else if (strcmp(name,"InverseAnalysis")==0) return InverseAnalysisEnum;
         else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
         else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
@@ -44 +39 @@
         else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
         else if (strcmp(name,"GroundinglineMigration2DSolution")==0) return GroundinglineMigration2DSolutionEnum;
-        else if (strcmp(name,"SteadyAnalysis")==0) return SteadyAnalysisEnum;
-        else if (strcmp(name,"TransientAnalysis")==0) return TransientAnalysisEnum;
         else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
         else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum;
@@ -56 +49 @@
         else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
         else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
-        else if (strcmp(name,"Fake31")==0) return Fake31Enum;
-        else if (strcmp(name,"Fake32")==0) return Fake32Enum;
         else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum;
         else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum;
@@ -77 +68 @@
         else if (strcmp(name,"PattynStokesApproximation")==0) return PattynStokesApproximationEnum;
         else if (strcmp(name,"StokesApproximation")==0) return StokesApproximationEnum;
-        else if (strcmp(name,"Object")==0) return ObjectEnum;
         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,"ElementProperties")==0) return ElementPropertiesEnum;
-        else if (strcmp(name,"NodeProperties")==0) return NodePropertiesEnum;
         else if (strcmp(name,"Penta")==0) return PentaEnum;
         else if (strcmp(name,"Tria")==0) return TriaEnum;
         else if (strcmp(name,"Node")==0) return NodeEnum;
         else if (strcmp(name,"Vertex")==0) return VertexEnum;
-        else if (strcmp(name,"Load")==0) return LoadEnum;
         else if (strcmp(name,"Icefront")==0) return IcefrontEnum;
         else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
         else if (strcmp(name,"Pengrid")==0) return PengridEnum;
         else if (strcmp(name,"Penpair")==0) return PenpairEnum;
-        else if (strcmp(name,"QuadRiftFront")==0) return QuadRiftFrontEnum;
         else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
         else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
@@ -100 +85 @@
         else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
         else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum;
-        else if (strcmp(name,"Material")==0) return MaterialEnum;
         else if (strcmp(name,"Matice")==0) return MaticeEnum;
         else if (strcmp(name,"Matpar")==0) return MatparEnum;
@@ -109 +93 @@
         else if (strcmp(name,"PentaVertexInput")==0) return PentaVertexInputEnum;
         else if (strcmp(name,"TriaVertexInput")==0) return TriaVertexInputEnum;
-        else if (strcmp(name,"Fake0")==0) return Fake0Enum;
-        else if (strcmp(name,"Fake1")==0) return Fake1Enum;
         else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
         else if (strcmp(name,"Param")==0) return ParamEnum;
@@ -129 +111 @@
         else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
         else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
-        else if (strcmp(name,"Geography")==0) return GeographyEnum;
         else if (strcmp(name,"IceSheet")==0) return IceSheetEnum;
         else if (strcmp(name,"IceShelf")==0) return IceShelfEnum;
@@ -136 +117 @@
         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;
@@ -143 +123 @@
         else if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
         else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
-        else if (strcmp(name,"Fake35")==0) return Fake35Enum;
         else if (strcmp(name,"Bed")==0) return BedEnum;
         else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum;
@@ -151 +130 @@
         else if (strcmp(name,"CmResponse")==0) return CmResponseEnum;
         else if (strcmp(name,"CmResponses")==0) return CmResponsesEnum;
-        else if (strcmp(name,"Fake2")==0) return Fake2Enum;
         else if (strcmp(name,"Constant")==0) return ConstantEnum;
-        else if (strcmp(name,"Fake37")==0) return Fake37Enum;
         else if (strcmp(name,"ControlType")==0) return ControlTypeEnum;
         else if (strcmp(name,"Converged")==0) return ConvergedEnum;
-        else if (strcmp(name,"Fake3")==0) return Fake3Enum;
         else if (strcmp(name,"DragCoefficient")==0) return DragCoefficientEnum;
         else if (strcmp(name,"DragP")==0) return DragPEnum;
         else if (strcmp(name,"DragQ")==0) return DragQEnum;
-        else if (strcmp(name,"Fake41")==0) return Fake41Enum;
         else if (strcmp(name,"Dt")==0) return DtEnum;
         else if (strcmp(name,"TimeAdapt")==0) return TimeAdaptEnum;
@@ -168 +143 @@
         else if (strcmp(name,"ElementOnSurface")==0) return ElementOnSurfaceEnum;
         else if (strcmp(name,"ElementOnWater")==0) return ElementOnWaterEnum;
-        else if (strcmp(name,"Fake4")==0) return Fake4Enum;
         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,"Fake5")==0) return Fake5Enum;
         else if (strcmp(name,"HydrostaticAdjustment")==0) return HydrostaticAdjustmentEnum;
         else if (strcmp(name,"Internal")==0) return InternalEnum;
-        else if (strcmp(name,"Kflag")==0) return KflagEnum;
         else if (strcmp(name,"IuToExt")==0) return IuToExtEnum;
         else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum;
@@ -186 +158 @@
         else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
         else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
-        else if (strcmp(name,"Fake6")==0) return Fake6Enum;
         else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
         else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum;
@@ -197 +168 @@
         else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum;
         else if (strcmp(name,"PenaltyOffset")==0) return PenaltyOffsetEnum;
-        else if (strcmp(name,"Pflag")==0) return PflagEnum;
         else if (strcmp(name,"Pressure")==0) return PressureEnum;
         else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
@@ -209 +179 @@
         else if (strcmp(name,"ShelfDampening")==0) return ShelfDampeningEnum;
         else if (strcmp(name,"StabilizeConstraints")==0) return StabilizeConstraintsEnum;
-        else if (strcmp(name,"Fake7")==0) return Fake7Enum;
         else if (strcmp(name,"SurfaceAccumulationRate")==0) return SurfaceAccumulationRateEnum;
         else if (strcmp(name,"SurfaceAblationRate")==0) return SurfaceAblationRateEnum;
@@ -237 +206 @@
         else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
         else if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
-        else if (strcmp(name,"VzAverage")==0) return VzAverageEnum;
         else if (strcmp(name,"Vz")==0) return VzEnum;
         else if (strcmp(name,"VzObs")==0) return VzObsEnum;
@@ -249 +217 @@
         else if (strcmp(name,"P1")==0) return P1Enum;
         else if (strcmp(name,"P1DG")==0) return P1DGEnum;
-        else if (strcmp(name,"Mini")==0) return MiniEnum;
         else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
         else if (strcmp(name,"TriaVertexElementResult")==0) return TriaVertexElementResultEnum;
@@ -267 +234 @@
         else if (strcmp(name,"Time")==0) return TimeEnum;
         else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum;
-        else if (strcmp(name,"Fake8")==0) return Fake8Enum;
         else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
-        else if (strcmp(name,"Fake34")==0) return Fake34Enum;
         else if (strcmp(name,"IoGather")==0) return IoGatherEnum;
         else if (strcmp(name,"MinVel")==0) return MinVelEnum;
@@ -283 +248 @@
         else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
         else if (strcmp(name,"Relative")==0) return RelativeEnum;
-        else if (strcmp(name,"Residual")==0) return ResidualEnum;
         else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
         else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
@@ -292 +256 @@
         else if (strcmp(name,"RhoWater")==0) return RhoWaterEnum;
         else if (strcmp(name,"Gravity")==0) return GravityEnum;
-        else if (strcmp(name,"Fake9")==0) return Fake9Enum;
         else if (strcmp(name,"BasalMeltingRateCorrection")==0) return BasalMeltingRateCorrectionEnum;
-        else if (strcmp(name,"Fake44")==0) return Fake44Enum;
         else if (strcmp(name,"MixedLayerCapacity")==0) return MixedLayerCapacityEnum;
         else if (strcmp(name,"ThermalExchangeVelocity")==0) return ThermalExchangeVelocityEnum;
@@ -314 +276 @@
         else if (strcmp(name,"Connectivity")==0) return ConnectivityEnum;
         else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
-        else if (strcmp(name,"DakotaParameter")==0) return DakotaParameterEnum;
         else if (strcmp(name,"Dim")==0) return DimEnum;
         else if (strcmp(name,"EpsAbs")==0) return EpsAbsEnum;
@@ -320 +281 @@
         else if (strcmp(name,"EpsRel")==0) return EpsRelEnum;
         else if (strcmp(name,"EpsRes")==0) return EpsResEnum;
-        else if (strcmp(name,"Fake10")==0) return Fake10Enum;
-        else if (strcmp(name,"Fake29")==0) return Fake29Enum;
-        else if (strcmp(name,"Fake11")==0) return Fake11Enum;
-        else if (strcmp(name,"Fake12")==0) return Fake12Enum;
-        else if (strcmp(name,"Fake13")==0) return Fake13Enum;
-        else if (strcmp(name,"Fake14")==0) return Fake14Enum;
         else if (strcmp(name,"Lowmem")==0) return LowmemEnum;
-        else if (strcmp(name,"Fake16")==0) return Fake16Enum;
         else if (strcmp(name,"MaxNonlinearIterations")==0) return MaxNonlinearIterationsEnum;
-        else if (strcmp(name,"Fake17")==0) return Fake17Enum;
         else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum;
         else if (strcmp(name,"MinThermalConstraints")==0) return MinThermalConstraintsEnum;
-        else if (strcmp(name,"Fake18")==0) return Fake18Enum;
         else if (strcmp(name,"Ndt")==0) return NdtEnum;
-        else if (strcmp(name,"NumOutput")==0) return NumOutputEnum;
         else if (strcmp(name,"Numrifts")==0) return NumriftsEnum;
         else if (strcmp(name,"NumberOfElements")==0) return NumberOfElementsEnum;
-        else if (strcmp(name,"NumberOfNodes")==0) return NumberOfNodesEnum;
         else if (strcmp(name,"NumberOfVertices")==0) return NumberOfVerticesEnum;
-        else if (strcmp(name,"Fake19")==0) return Fake19Enum;
         else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
-        else if (strcmp(name,"Fake20")==0) return Fake20Enum;
-        else if (strcmp(name,"Fake21")==0) return Fake21Enum;
-        else if (strcmp(name,"Fake42")==0) return Fake42Enum;
         else if (strcmp(name,"QmuAnalysis")==0) return QmuAnalysisEnum;
         else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
         else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
         else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum;
-        else if (strcmp(name,"Fake39")==0) return Fake39Enum;
         else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
         else if (strcmp(name,"QmuPart")==0) return QmuPartEnum;
         else if (strcmp(name,"QmuNumberOfResponses")==0) return QmuNumberOfResponsesEnum;
-        else if (strcmp(name,"Fake43")==0) return Fake43Enum;
         else if (strcmp(name,"Indexed")==0) return IndexedEnum;
         else if (strcmp(name,"Regular")==0) return RegularEnum;
@@ -359 +303 @@
         else if (strcmp(name,"Nodal")==0) return NodalEnum;
         else if (strcmp(name,"Responsedescriptors")==0) return ResponsedescriptorsEnum;
-        else if (strcmp(name,"PetscRc")==0) return PetscRcEnum;
-        else if (strcmp(name,"Fake40")==0) return Fake40Enum;
-        else if (strcmp(name,"Fake22")==0) return Fake22Enum;
         else if (strcmp(name,"Variabledescriptors")==0) return VariabledescriptorsEnum;
         else if (strcmp(name,"Verbose")==0) return VerboseEnum;
-        else if (strcmp(name,"Fake23")==0) return Fake23Enum;
         else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum;
         else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum;
@@ -375 +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,"OptionDouble")==0) return OptionDoubleEnum;
-        else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum;
         else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
         else if (strcmp(name,"RheologyLaw")==0) return RheologyLawEnum;
@@ -387 +324 @@
         else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
         else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
-        else if (strcmp(name,"Fake24")==0) return Fake24Enum;
-        else if (strcmp(name,"Fake25")==0) return Fake25Enum;
-        else if (strcmp(name,"Fake26")==0) return Fake26Enum;
         else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum;
         else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
         else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
         else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
-        else if (strcmp(name,"Fake27")==0) return Fake27Enum;
-        else if (strcmp(name,"Fake28")==0) return Fake28Enum;
         else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
-        else if (strcmp(name,"VelAbsGradient")==0) return VelAbsGradientEnum;
         else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
-        else if (strcmp(name,"Fake38")==0) return Fake38Enum;
         else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
         else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
@@ -409 +339 @@
         else if (strcmp(name,"Spcvy")==0) return SpcvyEnum;
         else if (strcmp(name,"HydroQ")==0) return HydroQEnum;
-        else if (strcmp(name,"VerboseBinary")==0) return VerboseBinaryEnum;
         else if (strcmp(name,"NodeOnWater")==0) return NodeOnWaterEnum;
         else if (strcmp(name,"Y")==0) return YEnum;
-        else if (strcmp(name,"GlMeltingRate")==0) return GlMeltingRateEnum;
         else if (strcmp(name,"ElementsType")==0) return ElementsTypeEnum;
         else if (strcmp(name,"Penalties")==0) return PenaltiesEnum;
@@ -422 +350 @@
         else if (strcmp(name,"HydroKn")==0) return HydroKnEnum;
         else if (strcmp(name,"G")==0) return GEnum;
-        else if (strcmp(name,"Inputfilename")==0) return InputfilenameEnum;
         else if (strcmp(name,"Spcvz")==0) return SpcvzEnum;
-        else if (strcmp(name,"Fake33")==0) return Fake33Enum;
         else if (strcmp(name,"NumberOfNodes2D")==0) return NumberOfNodes2DEnum;
         else if (strcmp(name,"NodeOnStokes")==0) return NodeOnStokesEnum;
         else if (strcmp(name,"NodeOnHutter")==0) return NodeOnHutterEnum;
         else if (strcmp(name,"Z")==0) return ZEnum;
-        else if (strcmp(name,"Fake36")==0) return Fake36Enum;
         else if (strcmp(name,"Rifts")==0) return RiftsEnum;
-        else if (strcmp(name,"ElementOnIceSheet")==0) return ElementOnIceSheetEnum;
         else if (strcmp(name,"Spcthickness")==0) return SpcthicknessEnum;
         else if (strcmp(name,"Spctemperature")==0) return SpctemperatureEnum;
@@ -448 +372 @@
         else if (strcmp(name,"ArtificialDiffusivity")==0) return ArtificialDiffusivityEnum;
         else if (strcmp(name,"HydroN")==0) return HydroNEnum;
-        else if (strcmp(name,"Borderstokes")==0) return BorderstokesEnum;
         else if (strcmp(name,"Numlayers")==0) return NumlayersEnum;
         else if (strcmp(name,"DiagnosticRef")==0) return DiagnosticRefEnum;
@@ -472 +395 @@
         else if (strcmp(name,"Epsvel")==0) return EpsvelEnum;
         else if (strcmp(name,"Meanvel")==0) return MeanvelEnum;
-        else if (strcmp(name,"Fake30")==0) return Fake30Enum;
         else if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum;
         else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
         else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
         else if (strcmp(name,"Waitonlock")==0) return WaitonlockEnum;
-        else if (strcmp(name,"NumberOfVariables")==0) return NumberOfVariablesEnum;
         else if (strcmp(name,"NumberOfResponses")==0) return NumberOfResponsesEnum;
         else if (strcmp(name,"Npart")==0) return NpartEnum;
-        else if (strcmp(name,"QmuMassFluxNumProfiles")==0) return QmuMassFluxNumProfilesEnum;
         else if (strcmp(name,"Part")==0) return PartEnum;
         else if (strcmp(name,"MaxSteadystateIterations")==0) return MaxSteadystateIterationsEnum;
@@ -488 +408 @@
         else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
         else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
-        else if (strcmp(name,"QmuRheologyB")==0) return QmuRheologyBEnum;
         else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
         else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;