Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23855) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23856) @@ -432,4 +432,5 @@ /*Inputs{{{*/ AdjointEnum, + AdjointpEnum, AdjointxEnum, AdjointyEnum, @@ -489,4 +490,6 @@ DrivingStressYEnum, EffectivePressureHydrostepEnum, + EffectivePressureStackedEnum, + EffectivePressureEnum, EnthalpyEnum, EnthalpyPicardEnum, @@ -578,4 +581,5 @@ MisfitEnum, NeumannfluxEnum, + NewDamageEnum, NodeEnum, OmegaAbsGradientEnum, @@ -606,4 +610,5 @@ SedimentHeadResidualEnum, SigmaNNEnum, + SigmaVMEnum, SmbAccumulationEnum, SmbAEnum, @@ -722,4 +727,7 @@ TemperatureEnum, TemperaturePicardEnum, + TemperaturePDDEnum, + TemperatureSEMICEnum, + ThermalSpctemperatureEnum, ThicknessAbsGradientEnum, ThicknessAbsMisfitEnum, @@ -757,5 +765,4 @@ AdjointBalancethicknessAnalysisEnum, AdjointHorizAnalysisEnum, - AdjointpEnum, AggressiveMigrationEnum, AmrBamgEnum, @@ -826,6 +833,4 @@ DoubleParamEnum, DoubleVecParamEnum, - EffectivePressureStackedEnum, - EffectivePressureEnum, ElementEnum, ElementHookEnum, @@ -976,5 +981,4 @@ MpiSparseEnum, MumpsEnum, - NewDamageEnum, NodalEnum, NodalvalueEnum, @@ -1136,5 +1140,4 @@ SeqEnum, SIAApproximationEnum, - SigmaVMEnum, SmbAnalysisEnum, SMBsemicEnum, @@ -1179,11 +1182,8 @@ SurfaceSlopeSolutionEnum, TaylorHoodEnum, - TemperaturePDDEnum, - TemperatureSEMICEnum, TetraEnum, TetraInputEnum, ThermalAnalysisEnum, ThermalSolutionEnum, - ThermalSpctemperatureEnum, ThicknessErrorEstimatorEnum, TotalFloatingBmbEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23855) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23856) @@ -438,4 +438,5 @@ case InputsSTARTEnum : return "InputsSTART"; case AdjointEnum : return "Adjoint"; + case AdjointpEnum : return "Adjointp"; case AdjointxEnum : return "Adjointx"; case AdjointyEnum : return "Adjointy"; @@ -495,4 +496,6 @@ case DrivingStressYEnum : return "DrivingStressY"; case EffectivePressureHydrostepEnum : return "EffectivePressureHydrostep"; + case EffectivePressureStackedEnum : return "EffectivePressureStacked"; + case EffectivePressureEnum : return "EffectivePressure"; case EnthalpyEnum : return "Enthalpy"; case EnthalpyPicardEnum : return "EnthalpyPicard"; @@ -584,4 +587,5 @@ case MisfitEnum : return "Misfit"; case NeumannfluxEnum : return "Neumannflux"; + case NewDamageEnum : return "NewDamage"; case NodeEnum : return "Node"; case OmegaAbsGradientEnum : return "OmegaAbsGradient"; @@ -612,4 +616,5 @@ case SedimentHeadResidualEnum : return "SedimentHeadResidual"; case SigmaNNEnum : return "SigmaNN"; + case SigmaVMEnum : return "SigmaVM"; case SmbAccumulationEnum : return "SmbAccumulation"; case SmbAEnum : return "SmbA"; @@ -728,4 +733,7 @@ case TemperatureEnum : return "Temperature"; case TemperaturePicardEnum : return "TemperaturePicard"; + case TemperaturePDDEnum : return "TemperaturePDD"; + case TemperatureSEMICEnum : return "TemperatureSEMIC"; + case ThermalSpctemperatureEnum : return "ThermalSpctemperature"; case ThicknessAbsGradientEnum : return "ThicknessAbsGradient"; case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit"; @@ -761,5 +769,4 @@ case AdjointBalancethicknessAnalysisEnum : return "AdjointBalancethicknessAnalysis"; case AdjointHorizAnalysisEnum : return "AdjointHorizAnalysis"; - case AdjointpEnum : return "Adjointp"; case AggressiveMigrationEnum : return "AggressiveMigration"; case AmrBamgEnum : return "AmrBamg"; @@ -830,6 +837,4 @@ case DoubleParamEnum : return "DoubleParam"; case DoubleVecParamEnum : return "DoubleVecParam"; - case EffectivePressureStackedEnum : return "EffectivePressureStacked"; - case EffectivePressureEnum : return "EffectivePressure"; case ElementEnum : return "Element"; case ElementHookEnum : return "ElementHook"; @@ -980,5 +985,4 @@ case MpiSparseEnum : return "MpiSparse"; case MumpsEnum : return "Mumps"; - case NewDamageEnum : return "NewDamage"; case NodalEnum : return "Nodal"; case NodalvalueEnum : return "Nodalvalue"; @@ -1140,5 +1144,4 @@ case SeqEnum : return "Seq"; case SIAApproximationEnum : return "SIAApproximation"; - case SigmaVMEnum : return "SigmaVM"; case SmbAnalysisEnum : return "SmbAnalysis"; case SMBsemicEnum : return "SMBsemic"; @@ -1183,11 +1186,8 @@ case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution"; case TaylorHoodEnum : return "TaylorHood"; - case TemperaturePDDEnum : return "TemperaturePDD"; - case TemperatureSEMICEnum : return "TemperatureSEMIC"; case TetraEnum : return "Tetra"; case TetraInputEnum : return "TetraInput"; case ThermalAnalysisEnum : return "ThermalAnalysis"; case ThermalSolutionEnum : return "ThermalSolution"; - case ThermalSpctemperatureEnum : return "ThermalSpctemperature"; case ThicknessErrorEstimatorEnum : return "ThicknessErrorEstimator"; case TotalFloatingBmbEnum : return "TotalFloatingBmb"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23855) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23856) @@ -447,4 +447,5 @@ else if (strcmp(name,"InputsSTART")==0) return InputsSTARTEnum; else if (strcmp(name,"Adjoint")==0) return AdjointEnum; + else if (strcmp(name,"Adjointp")==0) return AdjointpEnum; else if (strcmp(name,"Adjointx")==0) return AdjointxEnum; else if (strcmp(name,"Adjointy")==0) return AdjointyEnum; @@ -504,10 +505,12 @@ else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum; else if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum; - else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum; - else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum; + else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"EplHeadHydrostep")==0) return EplHeadHydrostepEnum; + if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum; + else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum; + else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum; + else if (strcmp(name,"EplHeadHydrostep")==0) return EplHeadHydrostepEnum; else if (strcmp(name,"EplHeadOld")==0) return EplHeadOldEnum; else if (strcmp(name,"EplHeadSlopeX")==0) return EplHeadSlopeXEnum; @@ -596,4 +599,5 @@ else if (strcmp(name,"Misfit")==0) return MisfitEnum; else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum; + else if (strcmp(name,"NewDamage")==0) return NewDamageEnum; else if (strcmp(name,"Node")==0) return NodeEnum; else if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum; @@ -624,13 +628,14 @@ 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,"SigmaVM")==0) return SigmaVMEnum; + else stage=6; + } + if(stage==6){ + if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum; else if (strcmp(name,"SmbA")==0) return SmbAEnum; else if (strcmp(name,"SmbAini")==0) return SmbAiniEnum; else if (strcmp(name,"SmbAValue")==0) return SmbAValueEnum; else if (strcmp(name,"SmbBMax")==0) return SmbBMaxEnum; - else stage=6; - } - if(stage==6){ - if (strcmp(name,"SmbBMin")==0) return SmbBMinEnum; + else if (strcmp(name,"SmbBMin")==0) return SmbBMinEnum; else if (strcmp(name,"SmbBNeg")==0) return SmbBNegEnum; else if (strcmp(name,"SmbBPos")==0) return SmbBPosEnum; @@ -743,6 +748,12 @@ else if (strcmp(name,"Temperature")==0) return TemperatureEnum; else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; + else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; + else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum; + else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum; - else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; + else stage=7; + } + if(stage==7){ + if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum; else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum; @@ -752,8 +763,5 @@ else if (strcmp(name,"VxAverage")==0) return VxAverageEnum; else if (strcmp(name,"Vx")==0) return VxEnum; - else stage=7; - } - if(stage==7){ - if (strcmp(name,"VxMesh")==0) return VxMeshEnum; + else if (strcmp(name,"VxMesh")==0) return VxMeshEnum; else if (strcmp(name,"VxObs")==0) return VxObsEnum; else if (strcmp(name,"VyAverage")==0) return VyAverageEnum; @@ -779,5 +787,4 @@ else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum; else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum; - else if (strcmp(name,"Adjointp")==0) return AdjointpEnum; else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum; else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum; @@ -848,6 +855,4 @@ else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum; else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; - else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum; - else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum; else if (strcmp(name,"Element")==0) return ElementEnum; else if (strcmp(name,"ElementHook")==0) return ElementHookEnum; @@ -870,13 +875,13 @@ else if (strcmp(name,"FileParam")==0) return FileParamEnum; else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum; - else if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum; + else stage=8; + } + if(stage==8){ + if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum; else if (strcmp(name,"FloatingAreaScaled")==0) return FloatingAreaScaledEnum; else if (strcmp(name,"FloatingMeltRate")==0) return FloatingMeltRateEnum; else if (strcmp(name,"Free")==0) return FreeEnum; else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum; - else stage=8; - } - if(stage==8){ - if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum; + else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum; else if (strcmp(name,"FrontalForcingsDefault")==0) return FrontalForcingsDefaultEnum; else if (strcmp(name,"FrontalForcingsRignot")==0) return FrontalForcingsRignotEnum; @@ -993,16 +998,15 @@ else if (strcmp(name,"MinVel")==0) return MinVelEnum; else if (strcmp(name,"MinVx")==0) return MinVxEnum; - else if (strcmp(name,"MinVy")==0) return MinVyEnum; + else stage=9; + } + if(stage==9){ + if (strcmp(name,"MinVy")==0) return MinVyEnum; else if (strcmp(name,"MinVz")==0) return MinVzEnum; else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum; else if (strcmp(name,"Moulin")==0) return MoulinEnum; else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum; - else stage=9; - } - if(stage==9){ - if (strcmp(name,"Mpi")==0) return MpiEnum; + else if (strcmp(name,"Mpi")==0) return MpiEnum; 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 if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum; @@ -1117,12 +1121,12 @@ else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum; else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum; - else if (strcmp(name,"Outputdefinition100")==0) return Outputdefinition100Enum; + else stage=10; + } + if(stage==10){ + if (strcmp(name,"Outputdefinition100")==0) return Outputdefinition100Enum; else if (strcmp(name,"P0Array")==0) return P0ArrayEnum; else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; - else stage=10; - } - if(stage==10){ - if (strcmp(name,"P1DG")==0) return P1DGEnum; + else if (strcmp(name,"P1DG")==0) return P1DGEnum; else if (strcmp(name,"P1P1")==0) return P1P1Enum; else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; @@ -1167,5 +1171,4 @@ else if (strcmp(name,"Seq")==0) return SeqEnum; else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum; - else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum; else if (strcmp(name,"SmbAnalysis")==0) return SmbAnalysisEnum; else if (strcmp(name,"SMBsemic")==0) return SMBsemicEnum; @@ -1210,11 +1213,8 @@ else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; - else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; - else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum; else if (strcmp(name,"Tetra")==0) return TetraEnum; else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; - else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;