Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22583) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22584) @@ -37,4 +37,5 @@ TimesteppingTimeStepMaxEnum, /*}}}*/ + InputsSTARTEnum, /*Model fields {{{*/ AutodiffIsautodiffEnum, @@ -944,4 +945,19 @@ /*}}}*/ ParametersENDEnum, + /*Approximations {{{*/ + ApproximationEnum, + NoneApproximationEnum, + SIAApproximationEnum, + SSAApproximationEnum, + SSAHOApproximationEnum, + SSAFSApproximationEnum, + L1L2ApproximationEnum, + HOApproximationEnum, + HOFSApproximationEnum, + FSApproximationEnum, + FSvelocityEnum, + FSpressureEnum, + /*}}}*/ + InputsENDEnum, /*Coordinate Systems{{{*/ XYEnum, @@ -1071,18 +1087,4 @@ ExtrapolationAnalysisEnum, /*}}}*/ - /*Approximations {{{*/ - ApproximationEnum, - NoneApproximationEnum, - SIAApproximationEnum, - SSAApproximationEnum, - SSAHOApproximationEnum, - SSAFSApproximationEnum, - L1L2ApproximationEnum, - HOApproximationEnum, - HOFSApproximationEnum, - FSApproximationEnum, - FSvelocityEnum, - FSpressureEnum, - /*}}}*/ /*Gauss{{{*/ GaussSegEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22583) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22584) @@ -44,4 +44,5 @@ case TimesteppingTimeStepMinEnum : return "TimesteppingTimeStepMin"; case TimesteppingTimeStepMaxEnum : return "TimesteppingTimeStepMax"; + case InputsSTARTEnum : return "InputsSTART"; case AutodiffIsautodiffEnum : return "AutodiffIsautodiff"; case AutodiffNumDependentsEnum : return "AutodiffNumDependents"; @@ -916,4 +917,17 @@ case ThicknessErrorEstimatorEnum : return "ThicknessErrorEstimator"; case ParametersENDEnum : return "ParametersEND"; + case ApproximationEnum : return "Approximation"; + case NoneApproximationEnum : return "NoneApproximation"; + case SIAApproximationEnum : return "SIAApproximation"; + case SSAApproximationEnum : return "SSAApproximation"; + case SSAHOApproximationEnum : return "SSAHOApproximation"; + case SSAFSApproximationEnum : return "SSAFSApproximation"; + case L1L2ApproximationEnum : return "L1L2Approximation"; + case HOApproximationEnum : return "HOApproximation"; + case HOFSApproximationEnum : return "HOFSApproximation"; + case FSApproximationEnum : return "FSApproximation"; + case FSvelocityEnum : return "FSvelocity"; + case FSpressureEnum : return "FSpressure"; + case InputsENDEnum : return "InputsEND"; case XYEnum : return "XY"; case XYZEnum : return "XYZ"; @@ -1035,16 +1049,4 @@ case LevelsetAnalysisEnum : return "LevelsetAnalysis"; case ExtrapolationAnalysisEnum : return "ExtrapolationAnalysis"; - case ApproximationEnum : return "Approximation"; - case NoneApproximationEnum : return "NoneApproximation"; - case SIAApproximationEnum : return "SIAApproximation"; - case SSAApproximationEnum : return "SSAApproximation"; - case SSAHOApproximationEnum : return "SSAHOApproximation"; - case SSAFSApproximationEnum : return "SSAFSApproximation"; - case L1L2ApproximationEnum : return "L1L2Approximation"; - case HOApproximationEnum : return "HOApproximation"; - case HOFSApproximationEnum : return "HOFSApproximation"; - case FSApproximationEnum : return "FSApproximation"; - case FSvelocityEnum : return "FSvelocity"; - case FSpressureEnum : return "FSpressure"; case GaussSegEnum : return "GaussSeg"; case GaussTriaEnum : return "GaussTria"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22583) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22584) @@ -44,4 +44,5 @@ else if (strcmp(name,"TimesteppingTimeStepMin")==0) return TimesteppingTimeStepMinEnum; else if (strcmp(name,"TimesteppingTimeStepMax")==0) return TimesteppingTimeStepMaxEnum; + else if (strcmp(name,"InputsSTART")==0) return InputsSTARTEnum; else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum; else if (strcmp(name,"AutodiffNumDependents")==0) return AutodiffNumDependentsEnum; @@ -136,9 +137,9 @@ else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; else if (strcmp(name,"FrictionM")==0) return FrictionMEnum; - else if (strcmp(name,"FrictionC")==0) return FrictionCEnum; else stage=2; } if(stage==2){ - if (strcmp(name,"FrictionLaw")==0) return FrictionLawEnum; + if (strcmp(name,"FrictionC")==0) return FrictionCEnum; + else if (strcmp(name,"FrictionLaw")==0) return FrictionLawEnum; else if (strcmp(name,"FrictionGamma")==0) return FrictionGammaEnum; else if (strcmp(name,"FrictionF")==0) return FrictionFEnum; @@ -259,9 +260,9 @@ else if (strcmp(name,"MaterialsRheologyEbar")==0) return MaterialsRheologyEbarEnum; else if (strcmp(name,"MaterialsRheologyEc")==0) return MaterialsRheologyEcEnum; - else if (strcmp(name,"MaterialsRheologyEcbar")==0) return MaterialsRheologyEcbarEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum; + if (strcmp(name,"MaterialsRheologyEcbar")==0) return MaterialsRheologyEcbarEnum; + else if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum; else if (strcmp(name,"MaterialsRheologyEsbar")==0) return MaterialsRheologyEsbarEnum; else if (strcmp(name,"DamageD")==0) return DamageDEnum; @@ -382,9 +383,9 @@ else if (strcmp(name,"Surface")==0) return SurfaceEnum; else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; - else if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"ThermalReltol")==0) return ThermalReltolEnum; + if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum; + else if (strcmp(name,"ThermalReltol")==0) return ThermalReltolEnum; else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; @@ -505,9 +506,9 @@ else if (strcmp(name,"SmbIsmungsm")==0) return SmbIsmungsmEnum; else if (strcmp(name,"SmbIsd18opd")==0) return SmbIsd18opdEnum; - else if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"SmbPrecipitationsPresentday")==0) return SmbPrecipitationsPresentdayEnum; + if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum; + else if (strcmp(name,"SmbPrecipitationsPresentday")==0) return SmbPrecipitationsPresentdayEnum; else if (strcmp(name,"SmbPrecipitationsLgm")==0) return SmbPrecipitationsLgmEnum; else if (strcmp(name,"SmbTemperaturesPresentday")==0) return SmbTemperaturesPresentdayEnum; @@ -628,9 +629,9 @@ else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum; - else if (strcmp(name,"LambdaS")==0) return LambdaSEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"StrainRate")==0) return StrainRateEnum; + if (strcmp(name,"LambdaS")==0) return LambdaSEnum; + else if (strcmp(name,"StrainRate")==0) return StrainRateEnum; else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum; else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum; @@ -751,9 +752,9 @@ 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 stage=7; } if(stage==7){ - if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum; + 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; @@ -874,9 +875,9 @@ else if (strcmp(name,"LoveNfreq")==0) return LoveNfreqEnum; else if (strcmp(name,"LoveFrequencies")==0) return LoveFrequenciesEnum; - else if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum; + if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum; + else if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum; else if (strcmp(name,"LoveG0")==0) return LoveG0Enum; else if (strcmp(name,"LoveR0")==0) return LoveR0Enum; @@ -937,4 +938,17 @@ else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; else if (strcmp(name,"ParametersEND")==0) return ParametersENDEnum; + else if (strcmp(name,"Approximation")==0) return ApproximationEnum; + else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; + else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum; + else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum; + else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum; + else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum; + else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum; + else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum; + else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum; + else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum; + else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum; + else if (strcmp(name,"FSpressure")==0) return FSpressureEnum; + else if (strcmp(name,"InputsEND")==0) return InputsENDEnum; else if (strcmp(name,"XY")==0) return XYEnum; else if (strcmp(name,"XYZ")==0) return XYZEnum; @@ -984,5 +998,8 @@ else if (strcmp(name,"VectorParam")==0) return VectorParamEnum; else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; - else if (strcmp(name,"Segment")==0) return SegmentEnum; + else stage=9; + } + if(stage==9){ + if (strcmp(name,"Segment")==0) return SegmentEnum; else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; @@ -998,8 +1015,5 @@ else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; else if (strcmp(name,"Penta")==0) return PentaEnum; - else stage=9; - } - if(stage==9){ - if (strcmp(name,"PentaInput")==0) return PentaInputEnum; + else if (strcmp(name,"PentaInput")==0) return PentaInputEnum; else if (strcmp(name,"Vertex")==0) return VertexEnum; else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum; @@ -1059,16 +1073,4 @@ else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum; else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum; - else if (strcmp(name,"Approximation")==0) return ApproximationEnum; - else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; - else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum; - else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum; - else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum; - else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum; - else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum; - else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum; - else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum; - else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum; - else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum; - else if (strcmp(name,"FSpressure")==0) return FSpressureEnum; else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum; else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum; @@ -1119,10 +1121,10 @@ else if (strcmp(name,"P1xP4")==0) return P1xP4Enum; else if (strcmp(name,"P2xP4")==0) return P2xP4Enum; - else if (strcmp(name,"P1P1")==0) return P1P1Enum; - else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"MINI")==0) return MINIEnum; + if (strcmp(name,"P1P1")==0) return P1P1Enum; + else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; + else if (strcmp(name,"MINI")==0) return MINIEnum; else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;