Index: /issm/trunk-jpl/src/c/analyses/EsaAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EsaAnalysis.cpp (revision 22608) +++ /issm/trunk-jpl/src/c/analyses/EsaAnalysis.cpp (revision 22609) @@ -168,5 +168,4 @@ /*Requested outputs*/ iomodel->FindConstant(&requestedoutputs,&numoutputs,"md.esa.requested_outputs"); - parameters->AddObject(new IntParam(EsaNumRequestedOutputsEnum,numoutputs)); if(numoutputs)parameters->AddObject(new StringArrayParam(EsaRequestedOutputsEnum,requestedoutputs,numoutputs)); iomodel->DeleteData(&requestedoutputs,numoutputs,"md.esa.requested_outputs"); Index: /issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp (revision 22608) +++ /issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp (revision 22609) @@ -219,5 +219,4 @@ /*Requested outputs*/ iomodel->FindConstant(&requestedoutputs,&numoutputs,"md.slr.requested_outputs"); - parameters->AddObject(new IntParam(SealevelriseNumRequestedOutputsEnum,numoutputs)); if(numoutputs)parameters->AddObject(new StringArrayParam(SealevelriseRequestedOutputsEnum,requestedoutputs,numoutputs)); iomodel->DeleteData(&requestedoutputs,numoutputs,"md.slr.requested_outputs"); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 22608) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 22609) @@ -75,5 +75,4 @@ if(isautodiff){ /*Copy some parameters from IoModel to parameters dataset: {{{*/ - parameters->AddObject(iomodel->CopyConstantObject("md.autodiff.keep",AutodiffKeepEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.autodiff.obufsize",AutodiffObufsizeEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.autodiff.cbufsize",AutodiffCbufsizeEnum)); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22608) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22609) @@ -611,5 +611,4 @@ ArrheniusEnum, AutodiffJacobianEnum, - AutodiffKeepEnum, Balancethickness2AnalysisEnum, Balancethickness2SolutionEnum, @@ -683,5 +682,4 @@ EsaEmotionEnum, EsaNmotionEnum, - EsaNumRequestedOutputsEnum, EsaRotationrateEnum, EsaSolutionEnum, @@ -905,5 +903,4 @@ SealevelNmotionEnum, SealevelriseAnalysisEnum, - SealevelriseNumRequestedOutputsEnum, SealevelriseSolutionEnum, SealevelriseStericRateEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22608) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22609) @@ -615,5 +615,4 @@ case ArrheniusEnum : return "Arrhenius"; case AutodiffJacobianEnum : return "AutodiffJacobian"; - case AutodiffKeepEnum : return "AutodiffKeep"; case Balancethickness2AnalysisEnum : return "Balancethickness2Analysis"; case Balancethickness2SolutionEnum : return "Balancethickness2Solution"; @@ -687,5 +686,4 @@ case EsaEmotionEnum : return "EsaEmotion"; case EsaNmotionEnum : return "EsaNmotion"; - case EsaNumRequestedOutputsEnum : return "EsaNumRequestedOutputs"; case EsaRotationrateEnum : return "EsaRotationrate"; case EsaSolutionEnum : return "EsaSolution"; @@ -909,5 +907,4 @@ case SealevelNmotionEnum : return "SealevelNmotion"; case SealevelriseAnalysisEnum : return "SealevelriseAnalysis"; - case SealevelriseNumRequestedOutputsEnum : return "SealevelriseNumRequestedOutputs"; case SealevelriseSolutionEnum : return "SealevelriseSolution"; case SealevelriseStericRateEnum : return "SealevelriseStericRate"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22608) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22609) @@ -627,11 +627,10 @@ else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum; - else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum; else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum; + else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum; - else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; + if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum; else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum; @@ -702,5 +701,4 @@ else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum; else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum; - else if (strcmp(name,"EsaNumRequestedOutputs")==0) return EsaNumRequestedOutputsEnum; else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum; else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum; @@ -752,10 +750,10 @@ else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum; else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum; + else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum; + else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum; - else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum; - else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum; + if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum; else if (strcmp(name,"HydrologydcEplConductivity")==0) return HydrologydcEplConductivityEnum; else if (strcmp(name,"HydrologydcEplInitialThickness")==0) return HydrologydcEplInitialThicknessEnum; @@ -875,10 +873,10 @@ else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum; else if (strcmp(name,"Mumps")==0) return MumpsEnum; + else if (strcmp(name,"NewDamage")==0) return NewDamageEnum; + else if (strcmp(name,"Nodal")==0) return NodalEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"NewDamage")==0) return NewDamageEnum; - else if (strcmp(name,"Nodal")==0) return NodalEnum; - else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum; + if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum; else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum; else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; @@ -930,5 +928,4 @@ else if (strcmp(name,"SealevelNmotion")==0) return SealevelNmotionEnum; else if (strcmp(name,"SealevelriseAnalysis")==0) return SealevelriseAnalysisEnum; - else if (strcmp(name,"SealevelriseNumRequestedOutputs")==0) return SealevelriseNumRequestedOutputsEnum; else if (strcmp(name,"SealevelriseSolution")==0) return SealevelriseSolutionEnum; else if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum; @@ -998,11 +995,11 @@ else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum; else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum; + else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum; + else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum; + else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum; - else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum; - else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum; - else if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum; + if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum; else if (strcmp(name,"TransientInput")==0) return TransientInputEnum; else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; @@ -1121,11 +1118,11 @@ else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum; else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum; + else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum; + else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum; + else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum; else stage=10; } if(stage==10){ - if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum; - else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum; - else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum; - else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum; + if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum; else if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum; else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum;