Index: /issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp	(revision 3727)
+++ /issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp	(revision 3728)
@@ -16,16 +16,16 @@
 	switch(en){
 
+		case ConstraintsEnum :
+			return "Constraints";
 		case DatasetsEnum :
 			return "Datasets";
 		case ElementsEnum :
 			return "Elements";
-		case NodesEnum :
-			return "Nodes";
-		case ConstraintsEnum :
-			return "Constraints";
 		case LoadsEnum :
 			return "Loads";
 		case MaterialsEnum :
 			return "Materials";
+		case NodesEnum :
+			return "Nodes";
 		case ParametersEnum :
 			return "Parameters";
@@ -44,18 +44,18 @@
 		case HorizAnalysisEnum :
 			return "HorizAnalysis";
+		case HutterAnalysisEnum :
+			return "HutterAnalysis";
 		case StokesAnalysisEnum :
 			return "StokesAnalysis";
-		case HutterAnalysisEnum :
-			return "HutterAnalysis";
 		case VertAnalysisEnum :
 			return "VertAnalysis";
+		case AdjointAnalysisEnum :
+			return "AdjointAnalysis";
 		case ControlAnalysisEnum :
 			return "ControlAnalysis";
-		case AdjointAnalysisEnum :
-			return "AdjointAnalysis";
+		case GradientAnalysisEnum :
+			return "GradientAnalysis";
 		case InverseAnalysisEnum :
 			return "InverseAnalysis";
-		case GradientAnalysisEnum :
-			return "GradientAnalysis";
 		case ThermalAnalysisEnum :
 			return "ThermalAnalysis";
@@ -66,22 +66,22 @@
 		case SlopecomputeAnalysisEnum :
 			return "SlopecomputeAnalysis";
+		case BedXAnalysisEnum :
+			return "BedXAnalysis";
+		case BedYAnalysisEnum :
+			return "BedYAnalysis";
 		case SurfaceXAnalysisEnum :
 			return "SurfaceXAnalysis";
 		case SurfaceYAnalysisEnum :
 			return "SurfaceYAnalysis";
-		case BedXAnalysisEnum :
-			return "BedXAnalysis";
-		case BedYAnalysisEnum :
-			return "BedYAnalysis";
+		case Balancedthickness2AnalysisEnum :
+			return "Balancedthickness2Analysis";
+		case BalancedthicknessAnalysisEnum :
+			return "BalancedthicknessAnalysis";
+		case BalancedvelocitiesAnalysisEnum :
+			return "BalancedvelocitiesAnalysis";
+		case Prognostic2AnalysisEnum :
+			return "Prognostic2Analysis";
 		case PrognosticAnalysisEnum :
 			return "PrognosticAnalysis";
-		case Prognostic2AnalysisEnum :
-			return "Prognostic2Analysis";
-		case BalancedthicknessAnalysisEnum :
-			return "BalancedthicknessAnalysis";
-		case Balancedthickness2AnalysisEnum :
-			return "Balancedthickness2Analysis";
-		case BalancedvelocitiesAnalysisEnum :
-			return "BalancedvelocitiesAnalysis";
 		case MeltingAnalysisEnum :
 			return "MeltingAnalysis";
@@ -96,10 +96,10 @@
 		case FormulationEnum :
 			return "Formulation";
-		case NoneFormulationEnum :
-			return "NoneFormulation";
 		case HutterFormulationEnum :
 			return "HutterFormulation";
 		case MacAyealFormulationEnum :
 			return "MacAyealFormulation";
+		case NoneFormulationEnum :
+			return "NoneFormulation";
 		case PattynFormulationEnum :
 			return "PattynFormulation";
@@ -112,6 +112,8 @@
 		case ElementEnum :
 			return "Element";
-		case TriaEnum :
-			return "Tria";
+		case BeamEnum :
+			return "Beam";
+		case DofIndexingEnum :
+			return "DofIndexing";
 		case ElementPropertiesEnum :
 			return "ElementProperties";
@@ -120,10 +122,8 @@
 		case PentaEnum :
 			return "Penta";
-		case BeamEnum :
-			return "Beam";
 		case SingEnum :
 			return "Sing";
-		case DofIndexingEnum :
-			return "DofIndexing";
+		case TriaEnum :
+			return "Tria";
 		case NodeEnum :
 			return "Node";
@@ -134,20 +134,20 @@
 		case IcefrontEnum :
 			return "Icefront";
+		case NumericalfluxEnum :
+			return "Numericalflux";
+		case PengridEnum :
+			return "Pengrid";
+		case PenpairEnum :
+			return "Penpair";
+		case QuadIceFrontEnum :
+			return "QuadIceFront";
+		case QuadRiftFrontEnum :
+			return "QuadRiftFront";
+		case RiftfrontEnum :
+			return "Riftfront";
 		case SegmentIcefrontEnum :
 			return "SegmentIcefront";
-		case QuadIceFrontEnum :
-			return "QuadIceFront";
-		case RiftfrontEnum :
-			return "Riftfront";
 		case SegmentRiftfrontEnum :
 			return "SegmentRiftfront";
-		case QuadRiftFrontEnum :
-			return "QuadRiftFront";
-		case PenpairEnum :
-			return "Penpair";
-		case PengridEnum :
-			return "Pengrid";
-		case NumericalfluxEnum :
-			return "Numericalflux";
 		case MaterialEnum :
 			return "Material";
@@ -158,38 +158,38 @@
 		case InputEnum :
 			return "Input";
+		case BeamVertexInputEnum :
+			return "BeamVertexInput";
+		case BoolInputEnum :
+			return "BoolInput";
+		case DoubleInputEnum :
+			return "DoubleInput";
+		case IntInputEnum :
+			return "IntInput";
+		case PentaVertexInputEnum :
+			return "PentaVertexInput";
+		case SingVertexInputEnum :
+			return "SingVertexInput";
 		case TriaVertexInputEnum :
 			return "TriaVertexInput";
-		case SingVertexInputEnum :
-			return "SingVertexInput";
-		case BeamVertexInputEnum :
-			return "BeamVertexInput";
-		case PentaVertexInputEnum :
-			return "PentaVertexInput";
-		case BoolInputEnum :
-			return "BoolInput";
-		case IntInputEnum :
-			return "IntInput";
-		case DoubleInputEnum :
-			return "DoubleInput";
 		case ParamEnum :
 			return "Param";
 		case BoolParamEnum :
 			return "BoolParam";
+		case DoubleMatParamEnum :
+			return "DoubleMatParam";
+		case DoubleParamEnum :
+			return "DoubleParam";
+		case DoubleVecParamEnum :
+			return "DoubleVecParam";
 		case IntParamEnum :
 			return "IntParam";
-		case DoubleParamEnum :
-			return "DoubleParam";
 		case PetscMatParamEnum :
 			return "PetscMatParam";
 		case PetscVecParamEnum :
 			return "PetscVecParam";
-		case DoubleMatParamEnum :
-			return "DoubleMatParam";
-		case DoubleVecParamEnum :
-			return "DoubleVecParam";
+		case StringArrayParamEnum :
+			return "StringArrayParam";
 		case StringParamEnum :
 			return "StringParam";
-		case StringArrayParamEnum :
-			return "StringArrayParam";
 		case ResultEnum :
 			return "Result";
@@ -214,36 +214,42 @@
 		case MelangeEnum :
 			return "Melange";
-		case VxEnum :
-			return "Vx";
-		case VyEnum :
-			return "Vy";
-		case VzEnum :
-			return "Vz";
-		case VxAverageEnum :
-			return "VxAverage";
-		case VyAverageEnum :
-			return "VyAverage";
-		case VzAverageEnum :
-			return "VzAverage";
-		case VxObsEnum :
-			return "VxObs";
-		case VyObsEnum :
-			return "VyObs";
-		case VzObsEnum :
-			return "VzObs";
-		case VxOldEnum :
-			return "VxOld";
-		case VyOldEnum :
-			return "VyOld";
-		case VzOldEnum :
-			return "VzOld";
+		case AccumulationRateEnum :
+			return "AccumulationRate";
+		case AdjointxEnum :
+			return "Adjointx";
+		case AdjointyEnum :
+			return "Adjointy";
+		case AdjointzEnum :
+			return "Adjointz";
+		case ArtDiffEnum :
+			return "ArtDiff";
+		case BedEnum :
+			return "Bed";
+		case BedSlopexEnum :
+			return "BedSlopex";
+		case BedSlopeyEnum :
+			return "BedSlopey";
+		case BoundaryEnum :
+			return "Boundary";
+		case CmMaxDmpSlopeEnum :
+			return "CmMaxDmpSlope";
+		case CmMaxDmpValueEnum :
+			return "CmMaxDmpValue";
+		case CmMinDmpSlopeEnum :
+			return "CmMinDmpSlope";
+		case CmMinDmpValueEnum :
+			return "CmMinDmpValue";
+		case CmNoiseDmpEnum :
+			return "CmNoiseDmp";
+		case CollapseEnum :
+			return "Collapse";
+		case ConstantEnum :
+			return "Constant";
+		case ControlTypeEnum :
+			return "ControlType";
+		case ConvergedEnum :
+			return "Converged";
 		case DhDtEnum :
 			return "DhDt";
-		case ThicknessEnum :
-			return "Thickness";
-		case SurfaceEnum :
-			return "Surface";
-		case BedEnum :
-			return "Bed";
 		case DragCoefficientEnum :
 			return "DragCoefficient";
@@ -254,116 +260,138 @@
 		case DragTypeEnum :
 			return "DragType";
+		case DtEnum :
+			return "Dt";
+		case ElementOnBedEnum :
+			return "ElementOnBed";
+		case ElementOnIceShelfEnum :
+			return "ElementOnIceShelf";
+		case ElementOnSurfaceEnum :
+			return "ElementOnSurface";
+		case ElementOnWaterEnum :
+			return "ElementOnWater";
+		case EpsVelEnum :
+			return "EpsVel";
+		case FillEnum :
+			return "Fill";
+		case FitEnum :
+			return "Fit";
+		case FractionIncrementEnum :
+			return "FractionIncrement";
+		case FrictionEnum :
+			return "Friction";
+		case GeothermalFluxEnum :
+			return "GeothermalFlux";
+		case InternalEnum :
+			return "Internal";
+		case KflagEnum :
+			return "Kflag";
+		case MaxPenetrationEnum :
+			return "MaxPenetration";
+		case MeanVelEnum :
+			return "MeanVel";
+		case MeltingOffsetEnum :
+			return "MeltingOffset";
+		case MeltingRateEnum :
+			return "MeltingRate";
+		case NodeOnBedEnum :
+			return "NodeOnBed";
+		case NodeOnIceSheetEnum :
+			return "NodeOnIceSheet";
+		case NodeOnIceShelfEnum :
+			return "NodeOnIceShelf";
+		case NodeOnSurfaceEnum :
+			return "NodeOnSurface";
+		case PenaltyOffsetEnum :
+			return "PenaltyOffset";
+		case PflagEnum :
+			return "Pflag";
+		case PressureEnum :
+			return "Pressure";
+		case ResetPenaltiesEnum :
+			return "ResetPenalties";
 		case RheologyBEnum :
 			return "RheologyB";
 		case RheologyNEnum :
 			return "RheologyN";
-		case MeltingRateEnum :
-			return "MeltingRate";
-		case AccumulationRateEnum :
-			return "AccumulationRate";
-		case GeothermalFluxEnum :
-			return "GeothermalFlux";
-		case ElementOnIceShelfEnum :
-			return "ElementOnIceShelf";
-		case ElementOnBedEnum :
-			return "ElementOnBed";
-		case ElementOnWaterEnum :
-			return "ElementOnWater";
-		case ElementOnSurfaceEnum :
-			return "ElementOnSurface";
+		case SegmentOnIceShelfEnum :
+			return "SegmentOnIceShelf";
+		case StabilizeConstraintsEnum :
+			return "StabilizeConstraints";
+		case StokesReconditioningEnum :
+			return "StokesReconditioning";
 		case SurfaceAreaEnum :
 			return "SurfaceArea";
+		case SurfaceEnum :
+			return "Surface";
 		case SurfaceSlopexEnum :
 			return "SurfaceSlopex";
 		case SurfaceSlopeyEnum :
 			return "SurfaceSlopey";
-		case BedSlopexEnum :
-			return "BedSlopex";
-		case BedSlopeyEnum :
-			return "BedSlopey";
+		case TemperatureEnum :
+			return "Temperature";
+		case ThicknessEnum :
+			return "Thickness";
+		case TypeEnum :
+			return "Type";
+		case ViscosityOvershootEnum :
+			return "ViscosityOvershoot";
+		case VxAverageEnum :
+			return "VxAverage";
+		case VxEnum :
+			return "Vx";
+		case VxObsEnum :
+			return "VxObs";
+		case VxOldEnum :
+			return "VxOld";
+		case VyAverageEnum :
+			return "VyAverage";
+		case VyEnum :
+			return "Vy";
+		case VyObsEnum :
+			return "VyObs";
+		case VyOldEnum :
+			return "VyOld";
+		case VzAverageEnum :
+			return "VzAverage";
+		case VzEnum :
+			return "Vz";
+		case VzObsEnum :
+			return "VzObs";
+		case VzOldEnum :
+			return "VzOld";
 		case WeightsEnum :
 			return "Weights";
-		case FitEnum :
-			return "Fit";
-		case AdjointxEnum :
-			return "Adjointx";
-		case AdjointyEnum :
-			return "Adjointy";
-		case AdjointzEnum :
-			return "Adjointz";
-		case CollapseEnum :
-			return "Collapse";
-		case TemperatureEnum :
-			return "Temperature";
-		case PressureEnum :
-			return "Pressure";
-		case NodeOnBedEnum :
-			return "NodeOnBed";
-		case NodeOnSurfaceEnum :
-			return "NodeOnSurface";
-		case NodeOnIceShelfEnum :
-			return "NodeOnIceShelf";
-		case NodeOnIceSheetEnum :
-			return "NodeOnIceSheet";
-		case ResetPenaltiesEnum :
-			return "ResetPenalties";
-		case MeltingOffsetEnum :
-			return "MeltingOffset";
-		case TypeEnum :
-			return "Type";
-		case FrictionEnum :
-			return "Friction";
-		case FractionIncrementEnum :
-			return "FractionIncrement";
-		case ConvergedEnum :
-			return "Converged";
-		case SegmentOnIceShelfEnum :
-			return "SegmentOnIceShelf";
-		case FillEnum :
-			return "Fill";
-		case InternalEnum :
-			return "Internal";
-		case MaxPenetrationEnum :
-			return "MaxPenetration";
-		case BoundaryEnum :
-			return "Boundary";
-		case DtEnum :
-			return "Dt";
-		case ArtDiffEnum :
-			return "ArtDiff";
-		case CmNoiseDmpEnum :
-			return "CmNoiseDmp";
-		case CmMinDmpValueEnum :
-			return "CmMinDmpValue";
-		case CmMaxDmpValueEnum :
-			return "CmMaxDmpValue";
-		case CmMinDmpSlopeEnum :
-			return "CmMinDmpSlope";
-		case CmMaxDmpSlopeEnum :
-			return "CmMaxDmpSlope";
-		case ControlTypeEnum :
-			return "ControlType";
-		case ViscosityOvershootEnum :
-			return "ViscosityOvershoot";
-		case MeanVelEnum :
-			return "MeanVel";
-		case EpsVelEnum :
-			return "EpsVel";
-		case StokesReconditioningEnum :
-			return "StokesReconditioning";
-		case StabilizeConstraintsEnum :
-			return "StabilizeConstraints";
-		case PenaltyOffsetEnum :
-			return "PenaltyOffset";
-		case ConstantEnum :
-			return "Constant";
-		case KflagEnum :
-			return "Kflag";
-		case PflagEnum :
-			return "Pflag";
-		case OutputFileNameEnum :
-			return "OutputFileName";
+		case BetaEnum :
+			return "Beta";
+		case CmGradientEnum :
+			return "CmGradient";
+		case CmJumpEnum :
+			return "CmJump";
+		case CmMaxEnum :
+			return "CmMax";
+		case CmMinEnum :
+			return "CmMin";
+		case ConnectivityEnum :
+			return "Connectivity";
+		case ControlParameterEnum :
+			return "ControlParameter";
+		case ControlSteadyEnum :
+			return "ControlSteady";
+		case DakotaParameterEnum :
+			return "DakotaParameter";
 		case DimEnum :
 			return "Dim";
+		case EpsAbsEnum :
+			return "EpsAbs";
+		case EpsCmEnum :
+			return "EpsCm";
+		case EpsRelEnum :
+			return "EpsRel";
+		case EpsResEnum :
+			return "EpsRes";
+		case ExtrudeParamEnum :
+			return "ExtrudeParam";
+		case HeatCapacityEnum :
+			return "HeatCapacity";
 		case IsHutterEnum :
 			return "IsHutter";
@@ -372,98 +400,70 @@
 		case IsStokesEnum :
 			return "IsStokes";
+		case LatentHeatEnum :
+			return "LatentHeat";
+		case LowmemEnum :
+			return "Lowmem";
+		case MaxIterEnum :
+			return "MaxIter";
+		case MaxNonlinearIterationsEnum :
+			return "MaxNonlinearIterations";
+		case MeltingPointEnum :
+			return "MeltingPoint";
+		case MinMechanicalConstraintsEnum :
+			return "MinMechanicalConstraints";
+		case MinThermalConstraintsEnum :
+			return "MinThermalConstraints";
+		case NStepsEnum :
+			return "NSteps";
+		case NdtEnum :
+			return "Ndt";
+		case NumOutputEnum :
+			return "NumOutput";
+		case NumRiftsEnum :
+			return "NumRifts";
+		case NumberOfDofsPerNodeEnum :
+			return "NumberOfDofsPerNode";
+		case NumberOfElementsEnum :
+			return "NumberOfElements";
+		case NumberOfNodesEnum :
+			return "NumberOfNodes";
+		case NumberOfVerticesEnum :
+			return "NumberOfVertices";
+		case OptScalEnum :
+			return "OptScal";
+		case OutputFileNameEnum :
+			return "OutputFileName";
+		case ParameterOutputEnum :
+			return "ParameterOutput";
+		case PenaltyMeltingEnum :
+			return "PenaltyMelting";
+		case QmuAnalysisEnum :
+			return "QmuAnalysis";
+		case QmuErrNameEnum :
+			return "QmuErrName";
+		case QmuInNameEnum :
+			return "QmuInName";
+		case QmuNPartEnum :
+			return "QmuNPart";
+		case QmuOutNameEnum :
+			return "QmuOutName";
+		case QmuPartEnum :
+			return "QmuPart";
+		case ResponseDescriptorsEnum :
+			return "ResponseDescriptors";
+		case SolverStringEnum :
+			return "SolverString";
+		case SparsityEnum :
+			return "Sparsity";
+		case TolXEnum :
+			return "TolX";
+		case VariableDescriptorsEnum :
+			return "VariableDescriptors";
 		case VerboseEnum :
 			return "Verbose";
-		case EpsResEnum :
-			return "EpsRes";
-		case EpsRelEnum :
-			return "EpsRel";
-		case EpsAbsEnum :
-			return "EpsAbs";
-		case EpsCmEnum :
-			return "EpsCm";
-		case MaxNonlinearIterationsEnum :
-			return "MaxNonlinearIterations";
+		case WaitOnLockEnum :
+			return "WaitOnLock";
 		case YtsEnum :
 			return "Yts";
-		case NdtEnum :
-			return "Ndt";
-		case SparsityEnum :
-			return "Sparsity";
-		case LowmemEnum :
-			return "Lowmem";
-		case ConnectivityEnum :
-			return "Connectivity";
-		case BetaEnum :
-			return "Beta";
-		case MeltingPointEnum :
-			return "MeltingPoint";
-		case LatentHeatEnum :
-			return "LatentHeat";
-		case HeatCapacityEnum :
-			return "HeatCapacity";
-		case PenaltyMeltingEnum :
-			return "PenaltyMelting";
-		case MinThermalConstraintsEnum :
-			return "MinThermalConstraints";
-		case MinMechanicalConstraintsEnum :
-			return "MinMechanicalConstraints";
-		case WaitOnLockEnum :
-			return "WaitOnLock";
-		case SolverStringEnum :
-			return "SolverString";
-		case NumberOfVerticesEnum :
-			return "NumberOfVertices";
-		case NumberOfNodesEnum :
-			return "NumberOfNodes";
-		case NumberOfElementsEnum :
-			return "NumberOfElements";
-		case NumberOfDofsPerNodeEnum :
-			return "NumberOfDofsPerNode";
-		case NumRiftsEnum :
-			return "NumRifts";
-		case NumOutputEnum :
-			return "NumOutput";
-		case ParameterOutputEnum :
-			return "ParameterOutput";
-		case ExtrudeParamEnum :
-			return "ExtrudeParam";
-		case ControlSteadyEnum :
-			return "ControlSteady";
-		case NStepsEnum :
-			return "NSteps";
-		case TolXEnum :
-			return "TolX";
-		case CmMinEnum :
-			return "CmMin";
-		case CmMaxEnum :
-			return "CmMax";
-		case CmGradientEnum :
-			return "CmGradient";
-		case CmJumpEnum :
-			return "CmJump";
-		case OptScalEnum :
-			return "OptScal";
-		case MaxIterEnum :
-			return "MaxIter";
-		case ControlParameterEnum :
-			return "ControlParameter";
-		case QmuAnalysisEnum :
-			return "QmuAnalysis";
-		case QmuInNameEnum :
-			return "QmuInName";
-		case QmuOutNameEnum :
-			return "QmuOutName";
-		case QmuErrNameEnum :
-			return "QmuErrName";
-		case QmuNPartEnum :
-			return "QmuNPart";
-		case QmuPartEnum :
-			return "QmuPart";
-		case VariableDescriptorsEnum :
-			return "VariableDescriptors";
-		case ResponseDescriptorsEnum :
-			return "ResponseDescriptors";
-		case DakotaParameterEnum :
-			return "DakotaParameter";
 		default :
 			ISSMERROR("Enum %i not found",en);
Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h	(revision 3727)
+++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h	(revision 3728)
@@ -10,10 +10,10 @@
 
 	/*Datasets {{{1*/
+	ConstraintsEnum,
 	DatasetsEnum,
 	ElementsEnum,
-	NodesEnum,
-	ConstraintsEnum,
 	LoadsEnum,
 	MaterialsEnum,
+	NodesEnum,
 	ParametersEnum,
 	ResultsEnum,
@@ -27,12 +27,12 @@
 	DiagnosticAnalysisEnum,
 	HorizAnalysisEnum,
+	HutterAnalysisEnum,
 	StokesAnalysisEnum,
-	HutterAnalysisEnum,
 	VertAnalysisEnum,
 	//control
+	AdjointAnalysisEnum,
 	ControlAnalysisEnum,
-	AdjointAnalysisEnum,
+	GradientAnalysisEnum,
 	InverseAnalysisEnum,
-	GradientAnalysisEnum,
 	//thermal
 	ThermalAnalysisEnum,
@@ -42,14 +42,14 @@
 	//slope
 	SlopecomputeAnalysisEnum,
+	BedXAnalysisEnum,
+	BedYAnalysisEnum,
 	SurfaceXAnalysisEnum,
 	SurfaceYAnalysisEnum,
-	BedXAnalysisEnum,
-	BedYAnalysisEnum,
 	//prognostic
+	Balancedthickness2AnalysisEnum,
+	BalancedthicknessAnalysisEnum,
+	BalancedvelocitiesAnalysisEnum,
+	Prognostic2AnalysisEnum,
 	PrognosticAnalysisEnum,
-	Prognostic2AnalysisEnum,
-	BalancedthicknessAnalysisEnum,
-	Balancedthickness2AnalysisEnum,
-	BalancedvelocitiesAnalysisEnum,
 	//melting
 	MeltingAnalysisEnum,
@@ -65,7 +65,7 @@
 	/*Formulations {{{1*/
 	FormulationEnum,
-	NoneFormulationEnum,
 	HutterFormulationEnum,
 	MacAyealFormulationEnum,
+	NoneFormulationEnum,
 	PattynFormulationEnum,
 	StokesFormulationEnum,
@@ -76,11 +76,11 @@
 	/*Elements: */
 	ElementEnum,
-	TriaEnum,
+	BeamEnum,
+	DofIndexingEnum,
 	ElementPropertiesEnum,
 	NodePropertiesEnum,
 	PentaEnum,
-	BeamEnum,
 	SingEnum,
-	DofIndexingEnum,
+	TriaEnum,
 	/*Grids: */
 	NodeEnum,
@@ -89,12 +89,12 @@
 	LoadEnum,
 	IcefrontEnum,
+	NumericalfluxEnum,
+	PengridEnum,
+	PenpairEnum,
+	QuadIceFrontEnum,
+	QuadRiftFrontEnum,
+	RiftfrontEnum,
 	SegmentIcefrontEnum,
-	QuadIceFrontEnum,
-	RiftfrontEnum,
 	SegmentRiftfrontEnum,
-	QuadRiftFrontEnum,
-	PenpairEnum,
-	PengridEnum,
-	NumericalfluxEnum,
 	/*Materials: */
 	MaterialEnum,
@@ -103,22 +103,22 @@
 	/*Inputs: */
 	InputEnum,
+	BeamVertexInputEnum,
+	BoolInputEnum,
+	DoubleInputEnum,
+	IntInputEnum,
+	PentaVertexInputEnum,
+	SingVertexInputEnum,
 	TriaVertexInputEnum,
-	SingVertexInputEnum,
-	BeamVertexInputEnum,
-	PentaVertexInputEnum,
-	BoolInputEnum,
-	IntInputEnum,
-	DoubleInputEnum,
 	/*Params: */
 	ParamEnum,
 	BoolParamEnum,
+	DoubleMatParamEnum,
+	DoubleParamEnum,
+	DoubleVecParamEnum,
 	IntParamEnum,
-	DoubleParamEnum,
 	PetscMatParamEnum,
 	PetscVecParamEnum,
-	DoubleMatParamEnum,
-	DoubleVecParamEnum,
+	StringArrayParamEnum,
 	StringParamEnum,
-	StringArrayParamEnum,
 	/*Results: */
 	ResultEnum,
@@ -142,133 +142,133 @@
 	/*}}}*/
 	/*Inputs {{{1*/
-	VxEnum,
-	VyEnum,
-	VzEnum,
-	VxAverageEnum,
-	VyAverageEnum,
-	VzAverageEnum,
-	VxObsEnum,
-	VyObsEnum,
-	VzObsEnum,
-	VxOldEnum,
-	VyOldEnum,
-	VzOldEnum,
+	AccumulationRateEnum,
+	AdjointxEnum,
+	AdjointyEnum,
+	AdjointzEnum,
+	ArtDiffEnum,
+	BedEnum,
+	BedSlopexEnum,
+	BedSlopeyEnum,
+	BoundaryEnum,
+	CmMaxDmpSlopeEnum,
+	CmMaxDmpValueEnum,
+	CmMinDmpSlopeEnum,
+	CmMinDmpValueEnum,
+	CmNoiseDmpEnum,
+	CollapseEnum,
+	ConstantEnum,
+	ControlTypeEnum,
+	ConvergedEnum,
 	DhDtEnum,
-	ThicknessEnum,
-	SurfaceEnum,
-	BedEnum,
 	DragCoefficientEnum,
 	DragPEnum,
 	DragQEnum,
 	DragTypeEnum,
+	DtEnum,
+	ElementOnBedEnum,
+	ElementOnIceShelfEnum,
+	ElementOnSurfaceEnum,
+	ElementOnWaterEnum,
+	EpsVelEnum,
+	FillEnum,
+	FitEnum,
+	FractionIncrementEnum,
+	FrictionEnum,
+	GeothermalFluxEnum,
+	InternalEnum,
+	KflagEnum,
+	MaxPenetrationEnum,
+	MeanVelEnum,
+	MeltingOffsetEnum,
+	MeltingRateEnum,
+	NodeOnBedEnum,
+	NodeOnIceSheetEnum,
+	NodeOnIceShelfEnum,
+	NodeOnSurfaceEnum,
+	PenaltyOffsetEnum,
+	PflagEnum,
+	PressureEnum,
+	ResetPenaltiesEnum,
 	RheologyBEnum,
 	RheologyNEnum,
-	MeltingRateEnum,
-	AccumulationRateEnum,
-	GeothermalFluxEnum,
-	ElementOnIceShelfEnum,
-	ElementOnBedEnum,
-	ElementOnWaterEnum,
-	ElementOnSurfaceEnum,
+	SegmentOnIceShelfEnum,
+	StabilizeConstraintsEnum,
+	StokesReconditioningEnum,
 	SurfaceAreaEnum,
+	SurfaceEnum,
 	SurfaceSlopexEnum,
 	SurfaceSlopeyEnum,
-	BedSlopexEnum,
-	BedSlopeyEnum,
+	TemperatureEnum,
+	ThicknessEnum,
+	TypeEnum,
+	ViscosityOvershootEnum,
+	VxAverageEnum,
+	VxEnum,
+	VxObsEnum,
+	VxOldEnum,
+	VyAverageEnum,
+	VyEnum,
+	VyObsEnum,
+	VyOldEnum,
+	VzAverageEnum,
+	VzEnum,
+	VzObsEnum,
+	VzOldEnum,
 	WeightsEnum,
-	FitEnum,
-	AdjointxEnum,
-	AdjointyEnum,
-	AdjointzEnum,
-	CollapseEnum,
-	TemperatureEnum,
-	PressureEnum,
-	NodeOnBedEnum,
-	NodeOnSurfaceEnum,
-	NodeOnIceShelfEnum,
-	NodeOnIceSheetEnum,
-	ResetPenaltiesEnum,
-	MeltingOffsetEnum,
-	TypeEnum,
-	FrictionEnum,
-	FractionIncrementEnum,
-	ConvergedEnum,
-	SegmentOnIceShelfEnum,
-	FillEnum,
-	InternalEnum,
-	MaxPenetrationEnum,
-	BoundaryEnum,
-	DtEnum,
-	ArtDiffEnum,
-	CmNoiseDmpEnum,
-	CmMinDmpValueEnum,
-	CmMaxDmpValueEnum,
-	CmMinDmpSlopeEnum,
-	CmMaxDmpSlopeEnum,
-	ControlTypeEnum,
-	ViscosityOvershootEnum,
-	MeanVelEnum,
-	EpsVelEnum,
-	StokesReconditioningEnum,
-	StabilizeConstraintsEnum,
-	PenaltyOffsetEnum,
-	ConstantEnum,
-	KflagEnum,
-	PflagEnum,
 	/*}}}*/
 	/*Parameters{{{1*/
-	OutputFileNameEnum,
+	BetaEnum,
+	CmGradientEnum,
+	CmJumpEnum,
+	CmMaxEnum,
+	CmMinEnum,
+	ConnectivityEnum,
+	ControlParameterEnum,
+	ControlSteadyEnum,
+	DakotaParameterEnum,
 	DimEnum,
+	EpsAbsEnum,
+	EpsCmEnum,
+	EpsRelEnum,
+	EpsResEnum,
+	ExtrudeParamEnum,
+	HeatCapacityEnum,
 	IsHutterEnum,
 	IsMacAyealPattynEnum,
 	IsStokesEnum,
+	LatentHeatEnum,
+	LowmemEnum,
+	MaxIterEnum,
+	MaxNonlinearIterationsEnum,
+	MeltingPointEnum,
+	MinMechanicalConstraintsEnum,
+	MinThermalConstraintsEnum,
+	NStepsEnum,
+	NdtEnum,
+	NumOutputEnum,
+	NumRiftsEnum,
+	NumberOfDofsPerNodeEnum,
+	NumberOfElementsEnum,
+	NumberOfNodesEnum,
+	NumberOfVerticesEnum,
+	OptScalEnum,
+	OutputFileNameEnum,
+	ParameterOutputEnum,
+	PenaltyMeltingEnum,
+	QmuAnalysisEnum,
+	QmuErrNameEnum,
+	QmuInNameEnum,
+	QmuMassFluxSegmentsEnum
+	QmuNPartEnum,
+	QmuOutNameEnum,
+	QmuPartEnum,
+	ResponseDescriptorsEnum,
+	SolverStringEnum,
+	SparsityEnum,
+	TolXEnum,
+	VariableDescriptorsEnum,
 	VerboseEnum,
-	EpsResEnum,
-	EpsRelEnum,
-	EpsAbsEnum,
-	EpsCmEnum,
-	MaxNonlinearIterationsEnum,
+	WaitOnLockEnum,
 	YtsEnum,
-	NdtEnum,
-	SparsityEnum,
-	LowmemEnum,
-	ConnectivityEnum,
-	BetaEnum,
-	MeltingPointEnum,
-	LatentHeatEnum,
-	HeatCapacityEnum,
-	PenaltyMeltingEnum,
-	MinThermalConstraintsEnum,
-	MinMechanicalConstraintsEnum,
-	WaitOnLockEnum,
-	SolverStringEnum,
-	NumberOfVerticesEnum,
-	NumberOfNodesEnum,
-	NumberOfElementsEnum,
-	NumberOfDofsPerNodeEnum,
-	NumRiftsEnum,
-	NumOutputEnum,
-	ParameterOutputEnum,
-	ExtrudeParamEnum,
-	ControlSteadyEnum,
-	NStepsEnum,
-	TolXEnum,
-	CmMinEnum,
-	CmMaxEnum,
-	CmGradientEnum,
-	CmJumpEnum,
-	OptScalEnum,
-	MaxIterEnum,
-	ControlParameterEnum,
-	QmuAnalysisEnum,
-	QmuInNameEnum,
-	QmuOutNameEnum,
-	QmuErrNameEnum,
-	QmuNPartEnum,
-	QmuPartEnum,
-	VariableDescriptorsEnum,
-	ResponseDescriptorsEnum,
-	DakotaParameterEnum,
-	QmuMassFluxSegmentsEnum
 	/*}}}*/
 
Index: /issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp	(revision 3727)
+++ /issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp	(revision 3728)
@@ -14,10 +14,10 @@
 int  StringAsEnum(char* name){
 
-	if (strcmp(name,"Datasets")==0) return DatasetsEnum;
+	if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
+	else if (strcmp(name,"Datasets")==0) return DatasetsEnum;
 	else if (strcmp(name,"Elements")==0) return ElementsEnum;
-	else if (strcmp(name,"Nodes")==0) return NodesEnum;
-	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,"Results")==0) return ResultsEnum;
@@ -28,24 +28,24 @@
 	else if (strcmp(name,"DiagnosticAnalysis")==0) return DiagnosticAnalysisEnum;
 	else if (strcmp(name,"HorizAnalysis")==0) return HorizAnalysisEnum;
+	else if (strcmp(name,"HutterAnalysis")==0) return HutterAnalysisEnum;
 	else if (strcmp(name,"StokesAnalysis")==0) return StokesAnalysisEnum;
-	else if (strcmp(name,"HutterAnalysis")==0) return HutterAnalysisEnum;
 	else if (strcmp(name,"VertAnalysis")==0) return VertAnalysisEnum;
+	else if (strcmp(name,"AdjointAnalysis")==0) return AdjointAnalysisEnum;
 	else if (strcmp(name,"ControlAnalysis")==0) return ControlAnalysisEnum;
-	else if (strcmp(name,"AdjointAnalysis")==0) return AdjointAnalysisEnum;
+	else if (strcmp(name,"GradientAnalysis")==0) return GradientAnalysisEnum;
 	else if (strcmp(name,"InverseAnalysis")==0) return InverseAnalysisEnum;
-	else if (strcmp(name,"GradientAnalysis")==0) return GradientAnalysisEnum;
 	else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
 	else if (strcmp(name,"TransientAnalysis")==0) return TransientAnalysisEnum;
 	else if (strcmp(name,"SteadyAnalysis")==0) return SteadyAnalysisEnum;
 	else if (strcmp(name,"SlopecomputeAnalysis")==0) return SlopecomputeAnalysisEnum;
+	else if (strcmp(name,"BedXAnalysis")==0) return BedXAnalysisEnum;
+	else if (strcmp(name,"BedYAnalysis")==0) return BedYAnalysisEnum;
 	else if (strcmp(name,"SurfaceXAnalysis")==0) return SurfaceXAnalysisEnum;
 	else if (strcmp(name,"SurfaceYAnalysis")==0) return SurfaceYAnalysisEnum;
-	else if (strcmp(name,"BedXAnalysis")==0) return BedXAnalysisEnum;
-	else if (strcmp(name,"BedYAnalysis")==0) return BedYAnalysisEnum;
+	else if (strcmp(name,"Balancedthickness2Analysis")==0) return Balancedthickness2AnalysisEnum;
+	else if (strcmp(name,"BalancedthicknessAnalysis")==0) return BalancedthicknessAnalysisEnum;
+	else if (strcmp(name,"BalancedvelocitiesAnalysis")==0) return BalancedvelocitiesAnalysisEnum;
+	else if (strcmp(name,"Prognostic2Analysis")==0) return Prognostic2AnalysisEnum;
 	else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum;
-	else if (strcmp(name,"Prognostic2Analysis")==0) return Prognostic2AnalysisEnum;
-	else if (strcmp(name,"BalancedthicknessAnalysis")==0) return BalancedthicknessAnalysisEnum;
-	else if (strcmp(name,"Balancedthickness2Analysis")==0) return Balancedthickness2AnalysisEnum;
-	else if (strcmp(name,"BalancedvelocitiesAnalysis")==0) return BalancedvelocitiesAnalysisEnum;
 	else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
 	else if (strcmp(name,"Mesh2gridAnalysis")==0) return Mesh2gridAnalysisEnum;
@@ -54,7 +54,7 @@
 	else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum;
 	else if (strcmp(name,"Formulation")==0) return FormulationEnum;
-	else if (strcmp(name,"NoneFormulation")==0) return NoneFormulationEnum;
 	else if (strcmp(name,"HutterFormulation")==0) return HutterFormulationEnum;
 	else if (strcmp(name,"MacAyealFormulation")==0) return MacAyealFormulationEnum;
+	else if (strcmp(name,"NoneFormulation")==0) return NoneFormulationEnum;
 	else if (strcmp(name,"PattynFormulation")==0) return PattynFormulationEnum;
 	else if (strcmp(name,"StokesFormulation")==0) return StokesFormulationEnum;
@@ -62,44 +62,44 @@
 	else if (strcmp(name,"Hook")==0) return HookEnum;
 	else if (strcmp(name,"Element")==0) return ElementEnum;
-	else if (strcmp(name,"Tria")==0) return TriaEnum;
+	else if (strcmp(name,"Beam")==0) return BeamEnum;
+	else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
 	else if (strcmp(name,"ElementProperties")==0) return ElementPropertiesEnum;
 	else if (strcmp(name,"NodeProperties")==0) return NodePropertiesEnum;
 	else if (strcmp(name,"Penta")==0) return PentaEnum;
-	else if (strcmp(name,"Beam")==0) return BeamEnum;
 	else if (strcmp(name,"Sing")==0) return SingEnum;
-	else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
+	else if (strcmp(name,"Tria")==0) return TriaEnum;
 	else if (strcmp(name,"Node")==0) return NodeEnum;
 	else if (strcmp(name,"Vertex")==0) return VertexEnum;
 	else if (strcmp(name,"Load")==0) return LoadEnum;
 	else if (strcmp(name,"Icefront")==0) return IcefrontEnum;
+	else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
+	else if (strcmp(name,"Pengrid")==0) return PengridEnum;
+	else if (strcmp(name,"Penpair")==0) return PenpairEnum;
+	else if (strcmp(name,"QuadIceFront")==0) return QuadIceFrontEnum;
+	else if (strcmp(name,"QuadRiftFront")==0) return QuadRiftFrontEnum;
+	else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
 	else if (strcmp(name,"SegmentIcefront")==0) return SegmentIcefrontEnum;
-	else if (strcmp(name,"QuadIceFront")==0) return QuadIceFrontEnum;
-	else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
 	else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
-	else if (strcmp(name,"QuadRiftFront")==0) return QuadRiftFrontEnum;
-	else if (strcmp(name,"Penpair")==0) return PenpairEnum;
-	else if (strcmp(name,"Pengrid")==0) return PengridEnum;
-	else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
 	else if (strcmp(name,"Material")==0) return MaterialEnum;
 	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,"BeamVertexInput")==0) return BeamVertexInputEnum;
+	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,"PentaVertexInput")==0) return PentaVertexInputEnum;
+	else if (strcmp(name,"SingVertexInput")==0) return SingVertexInputEnum;
 	else if (strcmp(name,"TriaVertexInput")==0) return TriaVertexInputEnum;
-	else if (strcmp(name,"SingVertexInput")==0) return SingVertexInputEnum;
-	else if (strcmp(name,"BeamVertexInput")==0) return BeamVertexInputEnum;
-	else if (strcmp(name,"PentaVertexInput")==0) return PentaVertexInputEnum;
-	else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
-	else if (strcmp(name,"IntInput")==0) return IntInputEnum;
-	else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
 	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,"DoubleParam")==0) return DoubleParamEnum;
+	else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
 	else if (strcmp(name,"IntParam")==0) return IntParamEnum;
-	else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
 	else if (strcmp(name,"PetscMatParam")==0) return PetscMatParamEnum;
 	else if (strcmp(name,"PetscVecParam")==0) return PetscVecParamEnum;
-	else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
-	else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
+	else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
 	else if (strcmp(name,"StringParam")==0) return StringParamEnum;
-	else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
 	else if (strcmp(name,"Result")==0) return ResultEnum;
 	else if (strcmp(name,"Rgb")==0) return RgbEnum;
@@ -113,130 +113,130 @@
 	else if (strcmp(name,"Air")==0) return AirEnum;
 	else if (strcmp(name,"Melange")==0) return MelangeEnum;
-	else if (strcmp(name,"Vx")==0) return VxEnum;
-	else if (strcmp(name,"Vy")==0) return VyEnum;
-	else if (strcmp(name,"Vz")==0) return VzEnum;
-	else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
-	else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
-	else if (strcmp(name,"VzAverage")==0) return VzAverageEnum;
-	else if (strcmp(name,"VxObs")==0) return VxObsEnum;
-	else if (strcmp(name,"VyObs")==0) return VyObsEnum;
-	else if (strcmp(name,"VzObs")==0) return VzObsEnum;
-	else if (strcmp(name,"VxOld")==0) return VxOldEnum;
-	else if (strcmp(name,"VyOld")==0) return VyOldEnum;
-	else if (strcmp(name,"VzOld")==0) return VzOldEnum;
+	else if (strcmp(name,"AccumulationRate")==0) return AccumulationRateEnum;
+	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,"ArtDiff")==0) return ArtDiffEnum;
+	else if (strcmp(name,"Bed")==0) return BedEnum;
+	else if (strcmp(name,"BedSlopex")==0) return BedSlopexEnum;
+	else if (strcmp(name,"BedSlopey")==0) return BedSlopeyEnum;
+	else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
+	else if (strcmp(name,"CmMaxDmpSlope")==0) return CmMaxDmpSlopeEnum;
+	else if (strcmp(name,"CmMaxDmpValue")==0) return CmMaxDmpValueEnum;
+	else if (strcmp(name,"CmMinDmpSlope")==0) return CmMinDmpSlopeEnum;
+	else if (strcmp(name,"CmMinDmpValue")==0) return CmMinDmpValueEnum;
+	else if (strcmp(name,"CmNoiseDmp")==0) return CmNoiseDmpEnum;
+	else if (strcmp(name,"Collapse")==0) return CollapseEnum;
+	else if (strcmp(name,"Constant")==0) return ConstantEnum;
+	else if (strcmp(name,"ControlType")==0) return ControlTypeEnum;
+	else if (strcmp(name,"Converged")==0) return ConvergedEnum;
 	else if (strcmp(name,"DhDt")==0) return DhDtEnum;
-	else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
-	else if (strcmp(name,"Surface")==0) return SurfaceEnum;
-	else if (strcmp(name,"Bed")==0) return BedEnum;
 	else if (strcmp(name,"DragCoefficient")==0) return DragCoefficientEnum;
 	else if (strcmp(name,"DragP")==0) return DragPEnum;
 	else if (strcmp(name,"DragQ")==0) return DragQEnum;
 	else if (strcmp(name,"DragType")==0) return DragTypeEnum;
+	else if (strcmp(name,"Dt")==0) return DtEnum;
+	else if (strcmp(name,"ElementOnBed")==0) return ElementOnBedEnum;
+	else if (strcmp(name,"ElementOnIceShelf")==0) return ElementOnIceShelfEnum;
+	else if (strcmp(name,"ElementOnSurface")==0) return ElementOnSurfaceEnum;
+	else if (strcmp(name,"ElementOnWater")==0) return ElementOnWaterEnum;
+	else if (strcmp(name,"EpsVel")==0) return EpsVelEnum;
+	else if (strcmp(name,"Fill")==0) return FillEnum;
+	else if (strcmp(name,"Fit")==0) return FitEnum;
+	else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
+	else if (strcmp(name,"Friction")==0) return FrictionEnum;
+	else if (strcmp(name,"GeothermalFlux")==0) return GeothermalFluxEnum;
+	else if (strcmp(name,"Internal")==0) return InternalEnum;
+	else if (strcmp(name,"Kflag")==0) return KflagEnum;
+	else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
+	else if (strcmp(name,"MeanVel")==0) return MeanVelEnum;
+	else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
+	else if (strcmp(name,"MeltingRate")==0) return MeltingRateEnum;
+	else if (strcmp(name,"NodeOnBed")==0) return NodeOnBedEnum;
+	else if (strcmp(name,"NodeOnIceSheet")==0) return NodeOnIceSheetEnum;
+	else if (strcmp(name,"NodeOnIceShelf")==0) return NodeOnIceShelfEnum;
+	else if (strcmp(name,"NodeOnSurface")==0) return NodeOnSurfaceEnum;
+	else if (strcmp(name,"PenaltyOffset")==0) return PenaltyOffsetEnum;
+	else if (strcmp(name,"Pflag")==0) return PflagEnum;
+	else if (strcmp(name,"Pressure")==0) return PressureEnum;
+	else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
 	else if (strcmp(name,"RheologyB")==0) return RheologyBEnum;
 	else if (strcmp(name,"RheologyN")==0) return RheologyNEnum;
-	else if (strcmp(name,"MeltingRate")==0) return MeltingRateEnum;
-	else if (strcmp(name,"AccumulationRate")==0) return AccumulationRateEnum;
-	else if (strcmp(name,"GeothermalFlux")==0) return GeothermalFluxEnum;
-	else if (strcmp(name,"ElementOnIceShelf")==0) return ElementOnIceShelfEnum;
-	else if (strcmp(name,"ElementOnBed")==0) return ElementOnBedEnum;
-	else if (strcmp(name,"ElementOnWater")==0) return ElementOnWaterEnum;
-	else if (strcmp(name,"ElementOnSurface")==0) return ElementOnSurfaceEnum;
+	else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
+	else if (strcmp(name,"StabilizeConstraints")==0) return StabilizeConstraintsEnum;
+	else if (strcmp(name,"StokesReconditioning")==0) return StokesReconditioningEnum;
 	else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
+	else if (strcmp(name,"Surface")==0) return SurfaceEnum;
 	else if (strcmp(name,"SurfaceSlopex")==0) return SurfaceSlopexEnum;
 	else if (strcmp(name,"SurfaceSlopey")==0) return SurfaceSlopeyEnum;
-	else if (strcmp(name,"BedSlopex")==0) return BedSlopexEnum;
-	else if (strcmp(name,"BedSlopey")==0) return BedSlopeyEnum;
+	else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
+	else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
+	else if (strcmp(name,"Type")==0) return TypeEnum;
+	else if (strcmp(name,"ViscosityOvershoot")==0) return ViscosityOvershootEnum;
+	else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
+	else if (strcmp(name,"Vx")==0) return VxEnum;
+	else if (strcmp(name,"VxObs")==0) return VxObsEnum;
+	else if (strcmp(name,"VxOld")==0) return VxOldEnum;
+	else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
+	else if (strcmp(name,"Vy")==0) return VyEnum;
+	else if (strcmp(name,"VyObs")==0) return VyObsEnum;
+	else if (strcmp(name,"VyOld")==0) return VyOldEnum;
+	else if (strcmp(name,"VzAverage")==0) return VzAverageEnum;
+	else if (strcmp(name,"Vz")==0) return VzEnum;
+	else if (strcmp(name,"VzObs")==0) return VzObsEnum;
+	else if (strcmp(name,"VzOld")==0) return VzOldEnum;
 	else if (strcmp(name,"Weights")==0) return WeightsEnum;
-	else if (strcmp(name,"Fit")==0) return FitEnum;
-	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,"Collapse")==0) return CollapseEnum;
-	else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
-	else if (strcmp(name,"Pressure")==0) return PressureEnum;
-	else if (strcmp(name,"NodeOnBed")==0) return NodeOnBedEnum;
-	else if (strcmp(name,"NodeOnSurface")==0) return NodeOnSurfaceEnum;
-	else if (strcmp(name,"NodeOnIceShelf")==0) return NodeOnIceShelfEnum;
-	else if (strcmp(name,"NodeOnIceSheet")==0) return NodeOnIceSheetEnum;
-	else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
-	else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
-	else if (strcmp(name,"Type")==0) return TypeEnum;
-	else if (strcmp(name,"Friction")==0) return FrictionEnum;
-	else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
-	else if (strcmp(name,"Converged")==0) return ConvergedEnum;
-	else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
-	else if (strcmp(name,"Fill")==0) return FillEnum;
-	else if (strcmp(name,"Internal")==0) return InternalEnum;
-	else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
-	else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
-	else if (strcmp(name,"Dt")==0) return DtEnum;
-	else if (strcmp(name,"ArtDiff")==0) return ArtDiffEnum;
-	else if (strcmp(name,"CmNoiseDmp")==0) return CmNoiseDmpEnum;
-	else if (strcmp(name,"CmMinDmpValue")==0) return CmMinDmpValueEnum;
-	else if (strcmp(name,"CmMaxDmpValue")==0) return CmMaxDmpValueEnum;
-	else if (strcmp(name,"CmMinDmpSlope")==0) return CmMinDmpSlopeEnum;
-	else if (strcmp(name,"CmMaxDmpSlope")==0) return CmMaxDmpSlopeEnum;
-	else if (strcmp(name,"ControlType")==0) return ControlTypeEnum;
-	else if (strcmp(name,"ViscosityOvershoot")==0) return ViscosityOvershootEnum;
-	else if (strcmp(name,"MeanVel")==0) return MeanVelEnum;
-	else if (strcmp(name,"EpsVel")==0) return EpsVelEnum;
-	else if (strcmp(name,"StokesReconditioning")==0) return StokesReconditioningEnum;
-	else if (strcmp(name,"StabilizeConstraints")==0) return StabilizeConstraintsEnum;
-	else if (strcmp(name,"PenaltyOffset")==0) return PenaltyOffsetEnum;
-	else if (strcmp(name,"Constant")==0) return ConstantEnum;
-	else if (strcmp(name,"Kflag")==0) return KflagEnum;
-	else if (strcmp(name,"Pflag")==0) return PflagEnum;
-	else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
+	else if (strcmp(name,"Beta")==0) return BetaEnum;
+	else if (strcmp(name,"CmGradient")==0) return CmGradientEnum;
+	else if (strcmp(name,"CmJump")==0) return CmJumpEnum;
+	else if (strcmp(name,"CmMax")==0) return CmMaxEnum;
+	else if (strcmp(name,"CmMin")==0) return CmMinEnum;
+	else if (strcmp(name,"Connectivity")==0) return ConnectivityEnum;
+	else if (strcmp(name,"ControlParameter")==0) return ControlParameterEnum;
+	else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
+	else if (strcmp(name,"DakotaParameter")==0) return DakotaParameterEnum;
 	else if (strcmp(name,"Dim")==0) return DimEnum;
+	else if (strcmp(name,"EpsAbs")==0) return EpsAbsEnum;
+	else if (strcmp(name,"EpsCm")==0) return EpsCmEnum;
+	else if (strcmp(name,"EpsRel")==0) return EpsRelEnum;
+	else if (strcmp(name,"EpsRes")==0) return EpsResEnum;
+	else if (strcmp(name,"ExtrudeParam")==0) return ExtrudeParamEnum;
+	else if (strcmp(name,"HeatCapacity")==0) return HeatCapacityEnum;
 	else if (strcmp(name,"IsHutter")==0) return IsHutterEnum;
 	else if (strcmp(name,"IsMacAyealPattyn")==0) return IsMacAyealPattynEnum;
 	else if (strcmp(name,"IsStokes")==0) return IsStokesEnum;
+	else if (strcmp(name,"LatentHeat")==0) return LatentHeatEnum;
+	else if (strcmp(name,"Lowmem")==0) return LowmemEnum;
+	else if (strcmp(name,"MaxIter")==0) return MaxIterEnum;
+	else if (strcmp(name,"MaxNonlinearIterations")==0) return MaxNonlinearIterationsEnum;
+	else if (strcmp(name,"MeltingPoint")==0) return MeltingPointEnum;
+	else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum;
+	else if (strcmp(name,"MinThermalConstraints")==0) return MinThermalConstraintsEnum;
+	else if (strcmp(name,"NSteps")==0) return NStepsEnum;
+	else if (strcmp(name,"Ndt")==0) return NdtEnum;
+	else if (strcmp(name,"NumOutput")==0) return NumOutputEnum;
+	else if (strcmp(name,"NumRifts")==0) return NumRiftsEnum;
+	else if (strcmp(name,"NumberOfDofsPerNode")==0) return NumberOfDofsPerNodeEnum;
+	else if (strcmp(name,"NumberOfElements")==0) return NumberOfElementsEnum;
+	else if (strcmp(name,"NumberOfNodes")==0) return NumberOfNodesEnum;
+	else if (strcmp(name,"NumberOfVertices")==0) return NumberOfVerticesEnum;
+	else if (strcmp(name,"OptScal")==0) return OptScalEnum;
+	else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
+	else if (strcmp(name,"ParameterOutput")==0) return ParameterOutputEnum;
+	else if (strcmp(name,"PenaltyMelting")==0) return PenaltyMeltingEnum;
+	else if (strcmp(name,"QmuAnalysis")==0) return QmuAnalysisEnum;
+	else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
+	else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
+	else if (strcmp(name,"QmuNPart")==0) return QmuNPartEnum;
+	else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
+	else if (strcmp(name,"QmuPart")==0) return QmuPartEnum;
+	else if (strcmp(name,"ResponseDescriptors")==0) return ResponseDescriptorsEnum;
+	else if (strcmp(name,"SolverString")==0) return SolverStringEnum;
+	else if (strcmp(name,"Sparsity")==0) return SparsityEnum;
+	else if (strcmp(name,"TolX")==0) return TolXEnum;
+	else if (strcmp(name,"VariableDescriptors")==0) return VariableDescriptorsEnum;
 	else if (strcmp(name,"Verbose")==0) return VerboseEnum;
-	else if (strcmp(name,"EpsRes")==0) return EpsResEnum;
-	else if (strcmp(name,"EpsRel")==0) return EpsRelEnum;
-	else if (strcmp(name,"EpsAbs")==0) return EpsAbsEnum;
-	else if (strcmp(name,"EpsCm")==0) return EpsCmEnum;
-	else if (strcmp(name,"MaxNonlinearIterations")==0) return MaxNonlinearIterationsEnum;
+	else if (strcmp(name,"WaitOnLock")==0) return WaitOnLockEnum;
 	else if (strcmp(name,"Yts")==0) return YtsEnum;
-	else if (strcmp(name,"Ndt")==0) return NdtEnum;
-	else if (strcmp(name,"Sparsity")==0) return SparsityEnum;
-	else if (strcmp(name,"Lowmem")==0) return LowmemEnum;
-	else if (strcmp(name,"Connectivity")==0) return ConnectivityEnum;
-	else if (strcmp(name,"Beta")==0) return BetaEnum;
-	else if (strcmp(name,"MeltingPoint")==0) return MeltingPointEnum;
-	else if (strcmp(name,"LatentHeat")==0) return LatentHeatEnum;
-	else if (strcmp(name,"HeatCapacity")==0) return HeatCapacityEnum;
-	else if (strcmp(name,"PenaltyMelting")==0) return PenaltyMeltingEnum;
-	else if (strcmp(name,"MinThermalConstraints")==0) return MinThermalConstraintsEnum;
-	else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum;
-	else if (strcmp(name,"WaitOnLock")==0) return WaitOnLockEnum;
-	else if (strcmp(name,"SolverString")==0) return SolverStringEnum;
-	else if (strcmp(name,"NumberOfVertices")==0) return NumberOfVerticesEnum;
-	else if (strcmp(name,"NumberOfNodes")==0) return NumberOfNodesEnum;
-	else if (strcmp(name,"NumberOfElements")==0) return NumberOfElementsEnum;
-	else if (strcmp(name,"NumberOfDofsPerNode")==0) return NumberOfDofsPerNodeEnum;
-	else if (strcmp(name,"NumRifts")==0) return NumRiftsEnum;
-	else if (strcmp(name,"NumOutput")==0) return NumOutputEnum;
-	else if (strcmp(name,"ParameterOutput")==0) return ParameterOutputEnum;
-	else if (strcmp(name,"ExtrudeParam")==0) return ExtrudeParamEnum;
-	else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
-	else if (strcmp(name,"NSteps")==0) return NStepsEnum;
-	else if (strcmp(name,"TolX")==0) return TolXEnum;
-	else if (strcmp(name,"CmMin")==0) return CmMinEnum;
-	else if (strcmp(name,"CmMax")==0) return CmMaxEnum;
-	else if (strcmp(name,"CmGradient")==0) return CmGradientEnum;
-	else if (strcmp(name,"CmJump")==0) return CmJumpEnum;
-	else if (strcmp(name,"OptScal")==0) return OptScalEnum;
-	else if (strcmp(name,"MaxIter")==0) return MaxIterEnum;
-	else if (strcmp(name,"ControlParameter")==0) return ControlParameterEnum;
-	else if (strcmp(name,"QmuAnalysis")==0) return QmuAnalysisEnum;
-	else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
-	else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
-	else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
-	else if (strcmp(name,"QmuNPart")==0) return QmuNPartEnum;
-	else if (strcmp(name,"QmuPart")==0) return QmuPartEnum;
-	else if (strcmp(name,"VariableDescriptors")==0) return VariableDescriptorsEnum;
-	else if (strcmp(name,"ResponseDescriptors")==0) return ResponseDescriptorsEnum;
-	else if (strcmp(name,"DakotaParameter")==0) return DakotaParameterEnum;
 	else ISSMERROR("Enum %i not found",name);