Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 26444) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 26445) @@ -101,4 +101,5 @@ syn keyword cConstant BasalforcingsUpperwaterMeltingRateEnum syn keyword cConstant CalvingCrevasseDepthEnum +syn keyword cConstant CalvingCrevasseThresholdEnum syn keyword cConstant CalvingHeightAboveFloatationEnum syn keyword cConstant CalvingLawEnum @@ -366,4 +367,7 @@ syn keyword cConstant SolidearthSettingsViscousEnum syn keyword cConstant SealevelchangeGeometryDoneEnum +syn keyword cConstant SealevelchangeViscousNumStepsEnum +syn keyword cConstant SealevelchangeViscousTimesEnum +syn keyword cConstant SealevelchangeViscousIndexEnum syn keyword cConstant RotationalEquatorialMoiEnum syn keyword cConstant TidalLoveHEnum @@ -376,7 +380,7 @@ syn keyword cConstant LoveTimeFreqEnum syn keyword cConstant LoveIsTimeEnum -syn keyword cConstant SealevelchangeGRigidEnum +syn keyword cConstant SealevelchangeGSelfAttractionEnum syn keyword cConstant SealevelchangeGViscoElasticEnum -syn keyword cConstant SolidearthSettingsComputesealevelchangeEnum +syn keyword cConstant SolidearthSettingsSealevelLoadingEnum syn keyword cConstant SolidearthSettingsGRDEnum syn keyword cConstant SolidearthSettingsRunFrequencyEnum @@ -385,10 +389,12 @@ syn keyword cConstant SolidearthSettingsHorizEnum syn keyword cConstant SolidearthSettingsMaxiterEnum +syn keyword cConstant SolidearthSettingsGrdOceanEnum syn keyword cConstant SolidearthSettingsOceanAreaScalingEnum syn keyword cConstant RotationalPolarMoiEnum syn keyword cConstant SolidearthSettingsReltolEnum syn keyword cConstant SealevelchangeRequestedOutputsEnum -syn keyword cConstant SolidearthSettingsRigidEnum +syn keyword cConstant SolidearthSettingsSelfAttractionEnum syn keyword cConstant SolidearthSettingsRotationEnum +syn keyword cConstant SolidearthSettingsMaxSHCoeffEnum syn keyword cConstant SealevelchangeRunCountEnum syn keyword cConstant SealevelchangeTransitionsEnum @@ -402,7 +408,4 @@ syn keyword cConstant SettingsSolverResidueThresholdEnum syn keyword cConstant SettingsWaitonlockEnum -syn keyword cConstant StackNumStepsEnum -syn keyword cConstant StackTimesEnum -syn keyword cConstant StackIndexEnum syn keyword cConstant SmbAIceEnum syn keyword cConstant SmbAIdxEnum @@ -835,4 +838,8 @@ syn keyword cConstant SealevelchangeGEsubelHydroEnum syn keyword cConstant SealevelchangeGNsubelHydroEnum +syn keyword cConstant SealevelchangeViscousRSLEnum +syn keyword cConstant SealevelchangeViscousUEnum +syn keyword cConstant SealevelchangeViscousNEnum +syn keyword cConstant SealevelchangeViscousEEnum syn keyword cConstant SedimentHeadEnum syn keyword cConstant SedimentHeadOldEnum @@ -955,9 +962,4 @@ syn keyword cConstant SolidearthExternalDisplacementUpRateEnum syn keyword cConstant SolidearthExternalGeoidRateEnum -syn keyword cConstant SolidearthExternalBarystaticSeaLevelRateEnum -syn keyword cConstant StackRSLEnum -syn keyword cConstant StackUEnum -syn keyword cConstant StackNEnum -syn keyword cConstant StackEEnum syn keyword cConstant StrainRateeffectiveEnum syn keyword cConstant StrainRateparallelEnum @@ -1431,4 +1433,5 @@ syn keyword cConstant SealevelInertiaTensorYZEnum syn keyword cConstant SealevelInertiaTensorZZEnum +syn keyword cConstant SealevelchangePolarMotionEnum syn keyword cConstant SealevelNmotionEnum syn keyword cConstant SealevelUmotionEnum @@ -1530,4 +1533,5 @@ syn keyword cType Cfsurfacesquare syn keyword cType Channel +syn keyword cType classes syn keyword cType Constraint syn keyword cType Constraints @@ -1536,6 +1540,6 @@ syn keyword cType ControlInput syn keyword cType Covertree +syn keyword cType DatasetInput syn keyword cType DataSetParam -syn keyword cType DatasetInput syn keyword cType Definition syn keyword cType DependentObject @@ -1550,6 +1554,6 @@ syn keyword cType ElementInput syn keyword cType ElementMatrix +syn keyword cType Elements syn keyword cType ElementVector -syn keyword cType Elements syn keyword cType ExponentialVariogram syn keyword cType ExternalResult @@ -1558,9 +1562,10 @@ syn keyword cType Friction syn keyword cType Gauss +syn keyword cType GaussianVariogram +syn keyword cType gaussobjects syn keyword cType GaussPenta syn keyword cType GaussSeg syn keyword cType GaussTetra syn keyword cType GaussTria -syn keyword cType GaussianVariogram syn keyword cType GenericExternalResult syn keyword cType GenericOption @@ -1578,4 +1583,5 @@ syn keyword cType IssmDirectApplicInterface syn keyword cType IssmParallelDirectApplicInterface +syn keyword cType krigingobjects syn keyword cType Load syn keyword cType Loads @@ -1588,4 +1594,5 @@ syn keyword cType Matice syn keyword cType Matlitho +syn keyword cType matrixobjects syn keyword cType MatrixParam syn keyword cType Misfit @@ -1600,6 +1607,6 @@ syn keyword cType Observations syn keyword cType Option +syn keyword cType Options syn keyword cType OptionUtilities -syn keyword cType Options syn keyword cType Param syn keyword cType Parameters @@ -1615,11 +1622,11 @@ syn keyword cType Regionaloutput syn keyword cType Results +syn keyword cType Riftfront syn keyword cType RiftStruct -syn keyword cType Riftfront syn keyword cType SealevelGeometry syn keyword cType Seg syn keyword cType SegInput +syn keyword cType Segment syn keyword cType SegRef -syn keyword cType Segment syn keyword cType SpcDynamic syn keyword cType SpcStatic @@ -1640,8 +1647,4 @@ syn keyword cType Vertex syn keyword cType Vertices -syn keyword cType classes -syn keyword cType gaussobjects -syn keyword cType krigingobjects -syn keyword cType matrixobjects syn keyword cType AdjointBalancethickness2Analysis syn keyword cType AdjointBalancethicknessAnalysis Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 26444) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 26445) @@ -95,4 +95,5 @@ BasalforcingsUpperwaterMeltingRateEnum, CalvingCrevasseDepthEnum, + CalvingCrevasseThresholdEnum, CalvingHeightAboveFloatationEnum, CalvingLawEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 26444) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 26445) @@ -103,4 +103,5 @@ case BasalforcingsUpperwaterMeltingRateEnum : return "BasalforcingsUpperwaterMeltingRate"; case CalvingCrevasseDepthEnum : return "CalvingCrevasseDepth"; + case CalvingCrevasseThresholdEnum : return "CalvingCrevasseThreshold"; case CalvingHeightAboveFloatationEnum : return "CalvingHeightAboveFloatation"; case CalvingLawEnum : return "CalvingLaw"; @@ -368,4 +369,7 @@ case SolidearthSettingsViscousEnum : return "SolidearthSettingsViscous"; case SealevelchangeGeometryDoneEnum : return "SealevelchangeGeometryDone"; + case SealevelchangeViscousNumStepsEnum : return "SealevelchangeViscousNumSteps"; + case SealevelchangeViscousTimesEnum : return "SealevelchangeViscousTimes"; + case SealevelchangeViscousIndexEnum : return "SealevelchangeViscousIndex"; case RotationalEquatorialMoiEnum : return "RotationalEquatorialMoi"; case TidalLoveHEnum : return "TidalLoveH"; @@ -387,4 +391,5 @@ case SolidearthSettingsHorizEnum : return "SolidearthSettingsHoriz"; case SolidearthSettingsMaxiterEnum : return "SolidearthSettingsMaxiter"; + case SolidearthSettingsGrdOceanEnum : return "SolidearthSettingsGrdOcean"; case SolidearthSettingsOceanAreaScalingEnum : return "SolidearthSettingsOceanAreaScaling"; case RotationalPolarMoiEnum : return "RotationalPolarMoi"; @@ -393,4 +398,5 @@ case SolidearthSettingsSelfAttractionEnum : return "SolidearthSettingsSelfAttraction"; case SolidearthSettingsRotationEnum : return "SolidearthSettingsRotation"; + case SolidearthSettingsMaxSHCoeffEnum : return "SolidearthSettingsMaxSHCoeff"; case SealevelchangeRunCountEnum : return "SealevelchangeRunCount"; case SealevelchangeTransitionsEnum : return "SealevelchangeTransitions"; @@ -404,7 +410,4 @@ case SettingsSolverResidueThresholdEnum : return "SettingsSolverResidueThreshold"; case SettingsWaitonlockEnum : return "SettingsWaitonlock"; - case SealevelchangeViscousNumStepsEnum : return "SealevelchangeViscousNumSteps"; - case SealevelchangeViscousTimesEnum : return "SealevelchangeViscousTimes"; - case SealevelchangeViscousIndexEnum : return "SealevelchangeViscousIndex"; case SmbAIceEnum : return "SmbAIce"; case SmbAIdxEnum : return "SmbAIdx"; @@ -837,4 +840,8 @@ case SealevelchangeGEsubelHydroEnum : return "SealevelchangeGEsubelHydro"; case SealevelchangeGNsubelHydroEnum : return "SealevelchangeGNsubelHydro"; + case SealevelchangeViscousRSLEnum : return "SealevelchangeViscousRSL"; + case SealevelchangeViscousUEnum : return "SealevelchangeViscousU"; + case SealevelchangeViscousNEnum : return "SealevelchangeViscousN"; + case SealevelchangeViscousEEnum : return "SealevelchangeViscousE"; case SedimentHeadEnum : return "SedimentHead"; case SedimentHeadOldEnum : return "SedimentHeadOld"; @@ -957,8 +964,4 @@ case SolidearthExternalDisplacementUpRateEnum : return "SolidearthExternalDisplacementUpRate"; case SolidearthExternalGeoidRateEnum : return "SolidearthExternalGeoidRate"; - case SealevelchangeViscousRSLEnum : return "SealevelchangeViscousRSL"; - case SealevelchangeViscousUEnum : return "SealevelchangeViscousU"; - case SealevelchangeViscousNEnum : return "SealevelchangeViscousN"; - case SealevelchangeViscousEEnum : return "SealevelchangeViscousE"; case StrainRateeffectiveEnum : return "StrainRateeffective"; case StrainRateparallelEnum : return "StrainRateparallel"; @@ -1432,4 +1435,5 @@ case SealevelInertiaTensorYZEnum : return "SealevelInertiaTensorYZ"; case SealevelInertiaTensorZZEnum : return "SealevelInertiaTensorZZ"; + case SealevelchangePolarMotionEnum : return "SealevelchangePolarMotion"; case SealevelNmotionEnum : return "SealevelNmotion"; case SealevelUmotionEnum : return "SealevelUmotion"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 26444) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 26445) @@ -103,4 +103,5 @@ else if (strcmp(name,"BasalforcingsUpperwaterMeltingRate")==0) return BasalforcingsUpperwaterMeltingRateEnum; else if (strcmp(name,"CalvingCrevasseDepth")==0) return CalvingCrevasseDepthEnum; + else if (strcmp(name,"CalvingCrevasseThreshold")==0) return CalvingCrevasseThresholdEnum; else if (strcmp(name,"CalvingHeightAboveFloatation")==0) return CalvingHeightAboveFloatationEnum; else if (strcmp(name,"CalvingLaw")==0) return CalvingLawEnum; @@ -136,9 +137,9 @@ else if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum; else if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum; - else if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum; else stage=2; } if(stage==2){ - if (strcmp(name,"DamageStressUBound")==0) return DamageStressUBoundEnum; + if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum; + else if (strcmp(name,"DamageStressUBound")==0) return DamageStressUBoundEnum; else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum; else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum; @@ -259,9 +260,9 @@ else if (strcmp(name,"LevelsetReinitFrequency")==0) return LevelsetReinitFrequencyEnum; else if (strcmp(name,"LevelsetStabilization")==0) return LevelsetStabilizationEnum; - else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"LoveAllowLayerDeletion")==0) return LoveAllowLayerDeletionEnum; + if (strcmp(name,"LockFileName")==0) return LockFileNameEnum; + else if (strcmp(name,"LoveAllowLayerDeletion")==0) return LoveAllowLayerDeletionEnum; else if (strcmp(name,"LoveCoreMantleBoundary")==0) return LoveCoreMantleBoundaryEnum; else if (strcmp(name,"LoveEarthMass")==0) return LoveEarthMassEnum; @@ -374,4 +375,7 @@ else if (strcmp(name,"SolidearthSettingsViscous")==0) return SolidearthSettingsViscousEnum; else if (strcmp(name,"SealevelchangeGeometryDone")==0) return SealevelchangeGeometryDoneEnum; + else if (strcmp(name,"SealevelchangeViscousNumSteps")==0) return SealevelchangeViscousNumStepsEnum; + else if (strcmp(name,"SealevelchangeViscousTimes")==0) return SealevelchangeViscousTimesEnum; + else if (strcmp(name,"SealevelchangeViscousIndex")==0) return SealevelchangeViscousIndexEnum; else if (strcmp(name,"RotationalEquatorialMoi")==0) return RotationalEquatorialMoiEnum; else if (strcmp(name,"TidalLoveH")==0) return TidalLoveHEnum; @@ -379,12 +383,12 @@ else if (strcmp(name,"TidalLoveL")==0) return TidalLoveLEnum; else if (strcmp(name,"TidalLoveK2Secular")==0) return TidalLoveK2SecularEnum; - else if (strcmp(name,"LoadLoveH")==0) return LoadLoveHEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"LoadLoveH")==0) return LoadLoveHEnum; else if (strcmp(name,"LoadLoveK")==0) return LoadLoveKEnum; else if (strcmp(name,"LoadLoveL")==0) return LoadLoveLEnum; else if (strcmp(name,"LoveTimeFreq")==0) return LoveTimeFreqEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"LoveIsTime")==0) return LoveIsTimeEnum; + else if (strcmp(name,"LoveIsTime")==0) return LoveIsTimeEnum; else if (strcmp(name,"SealevelchangeGSelfAttraction")==0) return SealevelchangeGSelfAttractionEnum; else if (strcmp(name,"SealevelchangeGViscoElastic")==0) return SealevelchangeGViscoElasticEnum; @@ -396,4 +400,5 @@ else if (strcmp(name,"SolidearthSettingsHoriz")==0) return SolidearthSettingsHorizEnum; else if (strcmp(name,"SolidearthSettingsMaxiter")==0) return SolidearthSettingsMaxiterEnum; + else if (strcmp(name,"SolidearthSettingsGrdOcean")==0) return SolidearthSettingsGrdOceanEnum; else if (strcmp(name,"SolidearthSettingsOceanAreaScaling")==0) return SolidearthSettingsOceanAreaScalingEnum; else if (strcmp(name,"RotationalPolarMoi")==0) return RotationalPolarMoiEnum; @@ -402,4 +407,5 @@ else if (strcmp(name,"SolidearthSettingsSelfAttraction")==0) return SolidearthSettingsSelfAttractionEnum; else if (strcmp(name,"SolidearthSettingsRotation")==0) return SolidearthSettingsRotationEnum; + else if (strcmp(name,"SolidearthSettingsMaxSHCoeff")==0) return SolidearthSettingsMaxSHCoeffEnum; else if (strcmp(name,"SealevelchangeRunCount")==0) return SealevelchangeRunCountEnum; else if (strcmp(name,"SealevelchangeTransitions")==0) return SealevelchangeTransitionsEnum; @@ -413,7 +419,4 @@ else if (strcmp(name,"SettingsSolverResidueThreshold")==0) return SettingsSolverResidueThresholdEnum; else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; - else if (strcmp(name,"SealevelchangeViscousNumSteps")==0) return SealevelchangeViscousNumStepsEnum; - else if (strcmp(name,"SealevelchangeViscousTimes")==0) return SealevelchangeViscousTimesEnum; - else if (strcmp(name,"SealevelchangeViscousIndex")==0) return SealevelchangeViscousIndexEnum; else if (strcmp(name,"SmbAIce")==0) return SmbAIceEnum; else if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum; @@ -503,11 +506,11 @@ else if (strcmp(name,"Time")==0) return TimeEnum; else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; - else if (strcmp(name,"TimesteppingCouplingTime")==0) return TimesteppingCouplingTimeEnum; - else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; - else if (strcmp(name,"TimesteppingInterpForcing")==0) return TimesteppingInterpForcingEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"TimesteppingCycleForcing")==0) return TimesteppingCycleForcingEnum; + if (strcmp(name,"TimesteppingCouplingTime")==0) return TimesteppingCouplingTimeEnum; + else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; + else if (strcmp(name,"TimesteppingInterpForcing")==0) return TimesteppingInterpForcingEnum; + else if (strcmp(name,"TimesteppingCycleForcing")==0) return TimesteppingCycleForcingEnum; else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum; @@ -626,11 +629,11 @@ else if (strcmp(name,"Str")==0) return StrEnum; else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum; - else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum; - else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum; - else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum; + if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum; + else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum; + else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum; + else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum; else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; @@ -749,11 +752,11 @@ else if (strcmp(name,"MaterialsRheologyEc")==0) return MaterialsRheologyEcEnum; else 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,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"MeshScaleFactor")==0) return MeshScaleFactorEnum; + if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum; + else if (strcmp(name,"MaterialsRheologyEsbar")==0) return MaterialsRheologyEsbarEnum; + else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; + else if (strcmp(name,"MeshScaleFactor")==0) return MeshScaleFactorEnum; else if (strcmp(name,"MeshVertexonbase")==0) return MeshVertexonbaseEnum; else if (strcmp(name,"MeshVertexonboundary")==0) return MeshVertexonboundaryEnum; @@ -855,4 +858,8 @@ else if (strcmp(name,"SealevelchangeGEsubelHydro")==0) return SealevelchangeGEsubelHydroEnum; else if (strcmp(name,"SealevelchangeGNsubelHydro")==0) return SealevelchangeGNsubelHydroEnum; + else if (strcmp(name,"SealevelchangeViscousRSL")==0) return SealevelchangeViscousRSLEnum; + else if (strcmp(name,"SealevelchangeViscousU")==0) return SealevelchangeViscousUEnum; + else if (strcmp(name,"SealevelchangeViscousN")==0) return SealevelchangeViscousNEnum; + else if (strcmp(name,"SealevelchangeViscousE")==0) return SealevelchangeViscousEEnum; else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum; else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum; @@ -868,5 +875,8 @@ else if (strcmp(name,"SmbAccumulatedPrecipitation")==0) return SmbAccumulatedPrecipitationEnum; else if (strcmp(name,"SmbAccumulatedRain")==0) return SmbAccumulatedRainEnum; - else if (strcmp(name,"SmbAccumulatedRefreeze")==0) return SmbAccumulatedRefreezeEnum; + else stage=8; + } + if(stage==8){ + if (strcmp(name,"SmbAccumulatedRefreeze")==0) return SmbAccumulatedRefreezeEnum; else if (strcmp(name,"SmbAccumulatedRunoff")==0) return SmbAccumulatedRunoffEnum; else if (strcmp(name,"SmbA")==0) return SmbAEnum; @@ -875,8 +885,5 @@ else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum; else if (strcmp(name,"SmbAdiffini")==0) return SmbAdiffiniEnum; - else stage=8; - } - if(stage==8){ - if (strcmp(name,"SmbAini")==0) return SmbAiniEnum; + else if (strcmp(name,"SmbAini")==0) return SmbAiniEnum; else if (strcmp(name,"SmbBMax")==0) return SmbBMaxEnum; else if (strcmp(name,"SmbBMin")==0) return SmbBMinEnum; @@ -978,8 +985,4 @@ else if (strcmp(name,"SolidearthExternalDisplacementUpRate")==0) return SolidearthExternalDisplacementUpRateEnum; else if (strcmp(name,"SolidearthExternalGeoidRate")==0) return SolidearthExternalGeoidRateEnum; - else if (strcmp(name,"SealevelchangeViscousRSL")==0) return SealevelchangeViscousRSLEnum; - else if (strcmp(name,"SealevelchangeViscousU")==0) return SealevelchangeViscousUEnum; - else if (strcmp(name,"SealevelchangeViscousN")==0) return SealevelchangeViscousNEnum; - else if (strcmp(name,"SealevelchangeViscousE")==0) return SealevelchangeViscousEEnum; else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum; else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum; @@ -995,10 +998,10 @@ else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum; - else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; - else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; + if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; + else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; + else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; else if (strcmp(name,"SurfaceAbsMisfit")==0) return SurfaceAbsMisfitEnum; else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum; @@ -1118,10 +1121,10 @@ else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum; else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum; - else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum; - else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum; else stage=10; } if(stage==10){ - if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum; + if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum; + else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum; + else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum; else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum; else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum; @@ -1241,10 +1244,10 @@ else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; 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 stage=11; } if(stage==11){ - if (strcmp(name,"Element")==0) return ElementEnum; + if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum; + else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; + else if (strcmp(name,"Element")==0) return ElementEnum; else if (strcmp(name,"ElementHook")==0) return ElementHookEnum; else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum; @@ -1364,10 +1367,10 @@ else if (strcmp(name,"Matestar")==0) return MatestarEnum; else if (strcmp(name,"Matice")==0) return MaticeEnum; - else if (strcmp(name,"Matlitho")==0) return MatlithoEnum; - else if (strcmp(name,"Mathydro")==0) return MathydroEnum; else stage=12; } if(stage==12){ - if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum; + if (strcmp(name,"Matlitho")==0) return MatlithoEnum; + else if (strcmp(name,"Mathydro")==0) return MathydroEnum; + else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum; else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum; else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum; @@ -1465,4 +1468,5 @@ else if (strcmp(name,"SealevelInertiaTensorYZ")==0) return SealevelInertiaTensorYZEnum; else if (strcmp(name,"SealevelInertiaTensorZZ")==0) return SealevelInertiaTensorZZEnum; + else if (strcmp(name,"SealevelchangePolarMotion")==0) return SealevelchangePolarMotionEnum; else if (strcmp(name,"SealevelNmotion")==0) return SealevelNmotionEnum; else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum; @@ -1486,11 +1490,11 @@ else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum; else if (strcmp(name,"StressIntensityFactor")==0) return StressIntensityFactorEnum; - else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum; - else if (strcmp(name,"StressbalanceConvergenceNumSteps")==0) return StressbalanceConvergenceNumStepsEnum; - else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum; else stage=13; } if(stage==13){ - if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum; + if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum; + else if (strcmp(name,"StressbalanceConvergenceNumSteps")==0) return StressbalanceConvergenceNumStepsEnum; + else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum; + else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum; else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum; else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;