Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h	(revision 10520)
+++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h	(revision 10521)
@@ -12,217 +12,197 @@
 enum definitions{
 	/*Model fields {{{1*/
+	AutodiffForwardEnum,
+	AutodiffIsautodiffEnum, 
+	AutodiffReverseEnum,
+	BalancethicknessSpcthicknessEnum,
+	BalancethicknessStabilizationEnum,
+	BalancethicknessThickeningRateEnum,
+	BasalforcingsGeothermalfluxEnum,
+	BasalforcingsMeltingRateCorrectionEnum,
+	BasalforcingsMeltingRateEnum,
+	BathymetryEnum,
+	BedEnum,
 	ConstantsGEnum,
 	ConstantsReferencetemperatureEnum,
 	ConstantsYtsEnum,
-	SurfaceforcingsAccumulationRateEnum,
-	SurfaceforcingsAblationRateEnum,
-	SurfaceforcingsMassBalanceEnum,
-	BasalforcingsMeltingRateEnum,
-	BasalforcingsMeltingRateCorrectionEnum,
-	BasalforcingsGeothermalfluxEnum,
+	DiagnosticAbstolEnum,
+	DiagnosticIcefrontEnum,
+	DiagnosticMaxiterEnum,
+	DiagnosticNumRequestedOutputsEnum,
+	DiagnosticPenaltyFactorEnum,
+	DiagnosticReferentialEnum,
+	DiagnosticReltolEnum,
+	DiagnosticRequestedOutputsEnum,
+	DiagnosticRestolEnum,
+	DiagnosticRiftPenaltyLockEnum,
+	DiagnosticRiftPenaltyThresholdEnum,
+	DiagnosticShelfDampeningEnum,
+	DiagnosticSpcvxEnum,
+	DiagnosticSpcvyEnum,
+	DiagnosticSpcvzEnum,
+	DiagnosticStokesreconditioningEnum,
+	DiagnosticVertexPairingEnum,
+	DiagnosticViscosityOvershootEnum,
+	FlowequationBordermacayealEnum,
+	FlowequationBorderpattynEnum,
+	FlowequationBorderstokesEnum,
+	FlowequationElementEquationEnum,
+	FlowequationIshutterEnum,
+	FlowequationIsmacayealpattynEnum,
+	FlowequationIsstokesEnum,
+	FlowequationVertexEquationEnum,
 	FrictionCoefficientEnum,
 	FrictionPEnum,
 	FrictionQEnum,
-	RiftsRiftstructEnum,
-	RiftsNumriftsEnum,
-	HydrologySpcwatercolumnEnum,
+	GeometryHydrostaticRatioEnum,
+	HydrologyCREnum,
 	HydrologyKnEnum,
 	HydrologyNEnum,
 	HydrologyPEnum,
 	HydrologyQEnum,
-	HydrologyCREnum,
+	HydrologySpcwatercolumnEnum,
 	HydrologyStabilizationEnum,
-	SettingsLowmemEnum,
-	SettingsIoGatherEnum,
-	SettingsResultsOnVerticesEnum,
-	SettingsOutputFrequencyEnum,
-	SettingsWaitonlockEnum,
-	ThermalSpctemperatureEnum,
-	ThermalPenaltyThresholdEnum,
-	ThermalPenaltyLockEnum,
-	ThermalMaxiterEnum,
-	ThermalStabilizationEnum,
-	ThermalPenaltyFactorEnum,
-	MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script)
-	TimesteppingTimeStepEnum,
-	TimesteppingFinalTimeEnum,
-	TimesteppingTimeAdaptEnum,
-	TimesteppingCflCoefficientEnum,
-	PrognosticSpcthicknessEnum,
-	PrognosticHydrostaticAdjustmentEnum,
-	PrognosticStabilizationEnum,
-	PrognosticVertexPairingEnum,
-	PrognosticPenaltyFactorEnum,
-	MaterialsRheologyBEnum,
-	MaterialsRheologyBbarEnum,
-	MaterialsRheologyNEnum,
-	MaterialsRheologyLawEnum,
-	MaterialsRhoIceEnum,
-	MaterialsRhoWaterEnum,
-	MaterialsHeatcapacityEnum,
-	MaterialsLatentheatEnum,
-	MaterialsBetaEnum,
-	MaterialsThermalconductivityEnum,
-	MaterialsMixedLayerCapacityEnum,
-	MaterialsThermalExchangeVelocityEnum,
-	MaterialsMeltingpointEnum,
-	MaskElementongroundediceEnum,
-	MaskElementonfloatingiceEnum,
-	MaskElementonwaterEnum,
-	MaskVertexongroundediceEnum,
-	MaskVertexonfloatingiceEnum,
-	MaskVertexonwaterEnum,
-	QmuIsdakotaEnum,
-	QmuMassFluxSegmentsEnum,
-	QmuPartitionEnum,
-	QmuNumberofpartitionsEnum,
-	QmuNumberofresponsesEnum,
-	QmuResponsedescriptorsEnum,
-	QmuVariabledescriptorsEnum,
-	BalancethicknessSpcthicknessEnum,
-	BalancethicknessThickeningRateEnum,
-	BalancethicknessStabilizationEnum,
-	FlowequationIshutterEnum,
-	FlowequationIsmacayealpattynEnum,
-	FlowequationIsstokesEnum,
-	FlowequationElementEquationEnum,
-	FlowequationVertexEquationEnum,
-	FlowequationBorderstokesEnum,
-	FlowequationBorderpattynEnum,
-	FlowequationBordermacayealEnum,
-	SteadystateRequestedOutputsEnum,
-	SteadystateNumRequestedOutputsEnum,
-	SteadystateReltolEnum,
-	SteadystateMaxiterEnum,
-	TransientIsprognosticEnum,
-	TransientIsdiagnosticEnum,
-	TransientIsthermalEnum,
-	TransientIsgroundinglineEnum,
-	TransientRequestedOutputsEnum,
-	TransientNumRequestedOutputsEnum,
+	InversionControlParametersEnum,
+	InversionCostFunctionEnum,
+	InversionCostFunctionThresholdEnum,
+	InversionCostFunctionsCoefficientsEnum,
+	InversionCostFunctionsEnum,
+	InversionGradientOnlyEnum,
+	InversionGradientScalingEnum,
 	InversionIscontrolEnum,
-	InversionControlParametersEnum,
-	InversionCostFunctionsEnum,
-	InversionCostFunctionEnum,
-	InversionCostFunctionsCoefficientsEnum,
+	InversionMaxParametersEnum,
+	InversionMaxiterPerStepEnum,
+	InversionMinParametersEnum,
 	InversionNstepsEnum,
-	InversionMaxiterPerStepEnum,
-	InversionGradientScalingEnum,
-	InversionGradientOnlyEnum,
-	InversionCostFunctionThresholdEnum,
-	InversionMaxParametersEnum,
-	InversionMinParametersEnum,
-	InversionStepThresholdEnum,
 	InversionNumControlParametersEnum,
 	InversionNumCostFunctionsEnum,
+	InversionStepThresholdEnum,
+	InversionThicknessObsEnum,
+	InversionVelObsEnum,
 	InversionVxObsEnum,
 	InversionVyObsEnum,
 	InversionVzObsEnum,
-	InversionVelObsEnum,
-	InversionThicknessObsEnum,
-	DiagnosticSpcvxEnum,
-	DiagnosticSpcvyEnum,
-	DiagnosticSpcvzEnum,
-	DiagnosticStokesreconditioningEnum,
-	DiagnosticIcefrontEnum,
-	DiagnosticReferentialEnum,
-	DiagnosticVertexPairingEnum,
-	DiagnosticPenaltyFactorEnum,
-	DiagnosticAbstolEnum,
-	DiagnosticReltolEnum,
-	DiagnosticRestolEnum,
-	DiagnosticMaxiterEnum,
-	DiagnosticShelfDampeningEnum,
-	DiagnosticRiftPenaltyLockEnum,
-	DiagnosticRiftPenaltyThresholdEnum,
-	DiagnosticRequestedOutputsEnum,
-	DiagnosticNumRequestedOutputsEnum,
-	DiagnosticViscosityOvershootEnum,
-	GeometryHydrostaticRatioEnum,
-	ThicknessEnum,
-	BedEnum,
-	BathymetryEnum,
-	SurfaceEnum,
-	AutodiffIsautodiffEnum, 
-	AutodiffForwardEnum,
-	AutodiffReverseEnum,
+	MaskElementonfloatingiceEnum,
+	MaskElementongroundediceEnum,
+	MaskElementonwaterEnum,
+	MaskVertexonfloatingiceEnum,
+	MaskVertexongroundediceEnum,
+	MaskVertexonwaterEnum,
+	MaterialsBetaEnum,
+	MaterialsHeatcapacityEnum,
+	MaterialsLatentheatEnum,
+	MaterialsMeltingpointEnum,
+	MaterialsMixedLayerCapacityEnum,
+	MaterialsRheologyBEnum,
+	MaterialsRheologyBbarEnum,
+	MaterialsRheologyLawEnum,
+	MaterialsRheologyNEnum,
+	MaterialsRhoIceEnum,
+	MaterialsRhoWaterEnum,
+	MaterialsThermalExchangeVelocityEnum,
+	MaterialsThermalconductivityEnum,
 	MeshAverageVertexConnectivityEnum,
 	MeshDimensionEnum,
+	MeshEdgesEnum,
+	MeshElementconnectivityEnum,
+	MeshElementonbedEnum,
+	MeshElementonsurfaceEnum,
+	MeshElements2dEnum,
+	MeshElementsEnum,
+	MeshLowerelementsEnum,
+	MeshNumberofedgesEnum,
+	MeshNumberofelements2dEnum,
 	MeshNumberofelementsEnum,
-	MeshNumberofverticesEnum,
-	MeshNumberofelements2dEnum,
-	MeshNumberofedgesEnum,
 	MeshNumberoflayersEnum,
 	MeshNumberofvertices2dEnum,
-	MeshElementconnectivityEnum,
-	MeshLowerelementsEnum,
+	MeshNumberofverticesEnum,
 	MeshUpperelementsEnum,
-	MeshElementonbedEnum,
-	MeshElementonsurfaceEnum,
 	MeshVertexonbedEnum,
 	MeshVertexonsurfaceEnum,
-	MeshElements2dEnum,
-	MeshElementsEnum,
-	MeshEdgesEnum,
+	MeshXEnum,
 	MeshYEnum,
 	MeshZEnum,
-	MeshXEnum,
-	/*}}}*/
-	/*Datasets {{{1*/
-	ConstraintsEnum,
-	LoadsEnum,
-	MaterialsEnum,
-	NodesEnum,
-	ParametersEnum,
-	VerticesEnum,
-	ResultsEnum,
-	/*}}}*/
-	/*Solution types {{{1 */
+	MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script)
+	PrognosticHydrostaticAdjustmentEnum,
+	PrognosticPenaltyFactorEnum,
+	PrognosticSpcthicknessEnum,
+	PrognosticStabilizationEnum,
+	PrognosticVertexPairingEnum,
+	QmuIsdakotaEnum,
+	QmuMassFluxSegmentsEnum,
+	QmuNumberofpartitionsEnum,
+	QmuNumberofresponsesEnum,
+	QmuPartitionEnum,
+	QmuResponsedescriptorsEnum,
+	QmuVariabledescriptorsEnum,
+	RiftsNumriftsEnum,
+	RiftsRiftstructEnum,
+	SettingsIoGatherEnum,
+	SettingsLowmemEnum,
+	SettingsOutputFrequencyEnum,
+	SettingsResultsOnVerticesEnum,
+	SettingsWaitonlockEnum,
+	SteadystateMaxiterEnum,
+	SteadystateNumRequestedOutputsEnum,
+	SteadystateReltolEnum,
+	SteadystateRequestedOutputsEnum,
+	SurfaceEnum,
+	SurfaceforcingsAblationRateEnum,
+	SurfaceforcingsAccumulationRateEnum,
+	SurfaceforcingsMassBalanceEnum,
+	ThermalMaxiterEnum,
+	ThermalPenaltyFactorEnum,
+	ThermalPenaltyLockEnum,
+	ThermalPenaltyThresholdEnum,
+	ThermalSpctemperatureEnum,
+	ThermalStabilizationEnum,
+	ThicknessEnum,
+	TimesteppingCflCoefficientEnum,
+	TimesteppingFinalTimeEnum,
+	TimesteppingTimeAdaptEnum,
+	TimesteppingTimeStepEnum,
+	TransientIsdiagnosticEnum,
+	TransientIsgroundinglineEnum,
+	TransientIsprognosticEnum,
+	TransientIsthermalEnum,
+	TransientNumRequestedOutputsEnum,
+	TransientRequestedOutputsEnum,
+	/*}}}*/
+	/*Solutions and Analyses{{{1 */
 	SolutionTypeEnum,
-	/*}}}*/
-	/*Analysis types {{{1 */
 	AnalysisTypeEnum,
 	ConfigurationTypeEnum,
+	AdjointBalancethicknessAnalysisEnum,
+	AdjointHorizAnalysisEnum,
+	AdjointSolutionEnum,
 	AnalysisCounterEnum,
-	//diagnostic
-	DiagnosticSolutionEnum,
-	DiagnosticHorizAnalysisEnum,
-	DiagnosticVertAnalysisEnum,
-	DiagnosticHutterAnalysisEnum,
-	//control
-	AdjointSolutionEnum,
-	AdjointHorizAnalysisEnum,
-	AdjointBalancethicknessAnalysisEnum,
-	//thermal
-	ThermalSolutionEnum,
-	ThermalAnalysisEnum,
-	//hydro
-	HydrologySolutionEnum,
-	HydrologyAnalysisEnum,
-	//transient
-	TransientSolutionEnum,
-	//slope
+	BalancethicknessAnalysisEnum,
+	BalancethicknessSolutionEnum,
+	BedSlopeAnalysisEnum,
 	BedSlopeSolutionEnum,
-	BedSlopeAnalysisEnum,
-	SurfaceSlopeSolutionEnum,
-	SurfaceSlopeAnalysisEnum,
 	BedSlopeXAnalysisEnum,
 	BedSlopeYAnalysisEnum,
+	DiagnosticHorizAnalysisEnum,
+	DiagnosticHutterAnalysisEnum,
+	DiagnosticSolutionEnum,
+	DiagnosticVertAnalysisEnum,
+	EnthalpyAnalysisEnum,
+	EnthalpySolutionEnum,
+	FlaimAnalysisEnum,
+	FlaimSolutionEnum,
+	HydrologyAnalysisEnum,
+	HydrologySolutionEnum,
+	MeltingAnalysisEnum,
+	NoneAnalysisEnum,
+	PrognosticAnalysisEnum,
+	PrognosticSolutionEnum,
+	SteadystateSolutionEnum,
+	SurfaceSlopeAnalysisEnum,
+	SurfaceSlopeSolutionEnum,
 	SurfaceSlopeXAnalysisEnum,
 	SurfaceSlopeYAnalysisEnum,
-	//prognostic
-	BalancethicknessSolutionEnum,
-	BalancethicknessAnalysisEnum,
-	PrognosticSolutionEnum,
-	PrognosticAnalysisEnum,
-	//melting
-	MeltingAnalysisEnum,
-	//steadystate
-	SteadystateSolutionEnum,
-	//flaim
-	FlaimSolutionEnum,
-	FlaimAnalysisEnum,
-	//none
-	NoneAnalysisEnum,
+	ThermalAnalysisEnum,
+	ThermalSolutionEnum,
+	TransientSolutionEnum,
 	/*}}}*/
 	/*Approximations {{{1*/
@@ -237,78 +217,77 @@
 	StokesApproximationEnum,
 	/*}}}*/
+	/*Datasets {{{1*/
+	ConstraintsEnum,
+	LoadsEnum,
+	MaterialsEnum,
+	NodesEnum,
+	ParametersEnum,
+	VerticesEnum,
+	ResultsEnum,
+	/*}}}*/
 	/*Objects {{{1*/
+	BoolInputEnum,
+	BoolParamEnum,
+	ControlInputEnum,
+	DatasetInputEnum,
+	DofIndexingEnum,
+	DoubleInputEnum,
+	DoubleMatArrayParamEnum,
+	DoubleMatParamEnum,
+	DoubleParamEnum,
+	DoubleVecParamEnum,
+	ElementEnum,
+	ElementResultEnum,
+	ExternalResultEnum,
+	FileParamEnum,
 	HookEnum,
-	SegmentEnum,
-	/*Elements: */
-	ElementEnum,
-	DofIndexingEnum,
-	PentaEnum,
-	TriaEnum,
-	/*Nodes: */
+	IcefrontEnum,
+	InputEnum,
+	IntInputEnum,
+	IntParamEnum,
+	IntVecParamEnum,
+	MacAyeal2dIceFrontEnum,
+	MacAyeal3dIceFrontEnum,
+	MaticeEnum,
+	MatparEnum,
 	NodeEnum,
-	VertexEnum,
-	/*Loads: */
-	IcefrontEnum,
 	NumericalfluxEnum,
+	ParamEnum,
+	PattynIceFrontEnum,
 	PengridEnum,
 	PenpairEnum,
-	RiftfrontEnum,
-	SegmentRiftfrontEnum,
-	MacAyeal2dIceFrontEnum,
-	MacAyeal3dIceFrontEnum,
-	PattynIceFrontEnum,
-	StokesIceFrontEnum,
-	/*Materials: */
-	MaticeEnum,
-	MatparEnum,
-	/*Inputs: */
-	InputEnum,
-	BoolInputEnum,
-	DoubleInputEnum,
-	IntInputEnum,
+	PentaEnum,
 	PentaVertexInputEnum,
-	TriaVertexInputEnum,
-	ControlInputEnum,
-	/*Params: */
-	ParamEnum,
-	BoolParamEnum,
-	DoubleMatParamEnum,
-	DoubleMatArrayParamEnum,
-	DoubleParamEnum,
-	DoubleVecParamEnum,
-	IntParamEnum,
-	IntVecParamEnum,
-	FileParamEnum,
 	PetscMatParamEnum,
 	PetscVecParamEnum,
+	RiftfrontEnum,
+	SegmentEnum,
+	SegmentRiftfrontEnum,
+	SpcDynamicEnum,
+	SpcStaticEnum,
+	SpcTransientEnum,
+	StokesIceFrontEnum,
 	StringArrayParamEnum,
 	StringParamEnum,
-	/*Results: */
-	ElementResultEnum,
-	ExternalResultEnum,
-	/*Spc: */
-	SpcStaticEnum,
-	SpcTransientEnum,
-	/*}}}*/
-	/*Geography {{{1*/
-	IceSheetEnum,
-	IceShelfEnum,
+	TriaEnum,
+	TriaVertexInputEnum,
+	VertexEnum,
 	/*}}}*/
 	/*Fill {{{1*/
+	AirEnum,
+	IceEnum,
+	MelangeEnum,
 	WaterEnum,
-	IceEnum,
-	AirEnum,
-	MelangeEnum,
 	/*}}}*/
 	/*Rift state {{{1*/
+	ClosedEnum,
 	FreeEnum,
 	OpenEnum,
-	ClosedEnum,
 	/*}}}*/
 	/*Inputs {{{1*/
+	AdjointpEnum,
 	AdjointxEnum,
 	AdjointyEnum,
 	AdjointzEnum,
-	AdjointpEnum,
 	BedSlopeXEnum,
 	BedSlopeYEnum,
@@ -316,157 +295,56 @@
 	ConstantEnum,
 	ConvergedEnum,
+	ExtToIuEnum,
 	FillEnum,
 	FractionIncrementEnum,
 	FrictionEnum,
+	GroundinglineMeltingRateEnum,
 	InternalEnum,
 	IuToExtEnum,
-	ExtToIuEnum,
 	MassFluxEnum,
-	ThicknessAbsMisfitEnum,
-	SurfaceAbsVelMisfitEnum,
-	SurfaceRelVelMisfitEnum,
-	SurfaceLogVelMisfitEnum,
-	SurfaceLogVxVyMisfitEnum,
-	SurfaceAverageVelMisfitEnum,
 	MaxPenetrationEnum,
 	MeltingOffsetEnum,
-	GroundinglineMeltingRateEnum,
 	MisfitEnum,
 	NumberNodeToElementConnectivityEnum,
 	PressureEnum,
 	PressurePicardEnum,
-	VelocityEnum,
 	QmuPressureEnum,
+	QmuVxEnum,
+	QmuVyEnum,
+	QmuVzEnum,
 	ResetPenaltiesEnum,
 	SegmentOnIceShelfEnum,
+	SurfaceAbsVelMisfitEnum,
 	SurfaceAreaEnum,
+	SurfaceAverageVelMisfitEnum,
+	SurfaceLogVelMisfitEnum,
+	SurfaceLogVxVyMisfitEnum,
+	SurfaceRelVelMisfitEnum,
 	SurfaceSlopeXEnum,
 	SurfaceSlopeYEnum,
 	TemperatureEnum,
+	TemperatureOldEnum,
 	TemperaturePicardEnum,
-	TemperatureOldEnum,
+	ThicknessAbsMisfitEnum,
 	TypeEnum,
 	VelEnum,
+	VelocityEnum,
 	VxAverageEnum,
 	VxEnum,
 	VxPicardEnum,
-	QmuVxEnum,
 	VyAverageEnum,
 	VyEnum,
 	VyPicardEnum,
-	QmuVyEnum,
 	VzEnum,
-	VzPicardEnum,
 	VzMacAyealEnum,
 	VzPattynEnum,
+	VzPicardEnum,
 	VzStokesEnum,
-	QmuVzEnum,
-	/*}}}*/
-	/*Element types{{{1*/
-	P0Enum,
-	P1Enum,
-	P1DGEnum,
-	/*}}}*/
-	/*Results{{{1*/
-	DoubleElementResultEnum,
-	TriaVertexElementResultEnum,
-	PentaVertexElementResultEnum,
-	BoolElementResultEnum,
-	BoolExternalResultEnum,
-	DoubleExternalResultEnum,
-	DoubleVecExternalResultEnum,
-	DoubleMatExternalResultEnum,
-	IntExternalResultEnum,
-	PetscVecExternalResultEnum,
-	StringExternalResultEnum,
-	JEnum,
-	PatchEnum,
-	PatchVerticesEnum,
-	PatchNodesEnum,
-	TimeEnum,
-	WaterColumnOldEnum,
-	/*}}}*/
-	/*Responses{{{1*/
-	MinVelEnum,
-	MaxVelEnum,
-	MinVxEnum,
-	MaxVxEnum,
-	MaxAbsVxEnum,
-	MinVyEnum,
-	MaxVyEnum,
-	MaxAbsVyEnum,
-	MinVzEnum,
-	MaxVzEnum,
-	MaxAbsVzEnum,
-	/*}}}*/
-	/*Convergence{{{1*/
-	RelativeEnum,
-	AbsoluteEnum,
-	IncrementalEnum,
-	/*}}}*/
-	/*Grounding Line{{{1*/
-	NoneEnum,
-	AgressiveMigrationEnum,
-	SoftMigrationEnum,
-	/*}}}*/
-
-	/*Solver{{{1*/
-	StokesSolverEnum,
-	/*}}}*/
-	/*Parameters{{{1*/
-	IntersectEnum,
-	ColinearEnum,
-	SeparateEnum,
-	AdjointEnum,
-	GradientEnum,
-	Gradient1Enum,
-	Gradient2Enum,
-	Gradient3Enum,
-	OldGradientEnum,
-	ControlSteadyEnum,
-
-	OutputFilePointerEnum,
-	QmuErrNameEnum,
-	QmuInNameEnum,
-	QmuOutNameEnum,
-	IndexedEnum,
-	RegularEnum,
-	IndexEnum,
-	ScaledEnum,
-	NodalEnum,
-	VerboseEnum,
-	PetscOptionsStringsEnum,
-	PetscOptionsAnalysesEnum,
-	GsetEnum,
-	FsetEnum,
-	SsetEnum,
-	GroundinglineMigrationEnum,
-	/*}}}*/
-	/*Interpolation {{{1*/
-	TriangleInterpEnum,
-	BilinearInterpEnum,
-	NearestInterpEnum,
-	/*}}}*/
-	/*Options{{{1*/
-	OptionEnum,
-	OptionCellEnum,
-	OptionCharEnum,
-	OptionStructEnum,
-	OptionDoubleEnum,
-	OptionLogicalEnum,
-	/*}}}*/
-	/*Rheology law (move too Material) {{{1*/
-	PatersonEnum,
-	ArrheniusEnum,
-	/*}}}*/
 	VxMeshEnum,
 	VyMeshEnum,
 	VzMeshEnum,
-	EnthalpySolutionEnum,
-	EnthalpyAnalysisEnum,
 	EnthalpyEnum,
 	EnthalpyPicardEnum,
 	ThicknessAbsGradientEnum,
-	DatasetInputEnum,
 	StepResponsesEnum,
 	IntMatParamEnum,
@@ -482,6 +360,101 @@
 	HydrologyWaterVxEnum,
 	HydrologyWaterVyEnum,
-	SpcDynamicEnum,
 	IceVolumeEnum,
+	/*}}}*/
+	/*Element Interpolations{{{1*/
+	P0Enum,
+	P1Enum,
+	P1DGEnum,
+	/*}}}*/
+	/*Results{{{1*/
+	BoolElementResultEnum,
+	BoolExternalResultEnum,
+	DoubleElementResultEnum,
+	DoubleExternalResultEnum,
+	DoubleMatExternalResultEnum,
+	DoubleVecExternalResultEnum,
+	IntExternalResultEnum,
+	JEnum,
+	PatchEnum,
+	PatchNodesEnum,
+	PatchVerticesEnum,
+	PentaVertexElementResultEnum,
+	PetscVecExternalResultEnum,
+	StringExternalResultEnum,
+	TimeEnum,
+	TriaVertexElementResultEnum,
+	WaterColumnOldEnum,
+	/*}}}*/
+	/*Responses{{{1*/
+	MinVelEnum,
+	MaxVelEnum,
+	MinVxEnum,
+	MaxVxEnum,
+	MaxAbsVxEnum,
+	MinVyEnum,
+	MaxVyEnum,
+	MaxAbsVyEnum,
+	MinVzEnum,
+	MaxVzEnum,
+	MaxAbsVzEnum,
+	/*}}}*/
+	/*Convergence{{{1*/
+	RelativeEnum,
+	AbsoluteEnum,
+	IncrementalEnum,
+	/*}}}*/
+	/*Grounding Line{{{1*/
+	AgressiveMigrationEnum,
+	NoneEnum,
+	SoftMigrationEnum,
+	/*}}}*/
+	/*Solver{{{1*/
+	StokesSolverEnum,
+	/*}}}*/
+	/*Parameters{{{1*/
+	AdjointEnum,
+	ColinearEnum,
+	ControlSteadyEnum,
+	FsetEnum,
+	Gradient1Enum,
+	Gradient2Enum,
+	Gradient3Enum,
+	GradientEnum,
+	GroundinglineMigrationEnum,
+	GsetEnum,
+	IndexEnum,
+	IndexedEnum,
+	IntersectEnum,
+	NodalEnum,
+	OldGradientEnum,
+	OutputFilePointerEnum,
+	PetscOptionsAnalysesEnum,
+	PetscOptionsStringsEnum,
+	QmuErrNameEnum,
+	QmuInNameEnum,
+	QmuOutNameEnum,
+	RegularEnum,
+	ScaledEnum,
+	SeparateEnum,
+	SsetEnum,
+	VerboseEnum,
+	/*}}}*/
+	/*Interpolation {{{1*/
+	TriangleInterpEnum,
+	BilinearInterpEnum,
+	NearestInterpEnum,
+	/*}}}*/
+	/*Options{{{1*/
+	OptionEnum,
+	OptionCellEnum,
+	OptionCharEnum,
+	OptionStructEnum,
+	OptionDoubleEnum,
+	OptionLogicalEnum,
+	/*}}}*/
+	/*Rheology law (move too Material) {{{1*/
+	PatersonEnum,
+	ArrheniusEnum,
+	/*}}}*/
 	MaximumNumberOfEnums
 };
Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp
===================================================================
--- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp	(revision 10520)
+++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp	(revision 10521)
@@ -16,200 +16,195 @@
 	switch(en){
 
+		case AutodiffForwardEnum : return "AutodiffForward";
+		case AutodiffIsautodiffEnum : return "AutodiffIsautodiff";
+		case AutodiffReverseEnum : return "AutodiffReverse";
+		case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
+		case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";
+		case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate";
+		case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux";
+		case BasalforcingsMeltingRateCorrectionEnum : return "BasalforcingsMeltingRateCorrection";
+		case BasalforcingsMeltingRateEnum : return "BasalforcingsMeltingRate";
+		case BathymetryEnum : return "Bathymetry";
+		case BedEnum : return "Bed";
 		case ConstantsGEnum : return "ConstantsG";
 		case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature";
 		case ConstantsYtsEnum : return "ConstantsYts";
-		case SurfaceforcingsAccumulationRateEnum : return "SurfaceforcingsAccumulationRate";
-		case SurfaceforcingsAblationRateEnum : return "SurfaceforcingsAblationRate";
-		case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance";
-		case BasalforcingsMeltingRateEnum : return "BasalforcingsMeltingRate";
-		case BasalforcingsMeltingRateCorrectionEnum : return "BasalforcingsMeltingRateCorrection";
-		case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux";
+		case DiagnosticAbstolEnum : return "DiagnosticAbstol";
+		case DiagnosticIcefrontEnum : return "DiagnosticIcefront";
+		case DiagnosticMaxiterEnum : return "DiagnosticMaxiter";
+		case DiagnosticNumRequestedOutputsEnum : return "DiagnosticNumRequestedOutputs";
+		case DiagnosticPenaltyFactorEnum : return "DiagnosticPenaltyFactor";
+		case DiagnosticReferentialEnum : return "DiagnosticReferential";
+		case DiagnosticReltolEnum : return "DiagnosticReltol";
+		case DiagnosticRequestedOutputsEnum : return "DiagnosticRequestedOutputs";
+		case DiagnosticRestolEnum : return "DiagnosticRestol";
+		case DiagnosticRiftPenaltyLockEnum : return "DiagnosticRiftPenaltyLock";
+		case DiagnosticRiftPenaltyThresholdEnum : return "DiagnosticRiftPenaltyThreshold";
+		case DiagnosticShelfDampeningEnum : return "DiagnosticShelfDampening";
+		case DiagnosticSpcvxEnum : return "DiagnosticSpcvx";
+		case DiagnosticSpcvyEnum : return "DiagnosticSpcvy";
+		case DiagnosticSpcvzEnum : return "DiagnosticSpcvz";
+		case DiagnosticStokesreconditioningEnum : return "DiagnosticStokesreconditioning";
+		case DiagnosticVertexPairingEnum : return "DiagnosticVertexPairing";
+		case DiagnosticViscosityOvershootEnum : return "DiagnosticViscosityOvershoot";
+		case FlowequationBordermacayealEnum : return "FlowequationBordermacayeal";
+		case FlowequationBorderpattynEnum : return "FlowequationBorderpattyn";
+		case FlowequationBorderstokesEnum : return "FlowequationBorderstokes";
+		case FlowequationElementEquationEnum : return "FlowequationElementEquation";
+		case FlowequationIshutterEnum : return "FlowequationIshutter";
+		case FlowequationIsmacayealpattynEnum : return "FlowequationIsmacayealpattyn";
+		case FlowequationIsstokesEnum : return "FlowequationIsstokes";
+		case FlowequationVertexEquationEnum : return "FlowequationVertexEquation";
 		case FrictionCoefficientEnum : return "FrictionCoefficient";
 		case FrictionPEnum : return "FrictionP";
 		case FrictionQEnum : return "FrictionQ";
-		case RiftsRiftstructEnum : return "RiftsRiftstruct";
-		case RiftsNumriftsEnum : return "RiftsNumrifts";
-		case HydrologySpcwatercolumnEnum : return "HydrologySpcwatercolumn";
+		case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
+		case HydrologyCREnum : return "HydrologyCR";
 		case HydrologyKnEnum : return "HydrologyKn";
 		case HydrologyNEnum : return "HydrologyN";
 		case HydrologyPEnum : return "HydrologyP";
 		case HydrologyQEnum : return "HydrologyQ";
-		case HydrologyCREnum : return "HydrologyCR";
+		case HydrologySpcwatercolumnEnum : return "HydrologySpcwatercolumn";
 		case HydrologyStabilizationEnum : return "HydrologyStabilization";
-		case SettingsLowmemEnum : return "SettingsLowmem";
-		case SettingsIoGatherEnum : return "SettingsIoGather";
-		case SettingsResultsOnVerticesEnum : return "SettingsResultsOnVertices";
-		case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency";
-		case SettingsWaitonlockEnum : return "SettingsWaitonlock";
-		case ThermalSpctemperatureEnum : return "ThermalSpctemperature";
-		case ThermalPenaltyThresholdEnum : return "ThermalPenaltyThreshold";
-		case ThermalPenaltyLockEnum : return "ThermalPenaltyLock";
-		case ThermalMaxiterEnum : return "ThermalMaxiter";
-		case ThermalStabilizationEnum : return "ThermalStabilization";
-		case ThermalPenaltyFactorEnum : return "ThermalPenaltyFactor";
-		case MiscellaneousNameEnum : return "MiscellaneousName";
-		case TimesteppingTimeStepEnum : return "TimesteppingTimeStep";
-		case TimesteppingFinalTimeEnum : return "TimesteppingFinalTime";
-		case TimesteppingTimeAdaptEnum : return "TimesteppingTimeAdapt";
-		case TimesteppingCflCoefficientEnum : return "TimesteppingCflCoefficient";
-		case PrognosticSpcthicknessEnum : return "PrognosticSpcthickness";
-		case PrognosticHydrostaticAdjustmentEnum : return "PrognosticHydrostaticAdjustment";
-		case PrognosticStabilizationEnum : return "PrognosticStabilization";
-		case PrognosticVertexPairingEnum : return "PrognosticVertexPairing";
-		case PrognosticPenaltyFactorEnum : return "PrognosticPenaltyFactor";
-		case MaterialsRheologyBEnum : return "MaterialsRheologyB";
-		case MaterialsRheologyBbarEnum : return "MaterialsRheologyBbar";
-		case MaterialsRheologyNEnum : return "MaterialsRheologyN";
-		case MaterialsRheologyLawEnum : return "MaterialsRheologyLaw";
-		case MaterialsRhoIceEnum : return "MaterialsRhoIce";
-		case MaterialsRhoWaterEnum : return "MaterialsRhoWater";
-		case MaterialsHeatcapacityEnum : return "MaterialsHeatcapacity";
-		case MaterialsLatentheatEnum : return "MaterialsLatentheat";
-		case MaterialsBetaEnum : return "MaterialsBeta";
-		case MaterialsThermalconductivityEnum : return "MaterialsThermalconductivity";
-		case MaterialsMixedLayerCapacityEnum : return "MaterialsMixedLayerCapacity";
-		case MaterialsThermalExchangeVelocityEnum : return "MaterialsThermalExchangeVelocity";
-		case MaterialsMeltingpointEnum : return "MaterialsMeltingpoint";
-		case MaskElementongroundediceEnum : return "MaskElementongroundedice";
-		case MaskElementonfloatingiceEnum : return "MaskElementonfloatingice";
-		case MaskElementonwaterEnum : return "MaskElementonwater";
-		case MaskVertexongroundediceEnum : return "MaskVertexongroundedice";
-		case MaskVertexonfloatingiceEnum : return "MaskVertexonfloatingice";
-		case MaskVertexonwaterEnum : return "MaskVertexonwater";
-		case QmuIsdakotaEnum : return "QmuIsdakota";
-		case QmuMassFluxSegmentsEnum : return "QmuMassFluxSegments";
-		case QmuPartitionEnum : return "QmuPartition";
-		case QmuNumberofpartitionsEnum : return "QmuNumberofpartitions";
-		case QmuNumberofresponsesEnum : return "QmuNumberofresponses";
-		case QmuResponsedescriptorsEnum : return "QmuResponsedescriptors";
-		case QmuVariabledescriptorsEnum : return "QmuVariabledescriptors";
-		case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
-		case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate";
-		case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";
-		case FlowequationIshutterEnum : return "FlowequationIshutter";
-		case FlowequationIsmacayealpattynEnum : return "FlowequationIsmacayealpattyn";
-		case FlowequationIsstokesEnum : return "FlowequationIsstokes";
-		case FlowequationElementEquationEnum : return "FlowequationElementEquation";
-		case FlowequationVertexEquationEnum : return "FlowequationVertexEquation";
-		case FlowequationBorderstokesEnum : return "FlowequationBorderstokes";
-		case FlowequationBorderpattynEnum : return "FlowequationBorderpattyn";
-		case FlowequationBordermacayealEnum : return "FlowequationBordermacayeal";
-		case SteadystateRequestedOutputsEnum : return "SteadystateRequestedOutputs";
-		case SteadystateNumRequestedOutputsEnum : return "SteadystateNumRequestedOutputs";
-		case SteadystateReltolEnum : return "SteadystateReltol";
-		case SteadystateMaxiterEnum : return "SteadystateMaxiter";
-		case TransientIsprognosticEnum : return "TransientIsprognostic";
-		case TransientIsdiagnosticEnum : return "TransientIsdiagnostic";
-		case TransientIsthermalEnum : return "TransientIsthermal";
-		case TransientIsgroundinglineEnum : return "TransientIsgroundingline";
-		case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";
-		case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs";
+		case InversionControlParametersEnum : return "InversionControlParameters";
+		case InversionCostFunctionEnum : return "InversionCostFunction";
+		case InversionCostFunctionThresholdEnum : return "InversionCostFunctionThreshold";
+		case InversionCostFunctionsCoefficientsEnum : return "InversionCostFunctionsCoefficients";
+		case InversionCostFunctionsEnum : return "InversionCostFunctions";
+		case InversionGradientOnlyEnum : return "InversionGradientOnly";
+		case InversionGradientScalingEnum : return "InversionGradientScaling";
 		case InversionIscontrolEnum : return "InversionIscontrol";
-		case InversionControlParametersEnum : return "InversionControlParameters";
-		case InversionCostFunctionsEnum : return "InversionCostFunctions";
-		case InversionCostFunctionEnum : return "InversionCostFunction";
-		case InversionCostFunctionsCoefficientsEnum : return "InversionCostFunctionsCoefficients";
+		case InversionMaxParametersEnum : return "InversionMaxParameters";
+		case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep";
+		case InversionMinParametersEnum : return "InversionMinParameters";
 		case InversionNstepsEnum : return "InversionNsteps";
-		case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep";
-		case InversionGradientScalingEnum : return "InversionGradientScaling";
-		case InversionGradientOnlyEnum : return "InversionGradientOnly";
-		case InversionCostFunctionThresholdEnum : return "InversionCostFunctionThreshold";
-		case InversionMaxParametersEnum : return "InversionMaxParameters";
-		case InversionMinParametersEnum : return "InversionMinParameters";
-		case InversionStepThresholdEnum : return "InversionStepThreshold";
 		case InversionNumControlParametersEnum : return "InversionNumControlParameters";
 		case InversionNumCostFunctionsEnum : return "InversionNumCostFunctions";
+		case InversionStepThresholdEnum : return "InversionStepThreshold";
+		case InversionThicknessObsEnum : return "InversionThicknessObs";
+		case InversionVelObsEnum : return "InversionVelObs";
 		case InversionVxObsEnum : return "InversionVxObs";
 		case InversionVyObsEnum : return "InversionVyObs";
 		case InversionVzObsEnum : return "InversionVzObs";
-		case InversionVelObsEnum : return "InversionVelObs";
-		case InversionThicknessObsEnum : return "InversionThicknessObs";
-		case DiagnosticSpcvxEnum : return "DiagnosticSpcvx";
-		case DiagnosticSpcvyEnum : return "DiagnosticSpcvy";
-		case DiagnosticSpcvzEnum : return "DiagnosticSpcvz";
-		case DiagnosticStokesreconditioningEnum : return "DiagnosticStokesreconditioning";
-		case DiagnosticIcefrontEnum : return "DiagnosticIcefront";
-		case DiagnosticReferentialEnum : return "DiagnosticReferential";
-		case DiagnosticVertexPairingEnum : return "DiagnosticVertexPairing";
-		case DiagnosticPenaltyFactorEnum : return "DiagnosticPenaltyFactor";
-		case DiagnosticAbstolEnum : return "DiagnosticAbstol";
-		case DiagnosticReltolEnum : return "DiagnosticReltol";
-		case DiagnosticRestolEnum : return "DiagnosticRestol";
-		case DiagnosticMaxiterEnum : return "DiagnosticMaxiter";
-		case DiagnosticShelfDampeningEnum : return "DiagnosticShelfDampening";
-		case DiagnosticRiftPenaltyLockEnum : return "DiagnosticRiftPenaltyLock";
-		case DiagnosticRiftPenaltyThresholdEnum : return "DiagnosticRiftPenaltyThreshold";
-		case DiagnosticRequestedOutputsEnum : return "DiagnosticRequestedOutputs";
-		case DiagnosticNumRequestedOutputsEnum : return "DiagnosticNumRequestedOutputs";
-		case DiagnosticViscosityOvershootEnum : return "DiagnosticViscosityOvershoot";
-		case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
-		case ThicknessEnum : return "Thickness";
-		case BedEnum : return "Bed";
-		case BathymetryEnum : return "Bathymetry";
-		case SurfaceEnum : return "Surface";
-		case AutodiffIsautodiffEnum : return "AutodiffIsautodiff";
-		case AutodiffForwardEnum : return "AutodiffForward";
-		case AutodiffReverseEnum : return "AutodiffReverse";
+		case MaskElementonfloatingiceEnum : return "MaskElementonfloatingice";
+		case MaskElementongroundediceEnum : return "MaskElementongroundedice";
+		case MaskElementonwaterEnum : return "MaskElementonwater";
+		case MaskVertexonfloatingiceEnum : return "MaskVertexonfloatingice";
+		case MaskVertexongroundediceEnum : return "MaskVertexongroundedice";
+		case MaskVertexonwaterEnum : return "MaskVertexonwater";
+		case MaterialsBetaEnum : return "MaterialsBeta";
+		case MaterialsHeatcapacityEnum : return "MaterialsHeatcapacity";
+		case MaterialsLatentheatEnum : return "MaterialsLatentheat";
+		case MaterialsMeltingpointEnum : return "MaterialsMeltingpoint";
+		case MaterialsMixedLayerCapacityEnum : return "MaterialsMixedLayerCapacity";
+		case MaterialsRheologyBEnum : return "MaterialsRheologyB";
+		case MaterialsRheologyBbarEnum : return "MaterialsRheologyBbar";
+		case MaterialsRheologyLawEnum : return "MaterialsRheologyLaw";
+		case MaterialsRheologyNEnum : return "MaterialsRheologyN";
+		case MaterialsRhoIceEnum : return "MaterialsRhoIce";
+		case MaterialsRhoWaterEnum : return "MaterialsRhoWater";
+		case MaterialsThermalExchangeVelocityEnum : return "MaterialsThermalExchangeVelocity";
+		case MaterialsThermalconductivityEnum : return "MaterialsThermalconductivity";
 		case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity";
 		case MeshDimensionEnum : return "MeshDimension";
+		case MeshEdgesEnum : return "MeshEdges";
+		case MeshElementconnectivityEnum : return "MeshElementconnectivity";
+		case MeshElementonbedEnum : return "MeshElementonbed";
+		case MeshElementonsurfaceEnum : return "MeshElementonsurface";
+		case MeshElements2dEnum : return "MeshElements2d";
+		case MeshElementsEnum : return "MeshElements";
+		case MeshLowerelementsEnum : return "MeshLowerelements";
+		case MeshNumberofedgesEnum : return "MeshNumberofedges";
+		case MeshNumberofelements2dEnum : return "MeshNumberofelements2d";
 		case MeshNumberofelementsEnum : return "MeshNumberofelements";
-		case MeshNumberofverticesEnum : return "MeshNumberofvertices";
-		case MeshNumberofelements2dEnum : return "MeshNumberofelements2d";
-		case MeshNumberofedgesEnum : return "MeshNumberofedges";
 		case MeshNumberoflayersEnum : return "MeshNumberoflayers";
 		case MeshNumberofvertices2dEnum : return "MeshNumberofvertices2d";
-		case MeshElementconnectivityEnum : return "MeshElementconnectivity";
-		case MeshLowerelementsEnum : return "MeshLowerelements";
+		case MeshNumberofverticesEnum : return "MeshNumberofvertices";
 		case MeshUpperelementsEnum : return "MeshUpperelements";
-		case MeshElementonbedEnum : return "MeshElementonbed";
-		case MeshElementonsurfaceEnum : return "MeshElementonsurface";
 		case MeshVertexonbedEnum : return "MeshVertexonbed";
 		case MeshVertexonsurfaceEnum : return "MeshVertexonsurface";
-		case MeshElements2dEnum : return "MeshElements2d";
-		case MeshElementsEnum : return "MeshElements";
-		case MeshEdgesEnum : return "MeshEdges";
+		case MeshXEnum : return "MeshX";
 		case MeshYEnum : return "MeshY";
 		case MeshZEnum : return "MeshZ";
-		case MeshXEnum : return "MeshX";
-		case ConstraintsEnum : return "Constraints";
-		case LoadsEnum : return "Loads";
-		case MaterialsEnum : return "Materials";
-		case NodesEnum : return "Nodes";
-		case ParametersEnum : return "Parameters";
-		case VerticesEnum : return "Vertices";
-		case ResultsEnum : return "Results";
+		case MiscellaneousNameEnum : return "MiscellaneousName";
+		case PrognosticHydrostaticAdjustmentEnum : return "PrognosticHydrostaticAdjustment";
+		case PrognosticPenaltyFactorEnum : return "PrognosticPenaltyFactor";
+		case PrognosticSpcthicknessEnum : return "PrognosticSpcthickness";
+		case PrognosticStabilizationEnum : return "PrognosticStabilization";
+		case PrognosticVertexPairingEnum : return "PrognosticVertexPairing";
+		case QmuIsdakotaEnum : return "QmuIsdakota";
+		case QmuMassFluxSegmentsEnum : return "QmuMassFluxSegments";
+		case QmuNumberofpartitionsEnum : return "QmuNumberofpartitions";
+		case QmuNumberofresponsesEnum : return "QmuNumberofresponses";
+		case QmuPartitionEnum : return "QmuPartition";
+		case QmuResponsedescriptorsEnum : return "QmuResponsedescriptors";
+		case QmuVariabledescriptorsEnum : return "QmuVariabledescriptors";
+		case RiftsNumriftsEnum : return "RiftsNumrifts";
+		case RiftsRiftstructEnum : return "RiftsRiftstruct";
+		case SettingsIoGatherEnum : return "SettingsIoGather";
+		case SettingsLowmemEnum : return "SettingsLowmem";
+		case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency";
+		case SettingsResultsOnVerticesEnum : return "SettingsResultsOnVertices";
+		case SettingsWaitonlockEnum : return "SettingsWaitonlock";
+		case SteadystateMaxiterEnum : return "SteadystateMaxiter";
+		case SteadystateNumRequestedOutputsEnum : return "SteadystateNumRequestedOutputs";
+		case SteadystateReltolEnum : return "SteadystateReltol";
+		case SteadystateRequestedOutputsEnum : return "SteadystateRequestedOutputs";
+		case SurfaceEnum : return "Surface";
+		case SurfaceforcingsAblationRateEnum : return "SurfaceforcingsAblationRate";
+		case SurfaceforcingsAccumulationRateEnum : return "SurfaceforcingsAccumulationRate";
+		case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance";
+		case ThermalMaxiterEnum : return "ThermalMaxiter";
+		case ThermalPenaltyFactorEnum : return "ThermalPenaltyFactor";
+		case ThermalPenaltyLockEnum : return "ThermalPenaltyLock";
+		case ThermalPenaltyThresholdEnum : return "ThermalPenaltyThreshold";
+		case ThermalSpctemperatureEnum : return "ThermalSpctemperature";
+		case ThermalStabilizationEnum : return "ThermalStabilization";
+		case ThicknessEnum : return "Thickness";
+		case TimesteppingCflCoefficientEnum : return "TimesteppingCflCoefficient";
+		case TimesteppingFinalTimeEnum : return "TimesteppingFinalTime";
+		case TimesteppingTimeAdaptEnum : return "TimesteppingTimeAdapt";
+		case TimesteppingTimeStepEnum : return "TimesteppingTimeStep";
+		case TransientIsdiagnosticEnum : return "TransientIsdiagnostic";
+		case TransientIsgroundinglineEnum : return "TransientIsgroundingline";
+		case TransientIsprognosticEnum : return "TransientIsprognostic";
+		case TransientIsthermalEnum : return "TransientIsthermal";
+		case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs";
+		case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";
 		case SolutionTypeEnum : return "SolutionType";
 		case AnalysisTypeEnum : return "AnalysisType";
 		case ConfigurationTypeEnum : return "ConfigurationType";
+		case AdjointBalancethicknessAnalysisEnum : return "AdjointBalancethicknessAnalysis";
+		case AdjointHorizAnalysisEnum : return "AdjointHorizAnalysis";
+		case AdjointSolutionEnum : return "AdjointSolution";
 		case AnalysisCounterEnum : return "AnalysisCounter";
-		case DiagnosticSolutionEnum : return "DiagnosticSolution";
-		case DiagnosticHorizAnalysisEnum : return "DiagnosticHorizAnalysis";
-		case DiagnosticVertAnalysisEnum : return "DiagnosticVertAnalysis";
-		case DiagnosticHutterAnalysisEnum : return "DiagnosticHutterAnalysis";
-		case AdjointSolutionEnum : return "AdjointSolution";
-		case AdjointHorizAnalysisEnum : return "AdjointHorizAnalysis";
-		case AdjointBalancethicknessAnalysisEnum : return "AdjointBalancethicknessAnalysis";
-		case ThermalSolutionEnum : return "ThermalSolution";
-		case ThermalAnalysisEnum : return "ThermalAnalysis";
-		case HydrologySolutionEnum : return "HydrologySolution";
-		case HydrologyAnalysisEnum : return "HydrologyAnalysis";
-		case TransientSolutionEnum : return "TransientSolution";
+		case BalancethicknessAnalysisEnum : return "BalancethicknessAnalysis";
+		case BalancethicknessSolutionEnum : return "BalancethicknessSolution";
+		case BedSlopeAnalysisEnum : return "BedSlopeAnalysis";
 		case BedSlopeSolutionEnum : return "BedSlopeSolution";
-		case BedSlopeAnalysisEnum : return "BedSlopeAnalysis";
-		case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution";
-		case SurfaceSlopeAnalysisEnum : return "SurfaceSlopeAnalysis";
 		case BedSlopeXAnalysisEnum : return "BedSlopeXAnalysis";
 		case BedSlopeYAnalysisEnum : return "BedSlopeYAnalysis";
+		case DiagnosticHorizAnalysisEnum : return "DiagnosticHorizAnalysis";
+		case DiagnosticHutterAnalysisEnum : return "DiagnosticHutterAnalysis";
+		case DiagnosticSolutionEnum : return "DiagnosticSolution";
+		case DiagnosticVertAnalysisEnum : return "DiagnosticVertAnalysis";
+		case EnthalpyAnalysisEnum : return "EnthalpyAnalysis";
+		case EnthalpySolutionEnum : return "EnthalpySolution";
+		case FlaimAnalysisEnum : return "FlaimAnalysis";
+		case FlaimSolutionEnum : return "FlaimSolution";
+		case HydrologyAnalysisEnum : return "HydrologyAnalysis";
+		case HydrologySolutionEnum : return "HydrologySolution";
+		case MeltingAnalysisEnum : return "MeltingAnalysis";
+		case NoneAnalysisEnum : return "NoneAnalysis";
+		case PrognosticAnalysisEnum : return "PrognosticAnalysis";
+		case PrognosticSolutionEnum : return "PrognosticSolution";
+		case SteadystateSolutionEnum : return "SteadystateSolution";
+		case SurfaceSlopeAnalysisEnum : return "SurfaceSlopeAnalysis";
+		case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution";
 		case SurfaceSlopeXAnalysisEnum : return "SurfaceSlopeXAnalysis";
 		case SurfaceSlopeYAnalysisEnum : return "SurfaceSlopeYAnalysis";
-		case BalancethicknessSolutionEnum : return "BalancethicknessSolution";
-		case BalancethicknessAnalysisEnum : return "BalancethicknessAnalysis";
-		case PrognosticSolutionEnum : return "PrognosticSolution";
-		case PrognosticAnalysisEnum : return "PrognosticAnalysis";
-		case MeltingAnalysisEnum : return "MeltingAnalysis";
-		case SteadystateSolutionEnum : return "SteadystateSolution";
-		case FlaimSolutionEnum : return "FlaimSolution";
-		case FlaimAnalysisEnum : return "FlaimAnalysis";
-		case NoneAnalysisEnum : return "NoneAnalysis";
+		case ThermalAnalysisEnum : return "ThermalAnalysis";
+		case ThermalSolutionEnum : return "ThermalSolution";
+		case TransientSolutionEnum : return "TransientSolution";
 		case ApproximationEnum : return "Approximation";
 		case HutterApproximationEnum : return "HutterApproximation";
@@ -221,61 +216,68 @@
 		case PattynStokesApproximationEnum : return "PattynStokesApproximation";
 		case StokesApproximationEnum : return "StokesApproximation";
+		case ConstraintsEnum : return "Constraints";
+		case LoadsEnum : return "Loads";
+		case MaterialsEnum : return "Materials";
+		case NodesEnum : return "Nodes";
+		case ParametersEnum : return "Parameters";
+		case VerticesEnum : return "Vertices";
+		case ResultsEnum : return "Results";
+		case BoolInputEnum : return "BoolInput";
+		case BoolParamEnum : return "BoolParam";
+		case ControlInputEnum : return "ControlInput";
+		case DatasetInputEnum : return "DatasetInput";
+		case DofIndexingEnum : return "DofIndexing";
+		case DoubleInputEnum : return "DoubleInput";
+		case DoubleMatArrayParamEnum : return "DoubleMatArrayParam";
+		case DoubleMatParamEnum : return "DoubleMatParam";
+		case DoubleParamEnum : return "DoubleParam";
+		case DoubleVecParamEnum : return "DoubleVecParam";
+		case ElementEnum : return "Element";
+		case ElementResultEnum : return "ElementResult";
+		case ExternalResultEnum : return "ExternalResult";
+		case FileParamEnum : return "FileParam";
 		case HookEnum : return "Hook";
-		case SegmentEnum : return "Segment";
-		case ElementEnum : return "Element";
-		case DofIndexingEnum : return "DofIndexing";
-		case PentaEnum : return "Penta";
-		case TriaEnum : return "Tria";
+		case IcefrontEnum : return "Icefront";
+		case InputEnum : return "Input";
+		case IntInputEnum : return "IntInput";
+		case IntParamEnum : return "IntParam";
+		case IntVecParamEnum : return "IntVecParam";
+		case MacAyeal2dIceFrontEnum : return "MacAyeal2dIceFront";
+		case MacAyeal3dIceFrontEnum : return "MacAyeal3dIceFront";
+		case MaticeEnum : return "Matice";
+		case MatparEnum : return "Matpar";
 		case NodeEnum : return "Node";
-		case VertexEnum : return "Vertex";
-		case IcefrontEnum : return "Icefront";
 		case NumericalfluxEnum : return "Numericalflux";
+		case ParamEnum : return "Param";
+		case PattynIceFrontEnum : return "PattynIceFront";
 		case PengridEnum : return "Pengrid";
 		case PenpairEnum : return "Penpair";
-		case RiftfrontEnum : return "Riftfront";
-		case SegmentRiftfrontEnum : return "SegmentRiftfront";
-		case MacAyeal2dIceFrontEnum : return "MacAyeal2dIceFront";
-		case MacAyeal3dIceFrontEnum : return "MacAyeal3dIceFront";
-		case PattynIceFrontEnum : return "PattynIceFront";
-		case StokesIceFrontEnum : return "StokesIceFront";
-		case MaticeEnum : return "Matice";
-		case MatparEnum : return "Matpar";
-		case InputEnum : return "Input";
-		case BoolInputEnum : return "BoolInput";
-		case DoubleInputEnum : return "DoubleInput";
-		case IntInputEnum : return "IntInput";
+		case PentaEnum : return "Penta";
 		case PentaVertexInputEnum : return "PentaVertexInput";
-		case TriaVertexInputEnum : return "TriaVertexInput";
-		case ControlInputEnum : return "ControlInput";
-		case ParamEnum : return "Param";
-		case BoolParamEnum : return "BoolParam";
-		case DoubleMatParamEnum : return "DoubleMatParam";
-		case DoubleMatArrayParamEnum : return "DoubleMatArrayParam";
-		case DoubleParamEnum : return "DoubleParam";
-		case DoubleVecParamEnum : return "DoubleVecParam";
-		case IntParamEnum : return "IntParam";
-		case IntVecParamEnum : return "IntVecParam";
-		case FileParamEnum : return "FileParam";
 		case PetscMatParamEnum : return "PetscMatParam";
 		case PetscVecParamEnum : return "PetscVecParam";
+		case RiftfrontEnum : return "Riftfront";
+		case SegmentEnum : return "Segment";
+		case SegmentRiftfrontEnum : return "SegmentRiftfront";
+		case SpcDynamicEnum : return "SpcDynamic";
+		case SpcStaticEnum : return "SpcStatic";
+		case SpcTransientEnum : return "SpcTransient";
+		case StokesIceFrontEnum : return "StokesIceFront";
 		case StringArrayParamEnum : return "StringArrayParam";
 		case StringParamEnum : return "StringParam";
-		case ElementResultEnum : return "ElementResult";
-		case ExternalResultEnum : return "ExternalResult";
-		case SpcStaticEnum : return "SpcStatic";
-		case SpcTransientEnum : return "SpcTransient";
-		case IceSheetEnum : return "IceSheet";
-		case IceShelfEnum : return "IceShelf";
+		case TriaEnum : return "Tria";
+		case TriaVertexInputEnum : return "TriaVertexInput";
+		case VertexEnum : return "Vertex";
+		case AirEnum : return "Air";
+		case IceEnum : return "Ice";
+		case MelangeEnum : return "Melange";
 		case WaterEnum : return "Water";
-		case IceEnum : return "Ice";
-		case AirEnum : return "Air";
-		case MelangeEnum : return "Melange";
+		case ClosedEnum : return "Closed";
 		case FreeEnum : return "Free";
 		case OpenEnum : return "Open";
-		case ClosedEnum : return "Closed";
+		case AdjointpEnum : return "Adjointp";
 		case AdjointxEnum : return "Adjointx";
 		case AdjointyEnum : return "Adjointy";
 		case AdjointzEnum : return "Adjointz";
-		case AdjointpEnum : return "Adjointp";
 		case BedSlopeXEnum : return "BedSlopeX";
 		case BedSlopeYEnum : return "BedSlopeY";
@@ -283,69 +285,89 @@
 		case ConstantEnum : return "Constant";
 		case ConvergedEnum : return "Converged";
+		case ExtToIuEnum : return "ExtToIu";
 		case FillEnum : return "Fill";
 		case FractionIncrementEnum : return "FractionIncrement";
 		case FrictionEnum : return "Friction";
+		case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate";
 		case InternalEnum : return "Internal";
 		case IuToExtEnum : return "IuToExt";
-		case ExtToIuEnum : return "ExtToIu";
 		case MassFluxEnum : return "MassFlux";
-		case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit";
-		case SurfaceAbsVelMisfitEnum : return "SurfaceAbsVelMisfit";
-		case SurfaceRelVelMisfitEnum : return "SurfaceRelVelMisfit";
-		case SurfaceLogVelMisfitEnum : return "SurfaceLogVelMisfit";
-		case SurfaceLogVxVyMisfitEnum : return "SurfaceLogVxVyMisfit";
-		case SurfaceAverageVelMisfitEnum : return "SurfaceAverageVelMisfit";
 		case MaxPenetrationEnum : return "MaxPenetration";
 		case MeltingOffsetEnum : return "MeltingOffset";
-		case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate";
 		case MisfitEnum : return "Misfit";
 		case NumberNodeToElementConnectivityEnum : return "NumberNodeToElementConnectivity";
 		case PressureEnum : return "Pressure";
 		case PressurePicardEnum : return "PressurePicard";
-		case VelocityEnum : return "Velocity";
 		case QmuPressureEnum : return "QmuPressure";
+		case QmuVxEnum : return "QmuVx";
+		case QmuVyEnum : return "QmuVy";
+		case QmuVzEnum : return "QmuVz";
 		case ResetPenaltiesEnum : return "ResetPenalties";
 		case SegmentOnIceShelfEnum : return "SegmentOnIceShelf";
+		case SurfaceAbsVelMisfitEnum : return "SurfaceAbsVelMisfit";
 		case SurfaceAreaEnum : return "SurfaceArea";
+		case SurfaceAverageVelMisfitEnum : return "SurfaceAverageVelMisfit";
+		case SurfaceLogVelMisfitEnum : return "SurfaceLogVelMisfit";
+		case SurfaceLogVxVyMisfitEnum : return "SurfaceLogVxVyMisfit";
+		case SurfaceRelVelMisfitEnum : return "SurfaceRelVelMisfit";
 		case SurfaceSlopeXEnum : return "SurfaceSlopeX";
 		case SurfaceSlopeYEnum : return "SurfaceSlopeY";
 		case TemperatureEnum : return "Temperature";
+		case TemperatureOldEnum : return "TemperatureOld";
 		case TemperaturePicardEnum : return "TemperaturePicard";
-		case TemperatureOldEnum : return "TemperatureOld";
+		case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit";
 		case TypeEnum : return "Type";
 		case VelEnum : return "Vel";
+		case VelocityEnum : return "Velocity";
 		case VxAverageEnum : return "VxAverage";
 		case VxEnum : return "Vx";
 		case VxPicardEnum : return "VxPicard";
-		case QmuVxEnum : return "QmuVx";
 		case VyAverageEnum : return "VyAverage";
 		case VyEnum : return "Vy";
 		case VyPicardEnum : return "VyPicard";
-		case QmuVyEnum : return "QmuVy";
 		case VzEnum : return "Vz";
-		case VzPicardEnum : return "VzPicard";
 		case VzMacAyealEnum : return "VzMacAyeal";
 		case VzPattynEnum : return "VzPattyn";
+		case VzPicardEnum : return "VzPicard";
 		case VzStokesEnum : return "VzStokes";
-		case QmuVzEnum : return "QmuVz";
+		case VxMeshEnum : return "VxMesh";
+		case VyMeshEnum : return "VyMesh";
+		case VzMeshEnum : return "VzMesh";
+		case EnthalpyEnum : return "Enthalpy";
+		case EnthalpyPicardEnum : return "EnthalpyPicard";
+		case ThicknessAbsGradientEnum : return "ThicknessAbsGradient";
+		case StepResponsesEnum : return "StepResponses";
+		case IntMatParamEnum : return "IntMatParam";
+		case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient";
+		case DragCoefficientAbsGradientEnum : return "DragCoefficientAbsGradient";
+		case TransientInputEnum : return "TransientInput";
+		case OutputfilenameEnum : return "Outputfilename";
+		case WaterfractionEnum : return "Waterfraction";
+		case WatercolumnEnum : return "Watercolumn";
+		case BasalFrictionEnum : return "BasalFriction";
+		case ViscousHeatingEnum : return "ViscousHeating";
+		case QmuTemperatureEnum : return "QmuTemperature";
+		case HydrologyWaterVxEnum : return "HydrologyWaterVx";
+		case HydrologyWaterVyEnum : return "HydrologyWaterVy";
+		case IceVolumeEnum : return "IceVolume";
 		case P0Enum : return "P0";
 		case P1Enum : return "P1";
 		case P1DGEnum : return "P1DG";
-		case DoubleElementResultEnum : return "DoubleElementResult";
-		case TriaVertexElementResultEnum : return "TriaVertexElementResult";
-		case PentaVertexElementResultEnum : return "PentaVertexElementResult";
 		case BoolElementResultEnum : return "BoolElementResult";
 		case BoolExternalResultEnum : return "BoolExternalResult";
+		case DoubleElementResultEnum : return "DoubleElementResult";
 		case DoubleExternalResultEnum : return "DoubleExternalResult";
+		case DoubleMatExternalResultEnum : return "DoubleMatExternalResult";
 		case DoubleVecExternalResultEnum : return "DoubleVecExternalResult";
-		case DoubleMatExternalResultEnum : return "DoubleMatExternalResult";
 		case IntExternalResultEnum : return "IntExternalResult";
+		case JEnum : return "J";
+		case PatchEnum : return "Patch";
+		case PatchNodesEnum : return "PatchNodes";
+		case PatchVerticesEnum : return "PatchVertices";
+		case PentaVertexElementResultEnum : return "PentaVertexElementResult";
 		case PetscVecExternalResultEnum : return "PetscVecExternalResult";
 		case StringExternalResultEnum : return "StringExternalResult";
-		case JEnum : return "J";
-		case PatchEnum : return "Patch";
-		case PatchVerticesEnum : return "PatchVertices";
-		case PatchNodesEnum : return "PatchNodes";
 		case TimeEnum : return "Time";
+		case TriaVertexElementResultEnum : return "TriaVertexElementResult";
 		case WaterColumnOldEnum : return "WaterColumnOld";
 		case MinVelEnum : return "MinVel";
@@ -363,34 +385,34 @@
 		case AbsoluteEnum : return "Absolute";
 		case IncrementalEnum : return "Incremental";
+		case AgressiveMigrationEnum : return "AgressiveMigration";
 		case NoneEnum : return "None";
-		case AgressiveMigrationEnum : return "AgressiveMigration";
 		case SoftMigrationEnum : return "SoftMigration";
 		case StokesSolverEnum : return "StokesSolver";
-		case IntersectEnum : return "Intersect";
+		case AdjointEnum : return "Adjoint";
 		case ColinearEnum : return "Colinear";
-		case SeparateEnum : return "Separate";
-		case AdjointEnum : return "Adjoint";
-		case GradientEnum : return "Gradient";
+		case ControlSteadyEnum : return "ControlSteady";
+		case FsetEnum : return "Fset";
 		case Gradient1Enum : return "Gradient1";
 		case Gradient2Enum : return "Gradient2";
 		case Gradient3Enum : return "Gradient3";
+		case GradientEnum : return "Gradient";
+		case GroundinglineMigrationEnum : return "GroundinglineMigration";
+		case GsetEnum : return "Gset";
+		case IndexEnum : return "Index";
+		case IndexedEnum : return "Indexed";
+		case IntersectEnum : return "Intersect";
+		case NodalEnum : return "Nodal";
 		case OldGradientEnum : return "OldGradient";
-		case ControlSteadyEnum : return "ControlSteady";
 		case OutputFilePointerEnum : return "OutputFilePointer";
+		case PetscOptionsAnalysesEnum : return "PetscOptionsAnalyses";
+		case PetscOptionsStringsEnum : return "PetscOptionsStrings";
 		case QmuErrNameEnum : return "QmuErrName";
 		case QmuInNameEnum : return "QmuInName";
 		case QmuOutNameEnum : return "QmuOutName";
-		case IndexedEnum : return "Indexed";
 		case RegularEnum : return "Regular";
-		case IndexEnum : return "Index";
 		case ScaledEnum : return "Scaled";
-		case NodalEnum : return "Nodal";
+		case SeparateEnum : return "Separate";
+		case SsetEnum : return "Sset";
 		case VerboseEnum : return "Verbose";
-		case PetscOptionsStringsEnum : return "PetscOptionsStrings";
-		case PetscOptionsAnalysesEnum : return "PetscOptionsAnalyses";
-		case GsetEnum : return "Gset";
-		case FsetEnum : return "Fset";
-		case SsetEnum : return "Sset";
-		case GroundinglineMigrationEnum : return "GroundinglineMigration";
 		case TriangleInterpEnum : return "TriangleInterp";
 		case BilinearInterpEnum : return "BilinearInterp";
@@ -404,28 +426,4 @@
 		case PatersonEnum : return "Paterson";
 		case ArrheniusEnum : return "Arrhenius";
-		case VxMeshEnum : return "VxMesh";
-		case VyMeshEnum : return "VyMesh";
-		case VzMeshEnum : return "VzMesh";
-		case EnthalpySolutionEnum : return "EnthalpySolution";
-		case EnthalpyAnalysisEnum : return "EnthalpyAnalysis";
-		case EnthalpyEnum : return "Enthalpy";
-		case EnthalpyPicardEnum : return "EnthalpyPicard";
-		case ThicknessAbsGradientEnum : return "ThicknessAbsGradient";
-		case DatasetInputEnum : return "DatasetInput";
-		case StepResponsesEnum : return "StepResponses";
-		case IntMatParamEnum : return "IntMatParam";
-		case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient";
-		case DragCoefficientAbsGradientEnum : return "DragCoefficientAbsGradient";
-		case TransientInputEnum : return "TransientInput";
-		case OutputfilenameEnum : return "Outputfilename";
-		case WaterfractionEnum : return "Waterfraction";
-		case WatercolumnEnum : return "Watercolumn";
-		case BasalFrictionEnum : return "BasalFriction";
-		case ViscousHeatingEnum : return "ViscousHeating";
-		case QmuTemperatureEnum : return "QmuTemperature";
-		case HydrologyWaterVxEnum : return "HydrologyWaterVx";
-		case HydrologyWaterVyEnum : return "HydrologyWaterVy";
-		case SpcDynamicEnum : return "SpcDynamic";
-		case IceVolumeEnum : return "IceVolume";
 		default : return "unknown";
 
Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp
===================================================================
--- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp	(revision 10520)
+++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp	(revision 10521)
@@ -14,200 +14,195 @@
 int  StringToEnumx(char* name){
 
-	if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum;
+	if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum;
+	else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
+	else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum;
+	else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
+	else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
+	else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
+	else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
+	else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum;
+	else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum;
+	else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum;
+	else if (strcmp(name,"Bed")==0) return BedEnum;
+	else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum;
 	else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum;
 	else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum;
-	else if (strcmp(name,"SurfaceforcingsAccumulationRate")==0) return SurfaceforcingsAccumulationRateEnum;
-	else if (strcmp(name,"SurfaceforcingsAblationRate")==0) return SurfaceforcingsAblationRateEnum;
-	else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
-	else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum;
-	else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum;
-	else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
+	else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum;
+	else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum;
+	else if (strcmp(name,"DiagnosticMaxiter")==0) return DiagnosticMaxiterEnum;
+	else if (strcmp(name,"DiagnosticNumRequestedOutputs")==0) return DiagnosticNumRequestedOutputsEnum;
+	else if (strcmp(name,"DiagnosticPenaltyFactor")==0) return DiagnosticPenaltyFactorEnum;
+	else if (strcmp(name,"DiagnosticReferential")==0) return DiagnosticReferentialEnum;
+	else if (strcmp(name,"DiagnosticReltol")==0) return DiagnosticReltolEnum;
+	else if (strcmp(name,"DiagnosticRequestedOutputs")==0) return DiagnosticRequestedOutputsEnum;
+	else if (strcmp(name,"DiagnosticRestol")==0) return DiagnosticRestolEnum;
+	else if (strcmp(name,"DiagnosticRiftPenaltyLock")==0) return DiagnosticRiftPenaltyLockEnum;
+	else if (strcmp(name,"DiagnosticRiftPenaltyThreshold")==0) return DiagnosticRiftPenaltyThresholdEnum;
+	else if (strcmp(name,"DiagnosticShelfDampening")==0) return DiagnosticShelfDampeningEnum;
+	else if (strcmp(name,"DiagnosticSpcvx")==0) return DiagnosticSpcvxEnum;
+	else if (strcmp(name,"DiagnosticSpcvy")==0) return DiagnosticSpcvyEnum;
+	else if (strcmp(name,"DiagnosticSpcvz")==0) return DiagnosticSpcvzEnum;
+	else if (strcmp(name,"DiagnosticStokesreconditioning")==0) return DiagnosticStokesreconditioningEnum;
+	else if (strcmp(name,"DiagnosticVertexPairing")==0) return DiagnosticVertexPairingEnum;
+	else if (strcmp(name,"DiagnosticViscosityOvershoot")==0) return DiagnosticViscosityOvershootEnum;
+	else if (strcmp(name,"FlowequationBordermacayeal")==0) return FlowequationBordermacayealEnum;
+	else if (strcmp(name,"FlowequationBorderpattyn")==0) return FlowequationBorderpattynEnum;
+	else if (strcmp(name,"FlowequationBorderstokes")==0) return FlowequationBorderstokesEnum;
+	else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum;
+	else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum;
+	else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum;
+	else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum;
+	else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum;
 	else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum;
 	else if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
 	else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
-	else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
-	else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
-	else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum;
+	else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
+	else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum;
 	else if (strcmp(name,"HydrologyKn")==0) return HydrologyKnEnum;
 	else if (strcmp(name,"HydrologyN")==0) return HydrologyNEnum;
 	else if (strcmp(name,"HydrologyP")==0) return HydrologyPEnum;
 	else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum;
-	else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum;
+	else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum;
 	else if (strcmp(name,"HydrologyStabilization")==0) return HydrologyStabilizationEnum;
-	else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
-	else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
-	else if (strcmp(name,"SettingsResultsOnVertices")==0) return SettingsResultsOnVerticesEnum;
-	else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
-	else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
-	else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
-	else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum;
-	else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum;
-	else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
-	else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
-	else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
-	else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
-	else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
-	else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
-	else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
-	else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
-	else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
-	else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum;
-	else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
-	else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
-	else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
-	else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
-	else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
-	else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
-	else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
-	else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
-	else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
-	else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum;
-	else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum;
-	else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
-	else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
-	else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
-	else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
-	else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
-	else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum;
-	else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum;
-	else if (strcmp(name,"MaskElementonwater")==0) return MaskElementonwaterEnum;
-	else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum;
-	else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum;
-	else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum;
-	else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
-	else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum;
-	else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
-	else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
-	else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
-	else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
-	else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
-	else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
-	else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
-	else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
-	else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum;
-	else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum;
-	else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum;
-	else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum;
-	else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum;
-	else if (strcmp(name,"FlowequationBorderstokes")==0) return FlowequationBorderstokesEnum;
-	else if (strcmp(name,"FlowequationBorderpattyn")==0) return FlowequationBorderpattynEnum;
-	else if (strcmp(name,"FlowequationBordermacayeal")==0) return FlowequationBordermacayealEnum;
-	else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
-	else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
-	else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
-	else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
-	else if (strcmp(name,"TransientIsprognostic")==0) return TransientIsprognosticEnum;
-	else if (strcmp(name,"TransientIsdiagnostic")==0) return TransientIsdiagnosticEnum;
-	else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum;
-	else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
-	else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
-	else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
+	else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
+	else if (strcmp(name,"InversionCostFunction")==0) return InversionCostFunctionEnum;
+	else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum;
+	else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
+	else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum;
+	else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum;
+	else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
 	else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
-	else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
-	else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum;
-	else if (strcmp(name,"InversionCostFunction")==0) return InversionCostFunctionEnum;
-	else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
+	else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
+	else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
+	else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
 	else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
-	else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
-	else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
-	else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum;
-	else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum;
-	else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
-	else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
-	else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
 	else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum;
 	else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum;
+	else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
+	else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum;
+	else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
 	else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
 	else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
 	else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum;
-	else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
-	else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum;
-	else if (strcmp(name,"DiagnosticSpcvx")==0) return DiagnosticSpcvxEnum;
-	else if (strcmp(name,"DiagnosticSpcvy")==0) return DiagnosticSpcvyEnum;
-	else if (strcmp(name,"DiagnosticSpcvz")==0) return DiagnosticSpcvzEnum;
-	else if (strcmp(name,"DiagnosticStokesreconditioning")==0) return DiagnosticStokesreconditioningEnum;
-	else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum;
-	else if (strcmp(name,"DiagnosticReferential")==0) return DiagnosticReferentialEnum;
-	else if (strcmp(name,"DiagnosticVertexPairing")==0) return DiagnosticVertexPairingEnum;
-	else if (strcmp(name,"DiagnosticPenaltyFactor")==0) return DiagnosticPenaltyFactorEnum;
-	else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum;
-	else if (strcmp(name,"DiagnosticReltol")==0) return DiagnosticReltolEnum;
-	else if (strcmp(name,"DiagnosticRestol")==0) return DiagnosticRestolEnum;
-	else if (strcmp(name,"DiagnosticMaxiter")==0) return DiagnosticMaxiterEnum;
-	else if (strcmp(name,"DiagnosticShelfDampening")==0) return DiagnosticShelfDampeningEnum;
-	else if (strcmp(name,"DiagnosticRiftPenaltyLock")==0) return DiagnosticRiftPenaltyLockEnum;
-	else if (strcmp(name,"DiagnosticRiftPenaltyThreshold")==0) return DiagnosticRiftPenaltyThresholdEnum;
-	else if (strcmp(name,"DiagnosticRequestedOutputs")==0) return DiagnosticRequestedOutputsEnum;
-	else if (strcmp(name,"DiagnosticNumRequestedOutputs")==0) return DiagnosticNumRequestedOutputsEnum;
-	else if (strcmp(name,"DiagnosticViscosityOvershoot")==0) return DiagnosticViscosityOvershootEnum;
-	else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
-	else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
-	else if (strcmp(name,"Bed")==0) return BedEnum;
-	else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum;
-	else if (strcmp(name,"Surface")==0) return SurfaceEnum;
-	else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
-	else if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum;
-	else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum;
+	else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum;
+	else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum;
+	else if (strcmp(name,"MaskElementonwater")==0) return MaskElementonwaterEnum;
+	else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum;
+	else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum;
+	else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum;
+	else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
+	else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum;
+	else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum;
+	else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
+	else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
+	else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
+	else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
+	else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
+	else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
+	else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
+	else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
+	else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
+	else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
 	else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
 	else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum;
+	else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum;
+	else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum;
+	else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum;
+	else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum;
+	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,"MeshNumberofedges")==0) return MeshNumberofedgesEnum;
+	else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum;
 	else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum;
-	else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
-	else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum;
-	else if (strcmp(name,"MeshNumberofedges")==0) return MeshNumberofedgesEnum;
 	else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
 	else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum;
-	else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum;
-	else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum;
+	else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
 	else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum;
-	else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum;
-	else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum;
 	else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum;
 	else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
-	else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum;
-	else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
-	else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum;
+	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,"MeshX")==0) return MeshXEnum;
-	else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
-	else if (strcmp(name,"Loads")==0) return LoadsEnum;
-	else if (strcmp(name,"Materials")==0) return MaterialsEnum;
-	else if (strcmp(name,"Nodes")==0) return NodesEnum;
-	else if (strcmp(name,"Parameters")==0) return ParametersEnum;
-	else if (strcmp(name,"Vertices")==0) return VerticesEnum;
-	else if (strcmp(name,"Results")==0) return ResultsEnum;
+	else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
+	else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum;
+	else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
+	else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
+	else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
+	else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
+	else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
+	else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum;
+	else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
+	else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
+	else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
+	else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
+	else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
+	else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
+	else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
+	else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
+	else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
+	else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
+	else if (strcmp(name,"SettingsResultsOnVertices")==0) return SettingsResultsOnVerticesEnum;
+	else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
+	else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
+	else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
+	else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
+	else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
+	else if (strcmp(name,"Surface")==0) return SurfaceEnum;
+	else if (strcmp(name,"SurfaceforcingsAblationRate")==0) return SurfaceforcingsAblationRateEnum;
+	else if (strcmp(name,"SurfaceforcingsAccumulationRate")==0) return SurfaceforcingsAccumulationRateEnum;
+	else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
+	else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
+	else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
+	else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum;
+	else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum;
+	else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
+	else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
+	else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
+	else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
+	else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
+	else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
+	else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
+	else if (strcmp(name,"TransientIsdiagnostic")==0) return TransientIsdiagnosticEnum;
+	else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
+	else if (strcmp(name,"TransientIsprognostic")==0) return TransientIsprognosticEnum;
+	else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum;
+	else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
+	else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
 	else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum;
 	else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum;
 	else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum;
+	else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
+	else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
+	else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum;
 	else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum;
-	else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum;
-	else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum;
-	else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum;
-	else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum;
-	else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum;
-	else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
-	else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
-	else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
-	else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
-	else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
-	else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum;
-	else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
+	else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
+	else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
+	else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum;
 	else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
-	else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum;
-	else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
-	else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum;
 	else if (strcmp(name,"BedSlopeXAnalysis")==0) return BedSlopeXAnalysisEnum;
 	else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum;
+	else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum;
+	else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum;
+	else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum;
+	else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum;
+	else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
+	else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum;
+	else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
+	else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
+	else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum;
+	else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
+	else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
+	else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum;
+	else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum;
+	else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum;
+	else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
+	else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum;
+	else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
 	else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum;
 	else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum;
-	else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
-	else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
-	else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum;
-	else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum;
-	else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
-	else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
-	else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
-	else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
-	else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum;
+	else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
+	else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
+	else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
 	else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
 	else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum;
@@ -219,61 +214,68 @@
 	else if (strcmp(name,"PattynStokesApproximation")==0) return PattynStokesApproximationEnum;
 	else if (strcmp(name,"StokesApproximation")==0) return StokesApproximationEnum;
+	else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
+	else if (strcmp(name,"Loads")==0) return LoadsEnum;
+	else if (strcmp(name,"Materials")==0) return MaterialsEnum;
+	else if (strcmp(name,"Nodes")==0) return NodesEnum;
+	else if (strcmp(name,"Parameters")==0) return ParametersEnum;
+	else if (strcmp(name,"Vertices")==0) return VerticesEnum;
+	else if (strcmp(name,"Results")==0) return ResultsEnum;
+	else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
+	else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
+	else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
+	else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
+	else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
+	else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
+	else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
+	else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
+	else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
+	else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
+	else if (strcmp(name,"Element")==0) return ElementEnum;
+	else if (strcmp(name,"ElementResult")==0) return ElementResultEnum;
+	else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
+	else if (strcmp(name,"FileParam")==0) return FileParamEnum;
 	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,"Penta")==0) return PentaEnum;
-	else if (strcmp(name,"Tria")==0) return TriaEnum;
+	else if (strcmp(name,"Icefront")==0) return IcefrontEnum;
+	else if (strcmp(name,"Input")==0) return InputEnum;
+	else if (strcmp(name,"IntInput")==0) return IntInputEnum;
+	else if (strcmp(name,"IntParam")==0) return IntParamEnum;
+	else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
+	else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;
+	else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
+	else if (strcmp(name,"Matice")==0) return MaticeEnum;
+	else if (strcmp(name,"Matpar")==0) return MatparEnum;
 	else if (strcmp(name,"Node")==0) return NodeEnum;
-	else if (strcmp(name,"Vertex")==0) return VertexEnum;
-	else if (strcmp(name,"Icefront")==0) return IcefrontEnum;
 	else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
+	else if (strcmp(name,"Param")==0) return ParamEnum;
+	else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
 	else if (strcmp(name,"Pengrid")==0) return PengridEnum;
 	else if (strcmp(name,"Penpair")==0) return PenpairEnum;
-	else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
-	else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
-	else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;
-	else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
-	else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
-	else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum;
-	else if (strcmp(name,"Matice")==0) return MaticeEnum;
-	else if (strcmp(name,"Matpar")==0) return MatparEnum;
-	else if (strcmp(name,"Input")==0) return InputEnum;
-	else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
-	else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
-	else if (strcmp(name,"IntInput")==0) return IntInputEnum;
+	else if (strcmp(name,"Penta")==0) return PentaEnum;
 	else if (strcmp(name,"PentaVertexInput")==0) return PentaVertexInputEnum;
-	else if (strcmp(name,"TriaVertexInput")==0) return TriaVertexInputEnum;
-	else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
-	else if (strcmp(name,"Param")==0) return ParamEnum;
-	else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
-	else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
-	else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
-	else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
-	else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
-	else if (strcmp(name,"IntParam")==0) return IntParamEnum;
-	else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
-	else if (strcmp(name,"FileParam")==0) return FileParamEnum;
 	else if (strcmp(name,"PetscMatParam")==0) return PetscMatParamEnum;
 	else if (strcmp(name,"PetscVecParam")==0) return PetscVecParamEnum;
+	else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
+	else if (strcmp(name,"Segment")==0) return SegmentEnum;
+	else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
+	else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
+	else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
+	else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
+	else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum;
 	else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
 	else if (strcmp(name,"StringParam")==0) return StringParamEnum;
-	else if (strcmp(name,"ElementResult")==0) return ElementResultEnum;
-	else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
-	else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
-	else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
-	else if (strcmp(name,"IceSheet")==0) return IceSheetEnum;
-	else if (strcmp(name,"IceShelf")==0) return IceShelfEnum;
+	else if (strcmp(name,"Tria")==0) return TriaEnum;
+	else if (strcmp(name,"TriaVertexInput")==0) return TriaVertexInputEnum;
+	else if (strcmp(name,"Vertex")==0) return VertexEnum;
+	else if (strcmp(name,"Air")==0) return AirEnum;
+	else if (strcmp(name,"Ice")==0) return IceEnum;
+	else if (strcmp(name,"Melange")==0) return MelangeEnum;
 	else if (strcmp(name,"Water")==0) return WaterEnum;
-	else if (strcmp(name,"Ice")==0) return IceEnum;
-	else if (strcmp(name,"Air")==0) return AirEnum;
-	else if (strcmp(name,"Melange")==0) return MelangeEnum;
+	else if (strcmp(name,"Closed")==0) return ClosedEnum;
 	else if (strcmp(name,"Free")==0) return FreeEnum;
 	else if (strcmp(name,"Open")==0) return OpenEnum;
-	else if (strcmp(name,"Closed")==0) return ClosedEnum;
+	else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
 	else if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
 	else if (strcmp(name,"Adjointy")==0) return AdjointyEnum;
 	else if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
-	else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
 	else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum;
 	else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum;
@@ -281,69 +283,89 @@
 	else if (strcmp(name,"Constant")==0) return ConstantEnum;
 	else if (strcmp(name,"Converged")==0) return ConvergedEnum;
+	else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum;
 	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,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum;
 	else if (strcmp(name,"Internal")==0) return InternalEnum;
 	else if (strcmp(name,"IuToExt")==0) return IuToExtEnum;
-	else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum;
 	else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
-	else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
-	else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
-	else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
-	else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
-	else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
-	else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
 	else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
 	else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
-	else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum;
 	else if (strcmp(name,"Misfit")==0) return MisfitEnum;
 	else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum;
 	else if (strcmp(name,"Pressure")==0) return PressureEnum;
 	else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
-	else if (strcmp(name,"Velocity")==0) return VelocityEnum;
 	else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
+	else if (strcmp(name,"QmuVx")==0) return QmuVxEnum;
+	else if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
+	else if (strcmp(name,"QmuVz")==0) return QmuVzEnum;
 	else if (strcmp(name,"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;
+	else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
+	else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
+	else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
+	else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
 	else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
 	else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
 	else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
+	else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum;
 	else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
-	else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum;
+	else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
 	else if (strcmp(name,"Type")==0) return TypeEnum;
 	else if (strcmp(name,"Vel")==0) return VelEnum;
+	else if (strcmp(name,"Velocity")==0) return VelocityEnum;
 	else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
 	else if (strcmp(name,"Vx")==0) return VxEnum;
 	else if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
-	else if (strcmp(name,"QmuVx")==0) return QmuVxEnum;
 	else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
 	else if (strcmp(name,"Vy")==0) return VyEnum;
 	else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
-	else if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
 	else if (strcmp(name,"Vz")==0) return VzEnum;
-	else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
 	else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
 	else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
+	else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
 	else if (strcmp(name,"VzStokes")==0) return VzStokesEnum;
-	else if (strcmp(name,"QmuVz")==0) return QmuVzEnum;
+	else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
+	else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
+	else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
+	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 if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
+	else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
+	else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
+	else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
+	else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
+	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,"BasalFriction")==0) return BasalFrictionEnum;
+	else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
+	else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
+	else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
+	else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
+	else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
 	else if (strcmp(name,"P0")==0) return P0Enum;
 	else if (strcmp(name,"P1")==0) return P1Enum;
 	else if (strcmp(name,"P1DG")==0) return P1DGEnum;
-	else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
-	else if (strcmp(name,"TriaVertexElementResult")==0) return TriaVertexElementResultEnum;
-	else if (strcmp(name,"PentaVertexElementResult")==0) return PentaVertexElementResultEnum;
 	else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
 	else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
+	else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
 	else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
+	else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
 	else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
-	else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
 	else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
+	else if (strcmp(name,"J")==0) return JEnum;
+	else if (strcmp(name,"Patch")==0) return PatchEnum;
+	else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
+	else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
+	else if (strcmp(name,"PentaVertexElementResult")==0) return PentaVertexElementResultEnum;
 	else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum;
 	else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
-	else if (strcmp(name,"J")==0) return JEnum;
-	else if (strcmp(name,"Patch")==0) return PatchEnum;
-	else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
-	else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
 	else if (strcmp(name,"Time")==0) return TimeEnum;
+	else if (strcmp(name,"TriaVertexElementResult")==0) return TriaVertexElementResultEnum;
 	else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
 	else if (strcmp(name,"MinVel")==0) return MinVelEnum;
@@ -361,34 +383,34 @@
 	else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
 	else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
+	else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
 	else if (strcmp(name,"None")==0) return NoneEnum;
-	else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
 	else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
 	else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum;
-	else if (strcmp(name,"Intersect")==0) return IntersectEnum;
+	else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
 	else if (strcmp(name,"Colinear")==0) return ColinearEnum;
-	else if (strcmp(name,"Separate")==0) return SeparateEnum;
-	else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
-	else if (strcmp(name,"Gradient")==0) return GradientEnum;
+	else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
+	else if (strcmp(name,"Fset")==0) return FsetEnum;
 	else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
 	else if (strcmp(name,"Gradient2")==0) return Gradient2Enum;
 	else if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
+	else if (strcmp(name,"Gradient")==0) return GradientEnum;
+	else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum;
+	else if (strcmp(name,"Gset")==0) return GsetEnum;
+	else if (strcmp(name,"Index")==0) return IndexEnum;
+	else if (strcmp(name,"Indexed")==0) return IndexedEnum;
+	else if (strcmp(name,"Intersect")==0) return IntersectEnum;
+	else if (strcmp(name,"Nodal")==0) return NodalEnum;
 	else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
-	else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
 	else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
+	else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum;
+	else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum;
 	else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
 	else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
 	else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
-	else if (strcmp(name,"Indexed")==0) return IndexedEnum;
 	else if (strcmp(name,"Regular")==0) return RegularEnum;
-	else if (strcmp(name,"Index")==0) return IndexEnum;
 	else if (strcmp(name,"Scaled")==0) return ScaledEnum;
-	else if (strcmp(name,"Nodal")==0) return NodalEnum;
+	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,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum;
-	else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum;
-	else if (strcmp(name,"Gset")==0) return GsetEnum;
-	else if (strcmp(name,"Fset")==0) return FsetEnum;
-	else if (strcmp(name,"Sset")==0) return SsetEnum;
-	else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum;
 	else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
 	else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
@@ -402,28 +424,4 @@
 	else if (strcmp(name,"Paterson")==0) return PatersonEnum;
 	else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
-	else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
-	else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
-	else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
-	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,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
-	else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
-	else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
-	else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
-	else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
-	else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
-	else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
-	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,"BasalFriction")==0) return BasalFrictionEnum;
-	else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
-	else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
-	else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
-	else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
-	else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
-	else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
 	else _error_("Enum %s not found",name);
 
Index: sm/trunk/src/m/enum/IceSheetEnum.m
===================================================================
--- /issm/trunk/src/m/enum/IceSheetEnum.m	(revision 10520)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=IceSheetEnum()
-%ICESHEETENUM - Enum of IceSheet
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=IceSheetEnum()
-
-macro=StringToEnum('IceSheet');
Index: sm/trunk/src/m/enum/IceShelfEnum.m
===================================================================
--- /issm/trunk/src/m/enum/IceShelfEnum.m	(revision 10520)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=IceShelfEnum()
-%ICESHELFENUM - Enum of IceShelf
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=IceShelfEnum()
-
-macro=StringToEnum('IceShelf');