Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22726) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22727) @@ -160,4 +160,6 @@ InversionControlParametersEnum, InversionControlScalingFactorsEnum, + ControlInputSizeMEnum, + ControlInputSizeNEnum, InversionCostFunctionsEnum, InversionDxminEnum, @@ -659,4 +661,8 @@ ContoursEnum, ControlInputEnum, + ControlInputValuesEnum, + ControlInputMinsEnum, + ControlInputMaxsEnum, + ControlInputGradEnum, CrouzeixRaviartEnum, CuffeyEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22726) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22727) @@ -168,4 +168,6 @@ case InversionControlParametersEnum : return "InversionControlParameters"; case InversionControlScalingFactorsEnum : return "InversionControlScalingFactors"; + case ControlInputSizeMEnum : return "ControlInputSizeM"; + case ControlInputSizeNEnum : return "ControlInputSizeN"; case InversionCostFunctionsEnum : return "InversionCostFunctions"; case InversionDxminEnum : return "InversionDxmin"; @@ -663,4 +665,8 @@ case ContoursEnum : return "Contours"; case ControlInputEnum : return "ControlInput"; + case ControlInputValuesEnum : return "ControlInputValues"; + case ControlInputMinsEnum : return "ControlInputMins"; + case ControlInputMaxsEnum : return "ControlInputMaxs"; + case ControlInputGradEnum : return "ControlInputGrad"; case CrouzeixRaviartEnum : return "CrouzeixRaviart"; case CuffeyEnum : return "Cuffey"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22726) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22727) @@ -171,4 +171,6 @@ else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; else if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum; + else if (strcmp(name,"ControlInputSizeM")==0) return ControlInputSizeMEnum; + else if (strcmp(name,"ControlInputSizeN")==0) return ControlInputSizeNEnum; else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; else if (strcmp(name,"InversionDxmin")==0) return InversionDxminEnum; @@ -258,10 +260,10 @@ else if (strcmp(name,"SealevelriseTransitions")==0) return SealevelriseTransitionsEnum; else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum; - else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; - else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"SettingsRecordingFrequency")==0) return SettingsRecordingFrequencyEnum; + if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; + else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; + else if (strcmp(name,"SettingsRecordingFrequency")==0) return SettingsRecordingFrequencyEnum; else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum; else if (strcmp(name,"SettingsSolverResidueThreshold")==0) return SettingsSolverResidueThresholdEnum; @@ -381,10 +383,10 @@ else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum; else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum; - else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum; - else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"Base")==0) return BaseEnum; + if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum; + else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum; + else if (strcmp(name,"Base")==0) return BaseEnum; else if (strcmp(name,"Bed")==0) return BedEnum; else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum; @@ -504,10 +506,10 @@ else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum; else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum; - else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum; - else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum; + if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum; + else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum; + else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum; else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum; else if (strcmp(name,"SmbA")==0) return SmbAEnum; @@ -627,10 +629,10 @@ else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum; else if (strcmp(name,"Waterheight")==0) return WaterheightEnum; - else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum; - else if (strcmp(name,"InputsEND")==0) return InputsENDEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"Absolute")==0) return AbsoluteEnum; + if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum; + else if (strcmp(name,"InputsEND")==0) return InputsENDEnum; + else if (strcmp(name,"Absolute")==0) return AbsoluteEnum; else if (strcmp(name,"AdaptiveTimestepping")==0) return AdaptiveTimesteppingEnum; else if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum; @@ -678,4 +680,8 @@ else if (strcmp(name,"Contours")==0) return ContoursEnum; else if (strcmp(name,"ControlInput")==0) return ControlInputEnum; + else if (strcmp(name,"ControlInputValues")==0) return ControlInputValuesEnum; + else if (strcmp(name,"ControlInputMins")==0) return ControlInputMinsEnum; + else if (strcmp(name,"ControlInputMaxs")==0) return ControlInputMaxsEnum; + else if (strcmp(name,"ControlInputGrad")==0) return ControlInputGradEnum; else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum; else if (strcmp(name,"Cuffey")==0) return CuffeyEnum; @@ -746,5 +752,8 @@ else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum; else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum; - else if (strcmp(name,"GenericParam")==0) return GenericParamEnum; + else stage=7; + } + if(stage==7){ + if (strcmp(name,"GenericParam")==0) return GenericParamEnum; else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum; @@ -752,8 +761,5 @@ else if (strcmp(name,"GiaW")==0) return GiaWEnum; else if (strcmp(name,"Gradient1")==0) return Gradient1Enum; - else stage=7; - } - if(stage==7){ - if (strcmp(name,"Gradient2")==0) return Gradient2Enum; + else if (strcmp(name,"Gradient2")==0) return Gradient2Enum; else if (strcmp(name,"Gradient3")==0) return Gradient3Enum; else if (strcmp(name,"GroundedArea")==0) return GroundedAreaEnum; @@ -869,5 +875,8 @@ else if (strcmp(name,"MaxVz")==0) return MaxVzEnum; else if (strcmp(name,"Melange")==0) return MelangeEnum; - else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; + else stage=8; + } + if(stage==8){ + if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum; else if (strcmp(name,"MeshLat")==0) return MeshLatEnum; @@ -875,8 +884,5 @@ else if (strcmp(name,"MeshX")==0) return MeshXEnum; else if (strcmp(name,"MeshY")==0) return MeshYEnum; - else stage=8; - } - if(stage==8){ - if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; + else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; else if (strcmp(name,"MINI")==0) return MINIEnum; else if (strcmp(name,"MinVel")==0) return MinVelEnum; @@ -992,5 +998,8 @@ else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum; else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum; - else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum; + else stage=9; + } + if(stage==9){ + if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum; else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum; else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum; @@ -998,8 +1007,5 @@ else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum; else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum; - else stage=9; - } - if(stage==9){ - if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum; + else if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum; else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum; else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum; @@ -1115,5 +1121,8 @@ else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum; - else if (strcmp(name,"Tria")==0) return TriaEnum; + else stage=10; + } + if(stage==10){ + if (strcmp(name,"Tria")==0) return TriaEnum; else if (strcmp(name,"TriaInput")==0) return TriaInputEnum; else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum; @@ -1121,8 +1130,5 @@ else if (strcmp(name,"Vertex")==0) return VertexEnum; else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum; - else stage=10; - } - if(stage==10){ - if (strcmp(name,"VertexSId")==0) return VertexSIdEnum; + else if (strcmp(name,"VertexSId")==0) return VertexSIdEnum; else if (strcmp(name,"Vertices")==0) return VerticesEnum; else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;