Changeset 21096

Timestamp:

08/05/16 10:24:49 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed some Enums

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnumToAnalysis.cpp (modified) (2 diffs)
• shared/Enum/EnumDefinitions.h (modified) (35 diffs)
• shared/Enum/EnumToStringx.cpp (modified) (35 diffs)
• shared/Enum/StringToEnumx.cpp (modified) (45 diffs)

issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp

@@ -92 +92 @@
                 case DepthAverageAnalysisEnum : return new DepthAverageAnalysis();
                 #endif
+                #ifdef _HAVE_SEALEVELRISE_
+                case SealevelriseAnalysisEnum : return new SealevelriseAnalysis();
+                #endif
                 #ifdef _HAVE_SMOOTH_
                 case SmoothAnalysisEnum : return new SmoothAnalysis();
@@ -113 +116 @@
                 case ExtrapolationAnalysisEnum : return new ExtrapolationAnalysis();
                 #endif
-                #ifdef _HAVE_SEALEVELRISE_
-                case SealevelriseAnalysisEnum : return new SealevelriseAnalysis();
-                #endif
                 default : _error_("enum provided not supported ("<<EnumToStringx(analysis_enum)<<")");
         }

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

@@ -10 +10 @@
         FemModelEnum,
         ParametersSTARTEnum,
+        /*Parameters {{{*/
         FSSolverEnum,
-        /*Parameters {{*/
-        IsRestartEnum,
         FemModelCommEnum,
         WorldCommEnum,
@@ -34 +33 @@
         AutodiffIsautodiffEnum, 
         AutodiffNumDependentsEnum,
-        AutodiffNumDependentObjectsEnum,
-        AutodiffDependentObjectNamesEnum,
-        AutodiffDependentObjectTypesEnum,
-        AutodiffDependentObjectIndicesEnum,
         AutodiffDependentObjectsEnum,
         AutodiffNumIndependentsEnum,
-        AutodiffNumIndependentObjectsEnum,
-        AutodiffIndependentObjectNamesEnum,
-        AutodiffIndependentObjectTypesEnum,
-        AutodiffIndependentObjectsEnum,
         AutodiffJacobianEnum,
         AutodiffXpEnum,
@@ -50 +41 @@
         AutodiffFovForwardIndicesEnum,
         AutodiffFosReverseIndexEnum,
-        AutodiffMassFluxSegmentsPresentEnum,
         AutodiffKeepEnum,
         AutodiffObufsizeEnum,
@@ -58 +48 @@
         AutodiffGcTriggerRatioEnum,
         AutodiffGcTriggerMaxSizeEnum,
-        BalancethicknessSpcthicknessEnum,
         BalancethicknessStabilizationEnum,
         BalancethicknessThickeningRateEnum,
@@ -98 +87 @@
         StressbalanceMaxiterEnum,
         StressbalancePenaltyFactorEnum,
-        StressbalanceReferentialEnum,
         StressbalanceReltolEnum,
         StressbalanceNumRequestedOutputsEnum,
         StressbalanceRequestedOutputsEnum,
         StressbalanceRestolEnum,
-        StressbalanceRiftPenaltyLockEnum,
         StressbalanceRiftPenaltyThresholdEnum,
         StressbalanceShelfDampeningEnum,
-        StressbalanceSpcvxEnum,
-        StressbalanceSpcvyEnum,
-        StressbalanceSpcvzEnum,
         StressbalanceFSreconditioningEnum,
-        StressbalanceVertexPairingEnum,
         StressbalanceViscosityOvershootEnum,
         LoadingforceXEnum,
         LoadingforceYEnum,
         LoadingforceZEnum,
-        FlowequationBorderSSAEnum,
-        FlowequationBorderHOEnum,
-        FlowequationBorderFSEnum,
-        FlowequationElementEquationEnum,
         FlowequationIsSIAEnum,
         FlowequationIsSSAEnum,
@@ -124 +103 @@
         FlowequationIsHOEnum,
         FlowequationIsFSEnum,
-        FlowequationFeSSAEnum,
-        FlowequationFeHOEnum,
         FlowequationFeFSEnum,
-        FlowequationVertexEquationEnum,
+        FlowequationBorderFSEnum,
         FrictionAsEnum,
         FrictionCoefficientEnum,
@@ -144 +121 @@
         HydrologyModelEnum,
         HydrologyshreveEnum,
-        HydrologyshreveSpcwatercolumnEnum,
         HydrologyshreveStabilizationEnum,
         HydrologydcEnum,
@@ -158 +134 @@
         HydrologydcMaxIterEnum,
         HydrologydcRelTolEnum,
-        HydrologydcSpcsedimentHeadEnum,
         HydrologydcSedimentCompressibilityEnum,
         HydrologydcSedimentPorosityEnum,
@@ -164 +139 @@
         HydrologydcSedimentTransmitivityEnum,
         HydrologydcWaterCompressibilityEnum,
-        HydrologydcSpceplHeadEnum,
         HydrologydcMaskEplactiveNodeEnum,
         HydrologydcMaskEplactiveEltEnum,
@@ -198 +172 @@
         HydrologyReynoldsEnum,
         HydrologyNeumannfluxEnum,
-        HydrologySpcheadEnum,
-        HydrologyConductivityEnum,
         InversionControlParametersEnum,
         InversionControlScalingFactorsEnum,
@@ -209 +181 @@
         InversionTypeEnum,
         InversionIncompleteAdjointEnum,
-        InversionMaxParametersEnum,
         InversionMaxiterPerStepEnum,
         InversionMaxiterEnum,
@@ -219 +190 @@
         InversionGttolEnum,
         InversionAlgorithmEnum,
-        InversionMinParametersEnum,
         InversionNstepsEnum,
         InversionDxminEnum,
@@ -248 +218 @@
         MaterialsRheologyEsEnum,
         MaterialsRheologyEsbarEnum,
-        DamageIsdamageEnum,
         DamageDEnum,
         DamageFEnum,
@@ -263 +232 @@
         DamageStabilizationEnum,
         DamageMaxiterEnum,
-        DamageSpcdamageEnum,
         DamageMaxDamageEnum,
         DamageEquivStressEnum,
@@ -278 +246 @@
         CalvingMinthicknessEnum,
         DefaultCalvingEnum,
-        CalvingRequestedOutputsEnum,
         CalvinglevermannCoeffEnum,
         CalvinglevermannMeltingrateEnum,
@@ -302 +269 @@
         MaterialsEarthDensityEnum,
         MeshAverageVertexConnectivityEnum,
-        MeshElements2dEnum,
         MeshElementsEnum,
-        MeshLowerelementsEnum,
-        MeshNumberofelements2dEnum,
         MeshNumberofelementsEnum,
         MeshNumberoflayersEnum,
-        MeshNumberofvertices2dEnum,
         MeshNumberofverticesEnum,
-        MeshUpperelementsEnum,
         MeshVertexonbaseEnum,
         MeshVertexonsurfaceEnum,
         MeshVertexonboundaryEnum,
-        MeshXEnum,
-        MeshYEnum,
-        MeshZEnum,
-        MeshLatEnum,
-        MeshLongEnum,
-        MeshREnum,
         MeshElementtypeEnum,
-        MeshSegmentsEnum,
         DomainTypeEnum,
         DomainDimensionEnum,
@@ -328 +283 @@
         Domain3DEnum,
         Domain3DsurfaceEnum,
-        MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script)
         MasstransportHydrostaticAdjustmentEnum,
         MasstransportIsfreesurfaceEnum,
@@ -335 +289 @@
         MasstransportSpcthicknessEnum,
         MasstransportStabilizationEnum,
-        MasstransportVertexPairingEnum,
         MasstransportNumRequestedOutputsEnum,
         MasstransportRequestedOutputsEnum,
@@ -341 +294 @@
         MassFluxSegmentsEnum,
         MassFluxSegmentsPresentEnum,
-        QmuMassFluxSegmentsPresentEnum,
         QmuNumberofpartitionsEnum,
         QmuNumberofresponsesEnum,
@@ -347 +299 @@
         QmuResponsedescriptorsEnum,
         QmuVariabledescriptorsEnum,
-        RiftsNumriftsEnum,
-        RiftsRiftstructEnum,
         SettingsResultsOnNodesEnum,
         SettingsIoGatherEnum,
@@ -397 +347 @@
         TransientNumRequestedOutputsEnum,
         TransientRequestedOutputsEnum,
-        PotentialEnum,
-        BalancethicknessSpcpotentialEnum,
         BalancethicknessApparentMassbalanceEnum,
-        Balancethickness2MisfitEnum,
         BalancethicknessDiffusionCoefficientEnum,
-        BalancethicknessCmuEnum,
         BalancethicknessOmegaEnum,
         BalancethicknessD0Enum,
@@ -424 +370 @@
         SmbDlwrfEnum,
         SmbPEnum, 
-        SmbSwfEnum, 
         SmbEAirEnum, 
         SmbPAirEnum,
@@ -503 +448 @@
         SmbRefreezeEnum,
         SMBgcmEnum,
-        /*TO BE REMOVED*/
-        SmbIspddEnum,
-        SmbIssmbgradientsEnum,
         /*}}}*/
         /*Inputs {{{*/
@@ -517 +459 @@
         BoundaryEnum,
         ConvergedEnum,
-        FillEnum,
-        FractionIncrementEnum,
-        FrictionEnum,
         InternalEnum,
         MassFluxEnum,
@@ -528 +467 @@
         AndroidFrictionCoefficientEnum,
         ResetPenaltiesEnum,
-        SegmentOnIceShelfEnum,
         SurfaceAbsVelMisfitEnum,
         SurfaceAreaEnum,
@@ -571 +509 @@
         WaterfractionEnum,
         WatercolumnEnum,
-        BasalFrictionEnum,
         ViscousHeatingEnum,
         HydrologyWaterVxEnum,
@@ -724 +661 @@
         OutputdefinitionListEnum,
         MassfluxatgateEnum,
-        MassfluxatgateNameEnum,
-        MassfluxatgateDefinitionenumEnum,
-        MassfluxatgateSegmentsEnum,
         NodalvalueEnum,
-        NodalvalueNameEnum,
-        NodalvalueDefinitionenumEnum,
-        NodalvalueModelEnumEnum,
-        NodalvalueNodeEnum,
-        MisfitNameEnum,
-        MisfitDefinitionenumEnum,
-        MisfitModelEnumEnum,
-        MisfitObservationEnum,
-        MisfitObservationEnumEnum,
-        MisfitLocalEnum,
-        MisfitTimeinterpolationEnum,
-        MisfitWeightsEnum,
-        MisfitWeightsEnumEnum,
-        SurfaceObservationEnum,
-        WeightsSurfaceObservationEnum,
         VxObsEnum,
-        WeightsVxObsEnum,
         VyObsEnum,
-        WeightsVyObsEnum,
         /*}}}*/
         /*Relaxation{{{*/
@@ -801 +718 @@
         SeparateEnum,
         SsetEnum,
-        VerboseEnum,
         /*}}}*/
         /*Coordinate Systems{{{*/
@@ -825 +741 @@
         /*}}}*/
         /*Levelset related enums (will be moved to appropriate place when finished){{{*/
-        SpclevelsetEnum,
         ExtrapolationVariableEnum,
         IceMaskNodeActivationEnum,
@@ -844 +759 @@
         SealevelriseReltolEnum,
         SealevelriseAbstolEnum,
-        SealevelriseLoveHEnum,
-        SealevelriseLoveKEnum,
-        SealevelriseTideLoveHEnum,
-        SealevelriseTideLoveKEnum,
         SealevelriseRigidEnum,
         SealevelriseElasticEnum,
-        SealevelriseRotationEnum,
         SealevelriseGElasticEnum,
         SealevelriseUElasticEnum,
         SealevelriseHElasticEnum,
-        SealevelriseDegaccEnum,
         SealevelriseTransitionsEnum,
         SealevelriseRequestedOutputsEnum,
@@ -891 +800 @@
         NodeEnum,
         NumericalfluxEnum,
-        NumericalfluxTypeEnum,
         NeumannfluxEnum,
         ParamEnum,
@@ -900 +808 @@
         MatrixParamEnum,
         MassconEnum,
-        MassconNameEnum,
-        MassconDefinitionenumEnum,
-        MassconLevelsetEnum,
         MassconaxpbyEnum,
-        MassconaxpbyNameEnum,
-        MassconaxpbyDefinitionenumEnum,
-        MassconaxpbyNamexEnum,
-        MassconaxpbyNameyEnum,
-        MassconaxpbyAlphaEnum,
-        MassconaxpbyBetaEnum,
         NodeSIdEnum,
         VectorParamEnum,
         RiftfrontEnum,
-        RiftfrontTypeEnum,
         SegmentEnum,
         SegmentRiftfrontEnum,
@@ -962 +860 @@
         StressbalanceVerticalAnalysisEnum,
         EnthalpyAnalysisEnum,
-        FlaimAnalysisEnum,
-        FlaimSolutionEnum,
         HydrologyShreveAnalysisEnum,
         HydrologyDCInefficientAnalysisEnum,
@@ -974 +870 @@
         FreeSurfaceBaseAnalysisEnum,
         FreeSurfaceTopAnalysisEnum,
-        SurfaceNormalVelocityEnum,
         ExtrudeFromBaseAnalysisEnum,
         ExtrudeFromTopAnalysisEnum,
@@ -989 +884 @@
         GiaSolutionEnum,
         GiaAnalysisEnum,
-        MeshdeformationSolutionEnum,
         MeshdeformationAnalysisEnum,
         LevelsetAnalysisEnum,

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

@@ -20 +20 @@
                 case ParametersSTARTEnum : return "ParametersSTART";
                 case FSSolverEnum : return "FSSolver";
-                case IsRestartEnum : return "IsRestart";
                 case FemModelCommEnum : return "FemModelComm";
                 case WorldCommEnum : return "WorldComm";
@@ -40 +39 @@
                 case AutodiffIsautodiffEnum : return "AutodiffIsautodiff";
                 case AutodiffNumDependentsEnum : return "AutodiffNumDependents";
-                case AutodiffNumDependentObjectsEnum : return "AutodiffNumDependentObjects";
-                case AutodiffDependentObjectNamesEnum : return "AutodiffDependentObjectNames";
-                case AutodiffDependentObjectTypesEnum : return "AutodiffDependentObjectTypes";
-                case AutodiffDependentObjectIndicesEnum : return "AutodiffDependentObjectIndices";
                 case AutodiffDependentObjectsEnum : return "AutodiffDependentObjects";
                 case AutodiffNumIndependentsEnum : return "AutodiffNumIndependents";
-                case AutodiffNumIndependentObjectsEnum : return "AutodiffNumIndependentObjects";
-                case AutodiffIndependentObjectNamesEnum : return "AutodiffIndependentObjectNames";
-                case AutodiffIndependentObjectTypesEnum : return "AutodiffIndependentObjectTypes";
-                case AutodiffIndependentObjectsEnum : return "AutodiffIndependentObjects";
                 case AutodiffJacobianEnum : return "AutodiffJacobian";
                 case AutodiffXpEnum : return "AutodiffXp";
@@ -56 +47 @@
                 case AutodiffFovForwardIndicesEnum : return "AutodiffFovForwardIndices";
                 case AutodiffFosReverseIndexEnum : return "AutodiffFosReverseIndex";
-                case AutodiffMassFluxSegmentsPresentEnum : return "AutodiffMassFluxSegmentsPresent";
                 case AutodiffKeepEnum : return "AutodiffKeep";
                 case AutodiffObufsizeEnum : return "AutodiffObufsize";
@@ -64 +54 @@
                 case AutodiffGcTriggerRatioEnum : return "AutodiffGcTriggerRatio";
                 case AutodiffGcTriggerMaxSizeEnum : return "AutodiffGcTriggerMaxSize";
-                case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
                 case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";
                 case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate";
@@ -104 +93 @@
                 case StressbalanceMaxiterEnum : return "StressbalanceMaxiter";
                 case StressbalancePenaltyFactorEnum : return "StressbalancePenaltyFactor";
-                case StressbalanceReferentialEnum : return "StressbalanceReferential";
                 case StressbalanceReltolEnum : return "StressbalanceReltol";
                 case StressbalanceNumRequestedOutputsEnum : return "StressbalanceNumRequestedOutputs";
                 case StressbalanceRequestedOutputsEnum : return "StressbalanceRequestedOutputs";
                 case StressbalanceRestolEnum : return "StressbalanceRestol";
-                case StressbalanceRiftPenaltyLockEnum : return "StressbalanceRiftPenaltyLock";
                 case StressbalanceRiftPenaltyThresholdEnum : return "StressbalanceRiftPenaltyThreshold";
                 case StressbalanceShelfDampeningEnum : return "StressbalanceShelfDampening";
-                case StressbalanceSpcvxEnum : return "StressbalanceSpcvx";
-                case StressbalanceSpcvyEnum : return "StressbalanceSpcvy";
-                case StressbalanceSpcvzEnum : return "StressbalanceSpcvz";
                 case StressbalanceFSreconditioningEnum : return "StressbalanceFSreconditioning";
-                case StressbalanceVertexPairingEnum : return "StressbalanceVertexPairing";
                 case StressbalanceViscosityOvershootEnum : return "StressbalanceViscosityOvershoot";
                 case LoadingforceXEnum : return "LoadingforceX";
                 case LoadingforceYEnum : return "LoadingforceY";
                 case LoadingforceZEnum : return "LoadingforceZ";
-                case FlowequationBorderSSAEnum : return "FlowequationBorderSSA";
-                case FlowequationBorderHOEnum : return "FlowequationBorderHO";
-                case FlowequationBorderFSEnum : return "FlowequationBorderFS";
-                case FlowequationElementEquationEnum : return "FlowequationElementEquation";
                 case FlowequationIsSIAEnum : return "FlowequationIsSIA";
                 case FlowequationIsSSAEnum : return "FlowequationIsSSA";
@@ -130 +109 @@
                 case FlowequationIsHOEnum : return "FlowequationIsHO";
                 case FlowequationIsFSEnum : return "FlowequationIsFS";
-                case FlowequationFeSSAEnum : return "FlowequationFeSSA";
-                case FlowequationFeHOEnum : return "FlowequationFeHO";
                 case FlowequationFeFSEnum : return "FlowequationFeFS";
-                case FlowequationVertexEquationEnum : return "FlowequationVertexEquation";
+                case FlowequationBorderFSEnum : return "FlowequationBorderFS";
                 case FrictionAsEnum : return "FrictionAs";
                 case FrictionCoefficientEnum : return "FrictionCoefficient";
@@ -150 +127 @@
                 case HydrologyModelEnum : return "HydrologyModel";
                 case HydrologyshreveEnum : return "Hydrologyshreve";
-                case HydrologyshreveSpcwatercolumnEnum : return "HydrologyshreveSpcwatercolumn";
                 case HydrologyshreveStabilizationEnum : return "HydrologyshreveStabilization";
                 case HydrologydcEnum : return "Hydrologydc";
@@ -164 +140 @@
                 case HydrologydcMaxIterEnum : return "HydrologydcMaxIter";
                 case HydrologydcRelTolEnum : return "HydrologydcRelTol";
-                case HydrologydcSpcsedimentHeadEnum : return "HydrologydcSpcsedimentHead";
                 case HydrologydcSedimentCompressibilityEnum : return "HydrologydcSedimentCompressibility";
                 case HydrologydcSedimentPorosityEnum : return "HydrologydcSedimentPorosity";
@@ -170 +145 @@
                 case HydrologydcSedimentTransmitivityEnum : return "HydrologydcSedimentTransmitivity";
                 case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility";
-                case HydrologydcSpceplHeadEnum : return "HydrologydcSpceplHead";
                 case HydrologydcMaskEplactiveNodeEnum : return "HydrologydcMaskEplactiveNode";
                 case HydrologydcMaskEplactiveEltEnum : return "HydrologydcMaskEplactiveElt";
@@ -204 +178 @@
                 case HydrologyReynoldsEnum : return "HydrologyReynolds";
                 case HydrologyNeumannfluxEnum : return "HydrologyNeumannflux";
-                case HydrologySpcheadEnum : return "HydrologySpchead";
-                case HydrologyConductivityEnum : return "HydrologyConductivity";
                 case InversionControlParametersEnum : return "InversionControlParameters";
                 case InversionControlScalingFactorsEnum : return "InversionControlScalingFactors";
@@ -215 +187 @@
                 case InversionTypeEnum : return "InversionType";
                 case InversionIncompleteAdjointEnum : return "InversionIncompleteAdjoint";
-                case InversionMaxParametersEnum : return "InversionMaxParameters";
                 case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep";
                 case InversionMaxiterEnum : return "InversionMaxiter";
@@ -225 +196 @@
                 case InversionGttolEnum : return "InversionGttol";
                 case InversionAlgorithmEnum : return "InversionAlgorithm";
-                case InversionMinParametersEnum : return "InversionMinParameters";
                 case InversionNstepsEnum : return "InversionNsteps";
                 case InversionDxminEnum : return "InversionDxmin";
@@ -254 +224 @@
                 case MaterialsRheologyEsEnum : return "MaterialsRheologyEs";
                 case MaterialsRheologyEsbarEnum : return "MaterialsRheologyEsbar";
-                case DamageIsdamageEnum : return "DamageIsdamage";
                 case DamageDEnum : return "DamageD";
                 case DamageFEnum : return "DamageF";
@@ -269 +238 @@
                 case DamageStabilizationEnum : return "DamageStabilization";
                 case DamageMaxiterEnum : return "DamageMaxiter";
-                case DamageSpcdamageEnum : return "DamageSpcdamage";
                 case DamageMaxDamageEnum : return "DamageMaxDamage";
                 case DamageEquivStressEnum : return "DamageEquivStress";
@@ -284 +252 @@
                 case CalvingMinthicknessEnum : return "CalvingMinthickness";
                 case DefaultCalvingEnum : return "DefaultCalving";
-                case CalvingRequestedOutputsEnum : return "CalvingRequestedOutputs";
                 case CalvinglevermannCoeffEnum : return "CalvinglevermannCoeff";
                 case CalvinglevermannMeltingrateEnum : return "CalvinglevermannMeltingrate";
@@ -308 +275 @@
                 case MaterialsEarthDensityEnum : return "MaterialsEarthDensity";
                 case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity";
-                case MeshElements2dEnum : return "MeshElements2d";
                 case MeshElementsEnum : return "MeshElements";
-                case MeshLowerelementsEnum : return "MeshLowerelements";
-                case MeshNumberofelements2dEnum : return "MeshNumberofelements2d";
                 case MeshNumberofelementsEnum : return "MeshNumberofelements";
                 case MeshNumberoflayersEnum : return "MeshNumberoflayers";
-                case MeshNumberofvertices2dEnum : return "MeshNumberofvertices2d";
                 case MeshNumberofverticesEnum : return "MeshNumberofvertices";
-                case MeshUpperelementsEnum : return "MeshUpperelements";
                 case MeshVertexonbaseEnum : return "MeshVertexonbase";
                 case MeshVertexonsurfaceEnum : return "MeshVertexonsurface";
                 case MeshVertexonboundaryEnum : return "MeshVertexonboundary";
-                case MeshXEnum : return "MeshX";
-                case MeshYEnum : return "MeshY";
-                case MeshZEnum : return "MeshZ";
-                case MeshLatEnum : return "MeshLat";
-                case MeshLongEnum : return "MeshLong";
-                case MeshREnum : return "MeshR";
                 case MeshElementtypeEnum : return "MeshElementtype";
-                case MeshSegmentsEnum : return "MeshSegments";
                 case DomainTypeEnum : return "DomainType";
                 case DomainDimensionEnum : return "DomainDimension";
@@ -334 +289 @@
                 case Domain3DEnum : return "Domain3D";
                 case Domain3DsurfaceEnum : return "Domain3Dsurface";
-                case MiscellaneousNameEnum : return "MiscellaneousName";
                 case MasstransportHydrostaticAdjustmentEnum : return "MasstransportHydrostaticAdjustment";
                 case MasstransportIsfreesurfaceEnum : return "MasstransportIsfreesurface";
@@ -341 +295 @@
                 case MasstransportSpcthicknessEnum : return "MasstransportSpcthickness";
                 case MasstransportStabilizationEnum : return "MasstransportStabilization";
-                case MasstransportVertexPairingEnum : return "MasstransportVertexPairing";
                 case MasstransportNumRequestedOutputsEnum : return "MasstransportNumRequestedOutputs";
                 case MasstransportRequestedOutputsEnum : return "MasstransportRequestedOutputs";
@@ -347 +300 @@
                 case MassFluxSegmentsEnum : return "MassFluxSegments";
                 case MassFluxSegmentsPresentEnum : return "MassFluxSegmentsPresent";
-                case QmuMassFluxSegmentsPresentEnum : return "QmuMassFluxSegmentsPresent";
                 case QmuNumberofpartitionsEnum : return "QmuNumberofpartitions";
                 case QmuNumberofresponsesEnum : return "QmuNumberofresponses";
@@ -353 +305 @@
                 case QmuResponsedescriptorsEnum : return "QmuResponsedescriptors";
                 case QmuVariabledescriptorsEnum : return "QmuVariabledescriptors";
-                case RiftsNumriftsEnum : return "RiftsNumrifts";
-                case RiftsRiftstructEnum : return "RiftsRiftstruct";
                 case SettingsResultsOnNodesEnum : return "SettingsResultsOnNodes";
                 case SettingsIoGatherEnum : return "SettingsIoGather";
@@ -403 +353 @@
                 case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs";
                 case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";
-                case PotentialEnum : return "Potential";
-                case BalancethicknessSpcpotentialEnum : return "BalancethicknessSpcpotential";
                 case BalancethicknessApparentMassbalanceEnum : return "BalancethicknessApparentMassbalance";
-                case Balancethickness2MisfitEnum : return "Balancethickness2Misfit";
                 case BalancethicknessDiffusionCoefficientEnum : return "BalancethicknessDiffusionCoefficient";
-                case BalancethicknessCmuEnum : return "BalancethicknessCmu";
                 case BalancethicknessOmegaEnum : return "BalancethicknessOmega";
                 case BalancethicknessD0Enum : return "BalancethicknessD0";
@@ -426 +372 @@
                 case SmbDlwrfEnum : return "SmbDlwrf";
                 case SmbPEnum : return "SmbP";
-                case SmbSwfEnum : return "SmbSwf";
                 case SmbEAirEnum : return "SmbEAir";
                 case SmbPAirEnum : return "SmbPAir";
@@ -504 +449 @@
                 case SmbRefreezeEnum : return "SmbRefreeze";
                 case SMBgcmEnum : return "SMBgcm";
-                case SmbIspddEnum : return "SmbIspdd";
-                case SmbIssmbgradientsEnum : return "SmbIssmbgradients";
                 case AdjointpEnum : return "Adjointp";
                 case AdjointxEnum : return "Adjointx";
@@ -515 +458 @@
                 case BoundaryEnum : return "Boundary";
                 case ConvergedEnum : return "Converged";
-                case FillEnum : return "Fill";
-                case FractionIncrementEnum : return "FractionIncrement";
-                case FrictionEnum : return "Friction";
                 case InternalEnum : return "Internal";
                 case MassFluxEnum : return "MassFlux";
@@ -526 +466 @@
                 case AndroidFrictionCoefficientEnum : return "AndroidFrictionCoefficient";
                 case ResetPenaltiesEnum : return "ResetPenalties";
-                case SegmentOnIceShelfEnum : return "SegmentOnIceShelf";
                 case SurfaceAbsVelMisfitEnum : return "SurfaceAbsVelMisfit";
                 case SurfaceAreaEnum : return "SurfaceArea";
@@ -569 +508 @@
                 case WaterfractionEnum : return "Waterfraction";
                 case WatercolumnEnum : return "Watercolumn";
-                case BasalFrictionEnum : return "BasalFriction";
                 case ViscousHeatingEnum : return "ViscousHeating";
                 case HydrologyWaterVxEnum : return "HydrologyWaterVx";
@@ -718 +656 @@
                 case OutputdefinitionListEnum : return "OutputdefinitionList";
                 case MassfluxatgateEnum : return "Massfluxatgate";
-                case MassfluxatgateNameEnum : return "MassfluxatgateName";
-                case MassfluxatgateDefinitionenumEnum : return "MassfluxatgateDefinitionenum";
-                case MassfluxatgateSegmentsEnum : return "MassfluxatgateSegments";
                 case NodalvalueEnum : return "Nodalvalue";
-                case NodalvalueNameEnum : return "NodalvalueName";
-                case NodalvalueDefinitionenumEnum : return "NodalvalueDefinitionenum";
-                case NodalvalueModelEnumEnum : return "NodalvalueModelEnum";
-                case NodalvalueNodeEnum : return "NodalvalueNode";
-                case MisfitNameEnum : return "MisfitName";
-                case MisfitDefinitionenumEnum : return "MisfitDefinitionenum";
-                case MisfitModelEnumEnum : return "MisfitModelEnum";
-                case MisfitObservationEnum : return "MisfitObservation";
-                case MisfitObservationEnumEnum : return "MisfitObservationEnum";
-                case MisfitLocalEnum : return "MisfitLocal";
-                case MisfitTimeinterpolationEnum : return "MisfitTimeinterpolation";
-                case MisfitWeightsEnum : return "MisfitWeights";
-                case MisfitWeightsEnumEnum : return "MisfitWeightsEnum";
-                case SurfaceObservationEnum : return "SurfaceObservation";
-                case WeightsSurfaceObservationEnum : return "WeightsSurfaceObservation";
                 case VxObsEnum : return "VxObs";
-                case WeightsVxObsEnum : return "WeightsVxObs";
                 case VyObsEnum : return "VyObs";
-                case WeightsVyObsEnum : return "WeightsVyObs";
                 case AbsoluteEnum : return "Absolute";
                 case IncrementalEnum : return "Incremental";
@@ -789 +707 @@
                 case SeparateEnum : return "Separate";
                 case SsetEnum : return "Sset";
-                case VerboseEnum : return "Verbose";
                 case XYEnum : return "XY";
                 case XYZEnum : return "XYZ";
@@ -805 +722 @@
                 case ArrheniusEnum : return "Arrhenius";
                 case LliboutryDuvalEnum : return "LliboutryDuval";
-                case SpclevelsetEnum : return "Spclevelset";
                 case ExtrapolationVariableEnum : return "ExtrapolationVariable";
                 case IceMaskNodeActivationEnum : return "IceMaskNodeActivation";
@@ -822 +738 @@
                 case SealevelriseReltolEnum : return "SealevelriseReltol";
                 case SealevelriseAbstolEnum : return "SealevelriseAbstol";
-                case SealevelriseLoveHEnum : return "SealevelriseLoveH";
-                case SealevelriseLoveKEnum : return "SealevelriseLoveK";
-                case SealevelriseTideLoveHEnum : return "SealevelriseTideLoveH";
-                case SealevelriseTideLoveKEnum : return "SealevelriseTideLoveK";
                 case SealevelriseRigidEnum : return "SealevelriseRigid";
                 case SealevelriseElasticEnum : return "SealevelriseElastic";
-                case SealevelriseRotationEnum : return "SealevelriseRotation";
                 case SealevelriseGElasticEnum : return "SealevelriseGElastic";
                 case SealevelriseUElasticEnum : return "SealevelriseUElastic";
                 case SealevelriseHElasticEnum : return "SealevelriseHElastic";
-                case SealevelriseDegaccEnum : return "SealevelriseDegacc";
                 case SealevelriseTransitionsEnum : return "SealevelriseTransitions";
                 case SealevelriseRequestedOutputsEnum : return "SealevelriseRequestedOutputs";
@@ -867 +777 @@
                 case NodeEnum : return "Node";
                 case NumericalfluxEnum : return "Numericalflux";
-                case NumericalfluxTypeEnum : return "NumericalfluxType";
                 case NeumannfluxEnum : return "Neumannflux";
                 case ParamEnum : return "Param";
@@ -876 +785 @@
                 case MatrixParamEnum : return "MatrixParam";
                 case MassconEnum : return "Masscon";
-                case MassconNameEnum : return "MassconName";
-                case MassconDefinitionenumEnum : return "MassconDefinitionenum";
-                case MassconLevelsetEnum : return "MassconLevelset";
                 case MassconaxpbyEnum : return "Massconaxpby";
-                case MassconaxpbyNameEnum : return "MassconaxpbyName";
-                case MassconaxpbyDefinitionenumEnum : return "MassconaxpbyDefinitionenum";
-                case MassconaxpbyNamexEnum : return "MassconaxpbyNamex";
-                case MassconaxpbyNameyEnum : return "MassconaxpbyNamey";
-                case MassconaxpbyAlphaEnum : return "MassconaxpbyAlpha";
-                case MassconaxpbyBetaEnum : return "MassconaxpbyBeta";
                 case NodeSIdEnum : return "NodeSId";
                 case VectorParamEnum : return "VectorParam";
                 case RiftfrontEnum : return "Riftfront";
-                case RiftfrontTypeEnum : return "RiftfrontType";
                 case SegmentEnum : return "Segment";
                 case SegmentRiftfrontEnum : return "SegmentRiftfront";
@@ -934 +833 @@
                 case StressbalanceVerticalAnalysisEnum : return "StressbalanceVerticalAnalysis";
                 case EnthalpyAnalysisEnum : return "EnthalpyAnalysis";
-                case FlaimAnalysisEnum : return "FlaimAnalysis";
-                case FlaimSolutionEnum : return "FlaimSolution";
                 case HydrologyShreveAnalysisEnum : return "HydrologyShreveAnalysis";
                 case HydrologyDCInefficientAnalysisEnum : return "HydrologyDCInefficientAnalysis";
@@ -946 +843 @@
                 case FreeSurfaceBaseAnalysisEnum : return "FreeSurfaceBaseAnalysis";
                 case FreeSurfaceTopAnalysisEnum : return "FreeSurfaceTopAnalysis";
-                case SurfaceNormalVelocityEnum : return "SurfaceNormalVelocity";
                 case ExtrudeFromBaseAnalysisEnum : return "ExtrudeFromBaseAnalysis";
                 case ExtrudeFromTopAnalysisEnum : return "ExtrudeFromTopAnalysis";
@@ -961 +857 @@
                 case GiaSolutionEnum : return "GiaSolution";
                 case GiaAnalysisEnum : return "GiaAnalysis";
-                case MeshdeformationSolutionEnum : return "MeshdeformationSolution";
                 case MeshdeformationAnalysisEnum : return "MeshdeformationAnalysis";
                 case LevelsetAnalysisEnum : return "LevelsetAnalysis";

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

@@ -20 +20 @@
               else if (strcmp(name,"ParametersSTART")==0) return ParametersSTARTEnum;
               else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
-              else if (strcmp(name,"IsRestart")==0) return IsRestartEnum;
               else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
               else if (strcmp(name,"WorldComm")==0) return WorldCommEnum;
@@ -40 +39 @@
               else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
               else if (strcmp(name,"AutodiffNumDependents")==0) return AutodiffNumDependentsEnum;
-              else if (strcmp(name,"AutodiffNumDependentObjects")==0) return AutodiffNumDependentObjectsEnum;
-              else if (strcmp(name,"AutodiffDependentObjectNames")==0) return AutodiffDependentObjectNamesEnum;
-              else if (strcmp(name,"AutodiffDependentObjectTypes")==0) return AutodiffDependentObjectTypesEnum;
-              else if (strcmp(name,"AutodiffDependentObjectIndices")==0) return AutodiffDependentObjectIndicesEnum;
               else if (strcmp(name,"AutodiffDependentObjects")==0) return AutodiffDependentObjectsEnum;
               else if (strcmp(name,"AutodiffNumIndependents")==0) return AutodiffNumIndependentsEnum;
-              else if (strcmp(name,"AutodiffNumIndependentObjects")==0) return AutodiffNumIndependentObjectsEnum;
-              else if (strcmp(name,"AutodiffIndependentObjectNames")==0) return AutodiffIndependentObjectNamesEnum;
-              else if (strcmp(name,"AutodiffIndependentObjectTypes")==0) return AutodiffIndependentObjectTypesEnum;
-              else if (strcmp(name,"AutodiffIndependentObjects")==0) return AutodiffIndependentObjectsEnum;
               else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
               else if (strcmp(name,"AutodiffXp")==0) return AutodiffXpEnum;
@@ -56 +47 @@
               else if (strcmp(name,"AutodiffFovForwardIndices")==0) return AutodiffFovForwardIndicesEnum;
               else if (strcmp(name,"AutodiffFosReverseIndex")==0) return AutodiffFosReverseIndexEnum;
-              else if (strcmp(name,"AutodiffMassFluxSegmentsPresent")==0) return AutodiffMassFluxSegmentsPresentEnum;
               else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
               else if (strcmp(name,"AutodiffObufsize")==0) return AutodiffObufsizeEnum;
@@ -64 +54 @@
               else if (strcmp(name,"AutodiffGcTriggerRatio")==0) return AutodiffGcTriggerRatioEnum;
               else if (strcmp(name,"AutodiffGcTriggerMaxSize")==0) return AutodiffGcTriggerMaxSizeEnum;
-              else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
               else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
               else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
@@ -104 +93 @@
               else if (strcmp(name,"StressbalanceMaxiter")==0) return StressbalanceMaxiterEnum;
               else if (strcmp(name,"StressbalancePenaltyFactor")==0) return StressbalancePenaltyFactorEnum;
-              else if (strcmp(name,"StressbalanceReferential")==0) return StressbalanceReferentialEnum;
               else if (strcmp(name,"StressbalanceReltol")==0) return StressbalanceReltolEnum;
               else if (strcmp(name,"StressbalanceNumRequestedOutputs")==0) return StressbalanceNumRequestedOutputsEnum;
               else if (strcmp(name,"StressbalanceRequestedOutputs")==0) return StressbalanceRequestedOutputsEnum;
               else if (strcmp(name,"StressbalanceRestol")==0) return StressbalanceRestolEnum;
-              else if (strcmp(name,"StressbalanceRiftPenaltyLock")==0) return StressbalanceRiftPenaltyLockEnum;
               else if (strcmp(name,"StressbalanceRiftPenaltyThreshold")==0) return StressbalanceRiftPenaltyThresholdEnum;
               else if (strcmp(name,"StressbalanceShelfDampening")==0) return StressbalanceShelfDampeningEnum;
-              else if (strcmp(name,"StressbalanceSpcvx")==0) return StressbalanceSpcvxEnum;
-              else if (strcmp(name,"StressbalanceSpcvy")==0) return StressbalanceSpcvyEnum;
-              else if (strcmp(name,"StressbalanceSpcvz")==0) return StressbalanceSpcvzEnum;
               else if (strcmp(name,"StressbalanceFSreconditioning")==0) return StressbalanceFSreconditioningEnum;
-              else if (strcmp(name,"StressbalanceVertexPairing")==0) return StressbalanceVertexPairingEnum;
               else if (strcmp(name,"StressbalanceViscosityOvershoot")==0) return StressbalanceViscosityOvershootEnum;
               else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
               else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
               else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum;
-              else if (strcmp(name,"FlowequationBorderSSA")==0) return FlowequationBorderSSAEnum;
-              else if (strcmp(name,"FlowequationBorderHO")==0) return FlowequationBorderHOEnum;
-              else if (strcmp(name,"FlowequationBorderFS")==0) return FlowequationBorderFSEnum;
-              else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum;
               else if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum;
               else if (strcmp(name,"FlowequationIsSSA")==0) return FlowequationIsSSAEnum;
@@ -130 +109 @@
               else if (strcmp(name,"FlowequationIsHO")==0) return FlowequationIsHOEnum;
               else if (strcmp(name,"FlowequationIsFS")==0) return FlowequationIsFSEnum;
-              else if (strcmp(name,"FlowequationFeSSA")==0) return FlowequationFeSSAEnum;
-              else if (strcmp(name,"FlowequationFeHO")==0) return FlowequationFeHOEnum;
               else if (strcmp(name,"FlowequationFeFS")==0) return FlowequationFeFSEnum;
-              else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum;
+              else if (strcmp(name,"FlowequationBorderFS")==0) return FlowequationBorderFSEnum;
               else if (strcmp(name,"FrictionAs")==0) return FrictionAsEnum;
               else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum;
               else if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum;
-         else stage=2;
-   }
-   if(stage==2){
-              if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
+              else if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
               else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
               else if (strcmp(name,"FrictionM")==0) return FrictionMEnum;
@@ -153 +127 @@
               else if (strcmp(name,"HydrologyModel")==0) return HydrologyModelEnum;
               else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum;
-              else if (strcmp(name,"HydrologyshreveSpcwatercolumn")==0) return HydrologyshreveSpcwatercolumnEnum;
               else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum;
               else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
@@ -164 +137 @@
               else if (strcmp(name,"EplHeadSlopeX")==0) return EplHeadSlopeXEnum;
               else if (strcmp(name,"EplHeadSlopeY")==0) return EplHeadSlopeYEnum;
-              else if (strcmp(name,"EplZigZagCounter")==0) return EplZigZagCounterEnum;
+         else stage=2;
+   }
+   if(stage==2){
+              if (strcmp(name,"EplZigZagCounter")==0) return EplZigZagCounterEnum;
               else if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum;
               else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum;
-              else if (strcmp(name,"HydrologydcSpcsedimentHead")==0) return HydrologydcSpcsedimentHeadEnum;
               else if (strcmp(name,"HydrologydcSedimentCompressibility")==0) return HydrologydcSedimentCompressibilityEnum;
               else if (strcmp(name,"HydrologydcSedimentPorosity")==0) return HydrologydcSedimentPorosityEnum;
@@ -173 +148 @@
               else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
               else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum;
-              else if (strcmp(name,"HydrologydcSpceplHead")==0) return HydrologydcSpceplHeadEnum;
               else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
               else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
@@ -207 +181 @@
               else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum;
               else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
-              else if (strcmp(name,"HydrologySpchead")==0) return HydrologySpcheadEnum;
-              else if (strcmp(name,"HydrologyConductivity")==0) return HydrologyConductivityEnum;
               else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
               else if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum;
@@ -218 +190 @@
               else if (strcmp(name,"InversionType")==0) return InversionTypeEnum;
               else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
-              else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
               else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
               else if (strcmp(name,"InversionMaxiter")==0) return InversionMaxiterEnum;
@@ -228 +199 @@
               else if (strcmp(name,"InversionGttol")==0) return InversionGttolEnum;
               else if (strcmp(name,"InversionAlgorithm")==0) return InversionAlgorithmEnum;
-              else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
               else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
               else if (strcmp(name,"InversionDxmin")==0) return InversionDxminEnum;
@@ -257 +227 @@
               else if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum;
               else if (strcmp(name,"MaterialsRheologyEsbar")==0) return MaterialsRheologyEsbarEnum;
-              else if (strcmp(name,"DamageIsdamage")==0) return DamageIsdamageEnum;
               else if (strcmp(name,"DamageD")==0) return DamageDEnum;
               else if (strcmp(name,"DamageF")==0) return DamageFEnum;
-         else stage=3;
-   }
-   if(stage==3){
-              if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
+              else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
               else if (strcmp(name,"DamageLaw")==0) return DamageLawEnum;
               else if (strcmp(name,"DamageC1")==0) return DamageC1Enum;
@@ -275 +241 @@
               else if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum;
               else if (strcmp(name,"DamageMaxiter")==0) return DamageMaxiterEnum;
-              else if (strcmp(name,"DamageSpcdamage")==0) return DamageSpcdamageEnum;
               else if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum;
               else if (strcmp(name,"DamageEquivStress")==0) return DamageEquivStressEnum;
@@ -290 +255 @@
               else if (strcmp(name,"CalvingMinthickness")==0) return CalvingMinthicknessEnum;
               else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum;
-              else if (strcmp(name,"CalvingRequestedOutputs")==0) return CalvingRequestedOutputsEnum;
               else if (strcmp(name,"CalvinglevermannCoeff")==0) return CalvinglevermannCoeffEnum;
               else if (strcmp(name,"CalvinglevermannMeltingrate")==0) return CalvinglevermannMeltingrateEnum;
@@ -296 +260 @@
               else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
               else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
-              else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
+         else stage=3;
+   }
+   if(stage==3){
+              if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
               else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
               else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
@@ -314 +281 @@
               else if (strcmp(name,"MaterialsEarthDensity")==0) return MaterialsEarthDensityEnum;
               else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
-              else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum;
               else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
-              else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum;
-              else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum;
               else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum;
               else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
-              else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum;
               else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
-              else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum;
               else if (strcmp(name,"MeshVertexonbase")==0) return MeshVertexonbaseEnum;
               else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
               else if (strcmp(name,"MeshVertexonboundary")==0) return MeshVertexonboundaryEnum;
-              else if (strcmp(name,"MeshX")==0) return MeshXEnum;
-              else if (strcmp(name,"MeshY")==0) return MeshYEnum;
-              else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
-              else if (strcmp(name,"MeshLat")==0) return MeshLatEnum;
-              else if (strcmp(name,"MeshLong")==0) return MeshLongEnum;
-              else if (strcmp(name,"MeshR")==0) return MeshREnum;
               else if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
-              else if (strcmp(name,"MeshSegments")==0) return MeshSegmentsEnum;
               else if (strcmp(name,"DomainType")==0) return DomainTypeEnum;
               else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
@@ -340 +295 @@
               else if (strcmp(name,"Domain3D")==0) return Domain3DEnum;
               else if (strcmp(name,"Domain3Dsurface")==0) return Domain3DsurfaceEnum;
-              else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
               else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
               else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum;
@@ -347 +301 @@
               else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum;
               else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
-              else if (strcmp(name,"MasstransportVertexPairing")==0) return MasstransportVertexPairingEnum;
               else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
               else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
@@ -353 +306 @@
               else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
               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;
@@ -359 +311 @@
               else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
               else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
-              else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
-              else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
               else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
               else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
@@ -383 +333 @@
               else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum;
               else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum;
-         else stage=4;
-   }
-   if(stage==4){
-              if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
+              else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
               else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
               else if (strcmp(name,"ThermalNumRequestedOutputs")==0) return ThermalNumRequestedOutputsEnum;
@@ -412 +359 @@
               else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
               else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
-              else if (strcmp(name,"Potential")==0) return PotentialEnum;
-              else if (strcmp(name,"BalancethicknessSpcpotential")==0) return BalancethicknessSpcpotentialEnum;
               else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum;
-              else if (strcmp(name,"Balancethickness2Misfit")==0) return Balancethickness2MisfitEnum;
               else if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
-              else if (strcmp(name,"BalancethicknessCmu")==0) return BalancethicknessCmuEnum;
               else if (strcmp(name,"BalancethicknessOmega")==0) return BalancethicknessOmegaEnum;
               else if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;
@@ -435 +378 @@
               else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
               else if (strcmp(name,"SmbP")==0) return SmbPEnum;
-              else if (strcmp(name,"SmbSwf")==0) return SmbSwfEnum;
               else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
               else if (strcmp(name,"SmbPAir")==0) return SmbPAirEnum;
@@ -441 +383 @@
               else if (strcmp(name,"SmbC")==0) return SmbCEnum;
               else if (strcmp(name,"SmbTz")==0) return SmbTzEnum;
-              else if (strcmp(name,"SmbVz")==0) return SmbVzEnum;
+         else stage=4;
+   }
+   if(stage==4){
+              if (strcmp(name,"SmbVz")==0) return SmbVzEnum;
               else if (strcmp(name,"SmbDt")==0) return SmbDtEnum;
               else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
@@ -506 +451 @@
               else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
               else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
-         else stage=5;
-   }
-   if(stage==5){
-              if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
+              else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
               else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum;
               else if (strcmp(name,"SmbRunoff")==0) return SmbRunoffEnum;
@@ -516 +458 @@
               else if (strcmp(name,"SmbRefreeze")==0) return SmbRefreezeEnum;
               else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum;
-              else if (strcmp(name,"SmbIspdd")==0) return SmbIspddEnum;
-              else if (strcmp(name,"SmbIssmbgradients")==0) return SmbIssmbgradientsEnum;
               else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
               else if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
@@ -527 +467 @@
               else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
               else if (strcmp(name,"Converged")==0) return ConvergedEnum;
-              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;
@@ -538 +475 @@
               else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
               else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
-              else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
               else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
@@ -570 +506 @@
               else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
               else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
-              else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
+         else stage=5;
+   }
+   if(stage==5){
+              if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
               else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
               else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
@@ -581 +520 @@
               else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
               else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
-              else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
               else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
               else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
@@ -629 +567 @@
               else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
               else if (strcmp(name,"Outputdefinition1")==0) return Outputdefinition1Enum;
-         else stage=6;
-   }
-   if(stage==6){
-              if (strcmp(name,"Outputdefinition2")==0) return Outputdefinition2Enum;
+              else if (strcmp(name,"Outputdefinition2")==0) return Outputdefinition2Enum;
               else if (strcmp(name,"Outputdefinition3")==0) return Outputdefinition3Enum;
               else if (strcmp(name,"Outputdefinition4")==0) return Outputdefinition4Enum;
@@ -694 +629 @@
               else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
               else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
-              else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
+         else stage=6;
+   }
+   if(stage==6){
+              if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
               else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
               else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
@@ -733 +671 @@
               else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
               else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
-              else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
-              else if (strcmp(name,"MassfluxatgateDefinitionenum")==0) return MassfluxatgateDefinitionenumEnum;
-              else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
               else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
-              else if (strcmp(name,"NodalvalueName")==0) return NodalvalueNameEnum;
-              else if (strcmp(name,"NodalvalueDefinitionenum")==0) return NodalvalueDefinitionenumEnum;
-              else if (strcmp(name,"NodalvalueModelEnum")==0) return NodalvalueModelEnumEnum;
-              else if (strcmp(name,"NodalvalueNode")==0) return NodalvalueNodeEnum;
-              else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
-              else if (strcmp(name,"MisfitDefinitionenum")==0) return MisfitDefinitionenumEnum;
-              else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
-              else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
-              else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
-              else if (strcmp(name,"MisfitLocal")==0) return MisfitLocalEnum;
-              else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
-              else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
-              else if (strcmp(name,"MisfitWeightsEnum")==0) return MisfitWeightsEnumEnum;
-              else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
-              else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
-         else stage=7;
-   }
-   if(stage==7){
-              if (strcmp(name,"VxObs")==0) return VxObsEnum;
-              else if (strcmp(name,"WeightsVxObs")==0) return WeightsVxObsEnum;
+              else if (strcmp(name,"VxObs")==0) return VxObsEnum;
               else if (strcmp(name,"VyObs")==0) return VyObsEnum;
-              else if (strcmp(name,"WeightsVyObs")==0) return WeightsVyObsEnum;
               else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
               else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
@@ -807 +722 @@
               else if (strcmp(name,"Separate")==0) return SeparateEnum;
               else if (strcmp(name,"Sset")==0) return SsetEnum;
-              else if (strcmp(name,"Verbose")==0) return VerboseEnum;
               else if (strcmp(name,"XY")==0) return XYEnum;
               else if (strcmp(name,"XYZ")==0) return XYZEnum;
@@ -823 +737 @@
               else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
               else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
-              else if (strcmp(name,"Spclevelset")==0) return SpclevelsetEnum;
               else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
               else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
@@ -839 +752 @@
               else if (strcmp(name,"SealevelriseMaxiter")==0) return SealevelriseMaxiterEnum;
               else if (strcmp(name,"SealevelriseReltol")==0) return SealevelriseReltolEnum;
-              else if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
-              else if (strcmp(name,"SealevelriseLoveH")==0) return SealevelriseLoveHEnum;
-              else if (strcmp(name,"SealevelriseLoveK")==0) return SealevelriseLoveKEnum;
-              else if (strcmp(name,"SealevelriseTideLoveH")==0) return SealevelriseTideLoveHEnum;
-              else if (strcmp(name,"SealevelriseTideLoveK")==0) return SealevelriseTideLoveKEnum;
+         else stage=7;
+   }
+   if(stage==7){
+              if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
               else if (strcmp(name,"SealevelriseRigid")==0) return SealevelriseRigidEnum;
               else if (strcmp(name,"SealevelriseElastic")==0) return SealevelriseElasticEnum;
-              else if (strcmp(name,"SealevelriseRotation")==0) return SealevelriseRotationEnum;
               else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum;
               else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum;
               else if (strcmp(name,"SealevelriseHElastic")==0) return SealevelriseHElasticEnum;
-              else if (strcmp(name,"SealevelriseDegacc")==0) return SealevelriseDegaccEnum;
               else if (strcmp(name,"SealevelriseTransitions")==0) return SealevelriseTransitionsEnum;
               else if (strcmp(name,"SealevelriseRequestedOutputs")==0) return SealevelriseRequestedOutputsEnum;
@@ -875 +785 @@
               else if (strcmp(name,"FileParam")==0) return FileParamEnum;
               else if (strcmp(name,"Input")==0) return InputEnum;
-         else stage=8;
-   }
-   if(stage==8){
-              if (strcmp(name,"IntInput")==0) return IntInputEnum;
+              else if (strcmp(name,"IntInput")==0) return IntInputEnum;
               else if (strcmp(name,"IntParam")==0) return IntParamEnum;
               else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
@@ -888 +795 @@
               else if (strcmp(name,"Node")==0) return NodeEnum;
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
-              else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum;
               else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
@@ -897 +803 @@
               else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
               else if (strcmp(name,"Masscon")==0) return MassconEnum;
-              else if (strcmp(name,"MassconName")==0) return MassconNameEnum;
-              else if (strcmp(name,"MassconDefinitionenum")==0) return MassconDefinitionenumEnum;
-              else if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum;
               else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum;
-              else if (strcmp(name,"MassconaxpbyName")==0) return MassconaxpbyNameEnum;
-              else if (strcmp(name,"MassconaxpbyDefinitionenum")==0) return MassconaxpbyDefinitionenumEnum;
-              else if (strcmp(name,"MassconaxpbyNamex")==0) return MassconaxpbyNamexEnum;
-              else if (strcmp(name,"MassconaxpbyNamey")==0) return MassconaxpbyNameyEnum;
-              else if (strcmp(name,"MassconaxpbyAlpha")==0) return MassconaxpbyAlphaEnum;
-              else if (strcmp(name,"MassconaxpbyBeta")==0) return MassconaxpbyBetaEnum;
               else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
               else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
               else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
-              else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
               else if (strcmp(name,"Segment")==0) return SegmentEnum;
               else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
@@ -955 +851 @@
               else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
               else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
-              else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
-              else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
               else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;
               else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
@@ -967 +861 @@
               else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
               else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
-              else if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum;
               else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
               else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
@@ -982 +875 @@
               else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
               else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
-              else if (strcmp(name,"MeshdeformationSolution")==0) return MeshdeformationSolutionEnum;
-              else if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
+         else stage=8;
+   }
+   if(stage==8){
+              if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
               else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
               else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
@@ -998 +893 @@
               else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
               else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
-         else stage=9;
-   }
-   if(stage==9){
-              if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
+              else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
               else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
               else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
@@ -1067 +959 @@
               else if (strcmp(name,"Results")==0) return ResultsEnum;
               else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
-         else stage=10;
+         else stage=9;
    }
         /*If we reach this point, the string provided has not been found*/