Changeset 26445


Ignore:
Timestamp:
09/20/21 17:55:05 (3 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added one enum

Location:
issm/trunk-jpl/src/c/shared/Enum
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/shared/Enum/Enum.vim

    r26272 r26445  
    101101syn keyword cConstant BasalforcingsUpperwaterMeltingRateEnum
    102102syn keyword cConstant CalvingCrevasseDepthEnum
     103syn keyword cConstant CalvingCrevasseThresholdEnum
    103104syn keyword cConstant CalvingHeightAboveFloatationEnum
    104105syn keyword cConstant CalvingLawEnum
    … …  
    366367syn keyword cConstant SolidearthSettingsViscousEnum
    367368syn keyword cConstant SealevelchangeGeometryDoneEnum
     369syn keyword cConstant SealevelchangeViscousNumStepsEnum
     370syn keyword cConstant SealevelchangeViscousTimesEnum
     371syn keyword cConstant SealevelchangeViscousIndexEnum
    368372syn keyword cConstant RotationalEquatorialMoiEnum
    369373syn keyword cConstant TidalLoveHEnum
    … …  
    376380syn keyword cConstant LoveTimeFreqEnum
    377381syn keyword cConstant LoveIsTimeEnum
    378 syn keyword cConstant SealevelchangeGRigidEnum
     382syn keyword cConstant SealevelchangeGSelfAttractionEnum
    379383syn keyword cConstant SealevelchangeGViscoElasticEnum
    380 syn keyword cConstant SolidearthSettingsComputesealevelchangeEnum
     384syn keyword cConstant SolidearthSettingsSealevelLoadingEnum
    381385syn keyword cConstant SolidearthSettingsGRDEnum
    382386syn keyword cConstant SolidearthSettingsRunFrequencyEnum
    … …  
    385389syn keyword cConstant SolidearthSettingsHorizEnum
    386390syn keyword cConstant SolidearthSettingsMaxiterEnum
     391syn keyword cConstant SolidearthSettingsGrdOceanEnum
    387392syn keyword cConstant SolidearthSettingsOceanAreaScalingEnum
    388393syn keyword cConstant RotationalPolarMoiEnum
    389394syn keyword cConstant SolidearthSettingsReltolEnum
    390395syn keyword cConstant SealevelchangeRequestedOutputsEnum
    391 syn keyword cConstant SolidearthSettingsRigidEnum
     396syn keyword cConstant SolidearthSettingsSelfAttractionEnum
    392397syn keyword cConstant SolidearthSettingsRotationEnum
     398syn keyword cConstant SolidearthSettingsMaxSHCoeffEnum
    393399syn keyword cConstant SealevelchangeRunCountEnum
    394400syn keyword cConstant SealevelchangeTransitionsEnum
    … …  
    402408syn keyword cConstant SettingsSolverResidueThresholdEnum
    403409syn keyword cConstant SettingsWaitonlockEnum
    404 syn keyword cConstant StackNumStepsEnum
    405 syn keyword cConstant StackTimesEnum
    406 syn keyword cConstant StackIndexEnum
    407410syn keyword cConstant SmbAIceEnum
    408411syn keyword cConstant SmbAIdxEnum
    … …  
    835838syn keyword cConstant SealevelchangeGEsubelHydroEnum
    836839syn keyword cConstant SealevelchangeGNsubelHydroEnum
     840syn keyword cConstant SealevelchangeViscousRSLEnum
     841syn keyword cConstant SealevelchangeViscousUEnum
     842syn keyword cConstant SealevelchangeViscousNEnum
     843syn keyword cConstant SealevelchangeViscousEEnum
    837844syn keyword cConstant SedimentHeadEnum
    838845syn keyword cConstant SedimentHeadOldEnum
    … …  
    955962syn keyword cConstant SolidearthExternalDisplacementUpRateEnum
    956963syn keyword cConstant SolidearthExternalGeoidRateEnum
    957 syn keyword cConstant SolidearthExternalBarystaticSeaLevelRateEnum
    958 syn keyword cConstant StackRSLEnum
    959 syn keyword cConstant StackUEnum
    960 syn keyword cConstant StackNEnum
    961 syn keyword cConstant StackEEnum
    962964syn keyword cConstant StrainRateeffectiveEnum
    963965syn keyword cConstant StrainRateparallelEnum
    … …  
    14311433syn keyword cConstant SealevelInertiaTensorYZEnum
    14321434syn keyword cConstant SealevelInertiaTensorZZEnum
     1435syn keyword cConstant SealevelchangePolarMotionEnum
    14331436syn keyword cConstant SealevelNmotionEnum
    14341437syn keyword cConstant SealevelUmotionEnum
    … …  
    15301533syn keyword cType Cfsurfacesquare
    15311534syn keyword cType Channel
     1535syn keyword cType classes
    15321536syn keyword cType Constraint
    15331537syn keyword cType Constraints
    … …  
    15361540syn keyword cType ControlInput
    15371541syn keyword cType Covertree
     1542syn keyword cType DatasetInput
    15381543syn keyword cType DataSetParam
    1539 syn keyword cType DatasetInput
    15401544syn keyword cType Definition
    15411545syn keyword cType DependentObject
    … …  
    15501554syn keyword cType ElementInput
    15511555syn keyword cType ElementMatrix
     1556syn keyword cType Elements
    15521557syn keyword cType ElementVector
    1553 syn keyword cType Elements
    15541558syn keyword cType ExponentialVariogram
    15551559syn keyword cType ExternalResult
    … …  
    15581562syn keyword cType Friction
    15591563syn keyword cType Gauss
     1564syn keyword cType GaussianVariogram
     1565syn keyword cType gaussobjects
    15601566syn keyword cType GaussPenta
    15611567syn keyword cType GaussSeg
    15621568syn keyword cType GaussTetra
    15631569syn keyword cType GaussTria
    1564 syn keyword cType GaussianVariogram
    15651570syn keyword cType GenericExternalResult
    15661571syn keyword cType GenericOption
    … …  
    15781583syn keyword cType IssmDirectApplicInterface
    15791584syn keyword cType IssmParallelDirectApplicInterface
     1585syn keyword cType krigingobjects
    15801586syn keyword cType Load
    15811587syn keyword cType Loads
    … …  
    15881594syn keyword cType Matice
    15891595syn keyword cType Matlitho
     1596syn keyword cType matrixobjects
    15901597syn keyword cType MatrixParam
    15911598syn keyword cType Misfit
    … …  
    16001607syn keyword cType Observations
    16011608syn keyword cType Option
     1609syn keyword cType Options
    16021610syn keyword cType OptionUtilities
    1603 syn keyword cType Options
    16041611syn keyword cType Param
    16051612syn keyword cType Parameters
    … …  
    16151622syn keyword cType Regionaloutput
    16161623syn keyword cType Results
     1624syn keyword cType Riftfront
    16171625syn keyword cType RiftStruct
    1618 syn keyword cType Riftfront
    16191626syn keyword cType SealevelGeometry
    16201627syn keyword cType Seg
    16211628syn keyword cType SegInput
     1629syn keyword cType Segment
    16221630syn keyword cType SegRef
    1623 syn keyword cType Segment
    16241631syn keyword cType SpcDynamic
    16251632syn keyword cType SpcStatic
    … …  
    16401647syn keyword cType Vertex
    16411648syn keyword cType Vertices
    1642 syn keyword cType classes
    1643 syn keyword cType gaussobjects
    1644 syn keyword cType krigingobjects
    1645 syn keyword cType matrixobjects
    16461649syn keyword cType AdjointBalancethickness2Analysis
    16471650syn keyword cType AdjointBalancethicknessAnalysis

  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r26296 r26445  
    9595        BasalforcingsUpperwaterMeltingRateEnum,
    9696        CalvingCrevasseDepthEnum,
     97        CalvingCrevasseThresholdEnum,
    9798        CalvingHeightAboveFloatationEnum,
    9899        CalvingLawEnum,

  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r26296 r26445  
    103103                case BasalforcingsUpperwaterMeltingRateEnum : return "BasalforcingsUpperwaterMeltingRate";
    104104                case CalvingCrevasseDepthEnum : return "CalvingCrevasseDepth";
     105                case CalvingCrevasseThresholdEnum : return "CalvingCrevasseThreshold";
    105106                case CalvingHeightAboveFloatationEnum : return "CalvingHeightAboveFloatation";
    106107                case CalvingLawEnum : return "CalvingLaw";
    … …  
    368369                case SolidearthSettingsViscousEnum : return "SolidearthSettingsViscous";
    369370                case SealevelchangeGeometryDoneEnum : return "SealevelchangeGeometryDone";
     371                case SealevelchangeViscousNumStepsEnum : return "SealevelchangeViscousNumSteps";
     372                case SealevelchangeViscousTimesEnum : return "SealevelchangeViscousTimes";
     373                case SealevelchangeViscousIndexEnum : return "SealevelchangeViscousIndex";
    370374                case RotationalEquatorialMoiEnum : return "RotationalEquatorialMoi";
    371375                case TidalLoveHEnum : return "TidalLoveH";
    … …  
    387391                case SolidearthSettingsHorizEnum : return "SolidearthSettingsHoriz";
    388392                case SolidearthSettingsMaxiterEnum : return "SolidearthSettingsMaxiter";
     393                case SolidearthSettingsGrdOceanEnum : return "SolidearthSettingsGrdOcean";
    389394                case SolidearthSettingsOceanAreaScalingEnum : return "SolidearthSettingsOceanAreaScaling";
    390395                case RotationalPolarMoiEnum : return "RotationalPolarMoi";
    … …  
    393398                case SolidearthSettingsSelfAttractionEnum : return "SolidearthSettingsSelfAttraction";
    394399                case SolidearthSettingsRotationEnum : return "SolidearthSettingsRotation";
     400                case SolidearthSettingsMaxSHCoeffEnum : return "SolidearthSettingsMaxSHCoeff";
    395401                case SealevelchangeRunCountEnum : return "SealevelchangeRunCount";
    396402                case SealevelchangeTransitionsEnum : return "SealevelchangeTransitions";
    … …  
    404410                case SettingsSolverResidueThresholdEnum : return "SettingsSolverResidueThreshold";
    405411                case SettingsWaitonlockEnum : return "SettingsWaitonlock";
    406                 case SealevelchangeViscousNumStepsEnum : return "SealevelchangeViscousNumSteps";
    407                 case SealevelchangeViscousTimesEnum : return "SealevelchangeViscousTimes";
    408                 case SealevelchangeViscousIndexEnum : return "SealevelchangeViscousIndex";
    409412                case SmbAIceEnum : return "SmbAIce";
    410413                case SmbAIdxEnum : return "SmbAIdx";
    … …  
    837840                case SealevelchangeGEsubelHydroEnum : return "SealevelchangeGEsubelHydro";
    838841                case SealevelchangeGNsubelHydroEnum : return "SealevelchangeGNsubelHydro";
     842                case SealevelchangeViscousRSLEnum : return "SealevelchangeViscousRSL";
     843                case SealevelchangeViscousUEnum : return "SealevelchangeViscousU";
     844                case SealevelchangeViscousNEnum : return "SealevelchangeViscousN";
     845                case SealevelchangeViscousEEnum : return "SealevelchangeViscousE";
    839846                case SedimentHeadEnum : return "SedimentHead";
    840847                case SedimentHeadOldEnum : return "SedimentHeadOld";
    … …  
    957964                case SolidearthExternalDisplacementUpRateEnum : return "SolidearthExternalDisplacementUpRate";
    958965                case SolidearthExternalGeoidRateEnum : return "SolidearthExternalGeoidRate";
    959                 case SealevelchangeViscousRSLEnum : return "SealevelchangeViscousRSL";
    960                 case SealevelchangeViscousUEnum : return "SealevelchangeViscousU";
    961                 case SealevelchangeViscousNEnum : return "SealevelchangeViscousN";
    962                 case SealevelchangeViscousEEnum : return "SealevelchangeViscousE";
    963966                case StrainRateeffectiveEnum : return "StrainRateeffective";
    964967                case StrainRateparallelEnum : return "StrainRateparallel";
    … …  
    14321435                case SealevelInertiaTensorYZEnum : return "SealevelInertiaTensorYZ";
    14331436                case SealevelInertiaTensorZZEnum : return "SealevelInertiaTensorZZ";
     1437                case SealevelchangePolarMotionEnum : return "SealevelchangePolarMotion";
    14341438                case SealevelNmotionEnum : return "SealevelNmotion";
    14351439                case SealevelUmotionEnum : return "SealevelUmotion";

  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r26296 r26445  
    103103              else if (strcmp(name,"BasalforcingsUpperwaterMeltingRate")==0) return BasalforcingsUpperwaterMeltingRateEnum;
    104104              else if (strcmp(name,"CalvingCrevasseDepth")==0) return CalvingCrevasseDepthEnum;
     105              else if (strcmp(name,"CalvingCrevasseThreshold")==0) return CalvingCrevasseThresholdEnum;
    105106              else if (strcmp(name,"CalvingHeightAboveFloatation")==0) return CalvingHeightAboveFloatationEnum;
    106107              else if (strcmp(name,"CalvingLaw")==0) return CalvingLawEnum;
    … …  
    136137              else if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum;
    137138              else if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum;
    138               else if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"DamageStressUBound")==0) return DamageStressUBoundEnum;
     142              if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum;
     143              else if (strcmp(name,"DamageStressUBound")==0) return DamageStressUBoundEnum;
    143144              else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
    144145              else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
    … …  
    259260              else if (strcmp(name,"LevelsetReinitFrequency")==0) return LevelsetReinitFrequencyEnum;
    260261              else if (strcmp(name,"LevelsetStabilization")==0) return LevelsetStabilizationEnum;
    261               else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"LoveAllowLayerDeletion")==0) return LoveAllowLayerDeletionEnum;
     265              if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
     266              else if (strcmp(name,"LoveAllowLayerDeletion")==0) return LoveAllowLayerDeletionEnum;
    266267              else if (strcmp(name,"LoveCoreMantleBoundary")==0) return LoveCoreMantleBoundaryEnum;
    267268              else if (strcmp(name,"LoveEarthMass")==0) return LoveEarthMassEnum;
    … …  
    374375              else if (strcmp(name,"SolidearthSettingsViscous")==0) return SolidearthSettingsViscousEnum;
    375376              else if (strcmp(name,"SealevelchangeGeometryDone")==0) return SealevelchangeGeometryDoneEnum;
     377              else if (strcmp(name,"SealevelchangeViscousNumSteps")==0) return SealevelchangeViscousNumStepsEnum;
     378              else if (strcmp(name,"SealevelchangeViscousTimes")==0) return SealevelchangeViscousTimesEnum;
     379              else if (strcmp(name,"SealevelchangeViscousIndex")==0) return SealevelchangeViscousIndexEnum;
    376380              else if (strcmp(name,"RotationalEquatorialMoi")==0) return RotationalEquatorialMoiEnum;
    377381              else if (strcmp(name,"TidalLoveH")==0) return TidalLoveHEnum;
    … …  
    379383              else if (strcmp(name,"TidalLoveL")==0) return TidalLoveLEnum;
    380384              else if (strcmp(name,"TidalLoveK2Secular")==0) return TidalLoveK2SecularEnum;
    381               else if (strcmp(name,"LoadLoveH")==0) return LoadLoveHEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"LoadLoveH")==0) return LoadLoveHEnum;
    382389              else if (strcmp(name,"LoadLoveK")==0) return LoadLoveKEnum;
    383390              else if (strcmp(name,"LoadLoveL")==0) return LoadLoveLEnum;
    384391              else if (strcmp(name,"LoveTimeFreq")==0) return LoveTimeFreqEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"LoveIsTime")==0) return LoveIsTimeEnum;
     392              else if (strcmp(name,"LoveIsTime")==0) return LoveIsTimeEnum;
    389393              else if (strcmp(name,"SealevelchangeGSelfAttraction")==0) return SealevelchangeGSelfAttractionEnum;
    390394              else if (strcmp(name,"SealevelchangeGViscoElastic")==0) return SealevelchangeGViscoElasticEnum;
    … …  
    396400              else if (strcmp(name,"SolidearthSettingsHoriz")==0) return SolidearthSettingsHorizEnum;
    397401              else if (strcmp(name,"SolidearthSettingsMaxiter")==0) return SolidearthSettingsMaxiterEnum;
     402              else if (strcmp(name,"SolidearthSettingsGrdOcean")==0) return SolidearthSettingsGrdOceanEnum;
    398403              else if (strcmp(name,"SolidearthSettingsOceanAreaScaling")==0) return SolidearthSettingsOceanAreaScalingEnum;
    399404              else if (strcmp(name,"RotationalPolarMoi")==0) return RotationalPolarMoiEnum;
    … …  
    402407              else if (strcmp(name,"SolidearthSettingsSelfAttraction")==0) return SolidearthSettingsSelfAttractionEnum;
    403408              else if (strcmp(name,"SolidearthSettingsRotation")==0) return SolidearthSettingsRotationEnum;
     409              else if (strcmp(name,"SolidearthSettingsMaxSHCoeff")==0) return SolidearthSettingsMaxSHCoeffEnum;
    404410              else if (strcmp(name,"SealevelchangeRunCount")==0) return SealevelchangeRunCountEnum;
    405411              else if (strcmp(name,"SealevelchangeTransitions")==0) return SealevelchangeTransitionsEnum;
    … …  
    413419              else if (strcmp(name,"SettingsSolverResidueThreshold")==0) return SettingsSolverResidueThresholdEnum;
    414420              else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
    415               else if (strcmp(name,"SealevelchangeViscousNumSteps")==0) return SealevelchangeViscousNumStepsEnum;
    416               else if (strcmp(name,"SealevelchangeViscousTimes")==0) return SealevelchangeViscousTimesEnum;
    417               else if (strcmp(name,"SealevelchangeViscousIndex")==0) return SealevelchangeViscousIndexEnum;
    418421              else if (strcmp(name,"SmbAIce")==0) return SmbAIceEnum;
    419422              else if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum;
    … …  
    503506              else if (strcmp(name,"Time")==0) return TimeEnum;
    504507              else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
    505               else if (strcmp(name,"TimesteppingCouplingTime")==0) return TimesteppingCouplingTimeEnum;
    506               else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
    507               else if (strcmp(name,"TimesteppingInterpForcing")==0) return TimesteppingInterpForcingEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"TimesteppingCycleForcing")==0) return TimesteppingCycleForcingEnum;
     511              if (strcmp(name,"TimesteppingCouplingTime")==0) return TimesteppingCouplingTimeEnum;
     512              else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
     513              else if (strcmp(name,"TimesteppingInterpForcing")==0) return TimesteppingInterpForcingEnum;
     514              else if (strcmp(name,"TimesteppingCycleForcing")==0) return TimesteppingCycleForcingEnum;
    512515              else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
    513516              else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
    … …  
    626629              else if (strcmp(name,"Str")==0) return StrEnum;
    627630              else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum;
    628               else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum;
    629               else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum;
    630               else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
     634              if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum;
     635              else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum;
     636              else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum;
     637              else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
    635638              else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
    636639              else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
    … …  
    749752              else if (strcmp(name,"MaterialsRheologyEc")==0) return MaterialsRheologyEcEnum;
    750753              else if (strcmp(name,"MaterialsRheologyEcbar")==0) return MaterialsRheologyEcbarEnum;
    751               else if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum;
    752               else if (strcmp(name,"MaterialsRheologyEsbar")==0) return MaterialsRheologyEsbarEnum;
    753               else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"MeshScaleFactor")==0) return MeshScaleFactorEnum;
     757              if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum;
     758              else if (strcmp(name,"MaterialsRheologyEsbar")==0) return MaterialsRheologyEsbarEnum;
     759              else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
     760              else if (strcmp(name,"MeshScaleFactor")==0) return MeshScaleFactorEnum;
    758761              else if (strcmp(name,"MeshVertexonbase")==0) return MeshVertexonbaseEnum;
    759762              else if (strcmp(name,"MeshVertexonboundary")==0) return MeshVertexonboundaryEnum;
    … …  
    855858              else if (strcmp(name,"SealevelchangeGEsubelHydro")==0) return SealevelchangeGEsubelHydroEnum;
    856859              else if (strcmp(name,"SealevelchangeGNsubelHydro")==0) return SealevelchangeGNsubelHydroEnum;
     860              else if (strcmp(name,"SealevelchangeViscousRSL")==0) return SealevelchangeViscousRSLEnum;
     861              else if (strcmp(name,"SealevelchangeViscousU")==0) return SealevelchangeViscousUEnum;
     862              else if (strcmp(name,"SealevelchangeViscousN")==0) return SealevelchangeViscousNEnum;
     863              else if (strcmp(name,"SealevelchangeViscousE")==0) return SealevelchangeViscousEEnum;
    857864              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
    858865              else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
    … …  
    868875              else if (strcmp(name,"SmbAccumulatedPrecipitation")==0) return SmbAccumulatedPrecipitationEnum;
    869876              else if (strcmp(name,"SmbAccumulatedRain")==0) return SmbAccumulatedRainEnum;
    870               else if (strcmp(name,"SmbAccumulatedRefreeze")==0) return SmbAccumulatedRefreezeEnum;
     877         else stage=8;
     878   }
     879   if(stage==8){
     880              if (strcmp(name,"SmbAccumulatedRefreeze")==0) return SmbAccumulatedRefreezeEnum;
    871881              else if (strcmp(name,"SmbAccumulatedRunoff")==0) return SmbAccumulatedRunoffEnum;
    872882              else if (strcmp(name,"SmbA")==0) return SmbAEnum;
    … …  
    875885              else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
    876886              else if (strcmp(name,"SmbAdiffini")==0) return SmbAdiffiniEnum;
    877          else stage=8;
    878    }
    879    if(stage==8){
    880               if (strcmp(name,"SmbAini")==0) return SmbAiniEnum;
     887              else if (strcmp(name,"SmbAini")==0) return SmbAiniEnum;
    881888              else if (strcmp(name,"SmbBMax")==0) return SmbBMaxEnum;
    882889              else if (strcmp(name,"SmbBMin")==0) return SmbBMinEnum;
    … …  
    978985              else if (strcmp(name,"SolidearthExternalDisplacementUpRate")==0) return SolidearthExternalDisplacementUpRateEnum;
    979986              else if (strcmp(name,"SolidearthExternalGeoidRate")==0) return SolidearthExternalGeoidRateEnum;
    980               else if (strcmp(name,"SealevelchangeViscousRSL")==0) return SealevelchangeViscousRSLEnum;
    981               else if (strcmp(name,"SealevelchangeViscousU")==0) return SealevelchangeViscousUEnum;
    982               else if (strcmp(name,"SealevelchangeViscousN")==0) return SealevelchangeViscousNEnum;
    983               else if (strcmp(name,"SealevelchangeViscousE")==0) return SealevelchangeViscousEEnum;
    984987              else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
    985988              else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
    … …  
    995998              else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
    996999              else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
    997               else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
    998               else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
    9991000         else stage=9;
    10001001   }
    10011002   if(stage==9){
    1002               if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
     1003              if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
     1004              else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
     1005              else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
    10031006              else if (strcmp(name,"SurfaceAbsMisfit")==0) return SurfaceAbsMisfitEnum;
    10041007              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
    … …  
    11181121              else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum;
    11191122              else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
    1120               else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
    1121               else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
    11221123         else stage=10;
    11231124   }
    11241125   if(stage==10){
    1125               if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
     1126              if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
     1127              else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
     1128              else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
    11261129              else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
    11271130              else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
    … …  
    12411244              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
    12421245              else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
    1243               else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
    1244               else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
    12451246         else stage=11;
    12461247   }
    12471248   if(stage==11){
    1248               if (strcmp(name,"Element")==0) return ElementEnum;
     1249              if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
     1250              else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
     1251              else if (strcmp(name,"Element")==0) return ElementEnum;
    12491252              else if (strcmp(name,"ElementHook")==0) return ElementHookEnum;
    12501253              else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
    … …  
    13641367              else if (strcmp(name,"Matestar")==0) return MatestarEnum;
    13651368              else if (strcmp(name,"Matice")==0) return MaticeEnum;
    1366               else if (strcmp(name,"Matlitho")==0) return MatlithoEnum;
    1367               else if (strcmp(name,"Mathydro")==0) return MathydroEnum;
    13681369         else stage=12;
    13691370   }
    13701371   if(stage==12){
    1371               if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
     1372              if (strcmp(name,"Matlitho")==0) return MatlithoEnum;
     1373              else if (strcmp(name,"Mathydro")==0) return MathydroEnum;
     1374              else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
    13721375              else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum;
    13731376              else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum;
    … …  
    14651468              else if (strcmp(name,"SealevelInertiaTensorYZ")==0) return SealevelInertiaTensorYZEnum;
    14661469              else if (strcmp(name,"SealevelInertiaTensorZZ")==0) return SealevelInertiaTensorZZEnum;
     1470              else if (strcmp(name,"SealevelchangePolarMotion")==0) return SealevelchangePolarMotionEnum;
    14671471              else if (strcmp(name,"SealevelNmotion")==0) return SealevelNmotionEnum;
    14681472              else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum;
    … …  
    14861490              else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
    14871491              else if (strcmp(name,"StressIntensityFactor")==0) return StressIntensityFactorEnum;
    1488               else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
    1489               else if (strcmp(name,"StressbalanceConvergenceNumSteps")==0) return StressbalanceConvergenceNumStepsEnum;
    1490               else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
    14911492         else stage=13;
    14921493   }
    14931494   if(stage==13){
    1494               if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;
     1495              if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
     1496              else if (strcmp(name,"StressbalanceConvergenceNumSteps")==0) return StressbalanceConvergenceNumStepsEnum;
     1497              else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
     1498              else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;
    14951499              else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
    14961500              else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
Note: See TracChangeset for help on using the changeset viewer.