Changeset 26488


Ignore:
Timestamp:
10/19/21 12:06:32 (3 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added Enums for Aleah

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

Legend:

Unmodified
Added
Removed

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

    r26483 r26488  
    709709syn keyword cConstant HydrologyEnglacialInputEnum
    710710syn keyword cConstant HydrologyGapHeightEnum
     711syn keyword cConstant HydrologyGapHeightXEnum
     712syn keyword cConstant HydrologyGapHeightXXEnum
     713syn keyword cConstant HydrologyGapHeightYEnum
     714syn keyword cConstant HydrologyGapHeightYYEnum
    711715syn keyword cConstant HydrologyHeadEnum
    712716syn keyword cConstant HydrologyHeadOldEnum
    … …  
    15491553syn keyword cType Cfsurfacesquare
    15501554syn keyword cType Channel
    1551 syn keyword cType classes
    15521555syn keyword cType Constraint
    15531556syn keyword cType Constraints
    … …  
    15561559syn keyword cType ControlInput
    15571560syn keyword cType Covertree
     1561syn keyword cType DataSetParam
    15581562syn keyword cType DatasetInput
    1559 syn keyword cType DataSetParam
    15601563syn keyword cType Definition
    15611564syn keyword cType DependentObject
    … …  
    15701573syn keyword cType ElementInput
    15711574syn keyword cType ElementMatrix
     1575syn keyword cType ElementVector
    15721576syn keyword cType Elements
    1573 syn keyword cType ElementVector
    15741577syn keyword cType ExponentialVariogram
    15751578syn keyword cType ExternalResult
    … …  
    15781581syn keyword cType Friction
    15791582syn keyword cType Gauss
    1580 syn keyword cType GaussianVariogram
    1581 syn keyword cType gaussobjects
    15821583syn keyword cType GaussPenta
    15831584syn keyword cType GaussSeg
    15841585syn keyword cType GaussTetra
    15851586syn keyword cType GaussTria
     1587syn keyword cType GaussianVariogram
    15861588syn keyword cType GenericExternalResult
    15871589syn keyword cType GenericOption
    … …  
    15991601syn keyword cType IssmDirectApplicInterface
    16001602syn keyword cType IssmParallelDirectApplicInterface
    1601 syn keyword cType krigingobjects
    16021603syn keyword cType Load
    16031604syn keyword cType Loads
    … …  
    16101611syn keyword cType Matice
    16111612syn keyword cType Matlitho
    1612 syn keyword cType matrixobjects
    16131613syn keyword cType MatrixParam
    16141614syn keyword cType Misfit
    … …  
    16231623syn keyword cType Observations
    16241624syn keyword cType Option
     1625syn keyword cType OptionUtilities
    16251626syn keyword cType Options
    1626 syn keyword cType OptionUtilities
    16271627syn keyword cType Param
    16281628syn keyword cType Parameters
    … …  
    16381638syn keyword cType Regionaloutput
    16391639syn keyword cType Results
     1640syn keyword cType RiftStruct
    16401641syn keyword cType Riftfront
    1641 syn keyword cType RiftStruct
    16421642syn keyword cType SealevelGeometry
    16431643syn keyword cType Seg
    16441644syn keyword cType SegInput
     1645syn keyword cType SegRef
    16451646syn keyword cType Segment
    1646 syn keyword cType SegRef
    16471647syn keyword cType SpcDynamic
    16481648syn keyword cType SpcStatic
    … …  
    16631663syn keyword cType Vertex
    16641664syn keyword cType Vertices
     1665syn keyword cType classes
     1666syn keyword cType gaussobjects
     1667syn keyword cType krigingobjects
     1668syn keyword cType matrixobjects
    16651669syn keyword cType AdjointBalancethickness2Analysis
    16661670syn keyword cType AdjointBalancethicknessAnalysis

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

    r26483 r26488  
    705705   HydrologyEnglacialInputEnum,
    706706        HydrologyGapHeightEnum,
     707        HydrologyGapHeightXEnum,
     708        HydrologyGapHeightXXEnum,
     709        HydrologyGapHeightYEnum,
     710        HydrologyGapHeightYYEnum,
    707711        HydrologyHeadEnum,
    708712        HydrologyHeadOldEnum,

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

    r26483 r26488  
    711711                case HydrologyEnglacialInputEnum : return "HydrologyEnglacialInput";
    712712                case HydrologyGapHeightEnum : return "HydrologyGapHeight";
     713                case HydrologyGapHeightXEnum : return "HydrologyGapHeightX";
     714                case HydrologyGapHeightXXEnum : return "HydrologyGapHeightXX";
     715                case HydrologyGapHeightYEnum : return "HydrologyGapHeightY";
     716                case HydrologyGapHeightYYEnum : return "HydrologyGapHeightYY";
    713717                case HydrologyHeadEnum : return "HydrologyHead";
    714718                case HydrologyHeadOldEnum : return "HydrologyHeadOld";

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

    r26483 r26488  
    726726              else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum;
    727727              else if (strcmp(name,"HydrologyGapHeight")==0) return HydrologyGapHeightEnum;
     728              else if (strcmp(name,"HydrologyGapHeightX")==0) return HydrologyGapHeightXEnum;
     729              else if (strcmp(name,"HydrologyGapHeightXX")==0) return HydrologyGapHeightXXEnum;
     730              else if (strcmp(name,"HydrologyGapHeightY")==0) return HydrologyGapHeightYEnum;
     731              else if (strcmp(name,"HydrologyGapHeightYY")==0) return HydrologyGapHeightYYEnum;
    728732              else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum;
    729733              else if (strcmp(name,"HydrologyHeadOld")==0) return HydrologyHeadOldEnum;
    … …  
    748752              else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
    749753              else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
    750               else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
     754         else stage=7;
     755   }
     756   if(stage==7){
     757              if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
    751758              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    752759              else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    753760              else if (strcmp(name,"LevelsetObservation")==0) return LevelsetObservationEnum;
    754          else stage=7;
    755    }
    756    if(stage==7){
    757               if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
     761              else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
    758762              else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
    759763              else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum;
    … …  
    871875              else if (strcmp(name,"SealevelchangeGEsubelHydro")==0) return SealevelchangeGEsubelHydroEnum;
    872876              else if (strcmp(name,"SealevelchangeGNsubelHydro")==0) return SealevelchangeGNsubelHydroEnum;
    873               else if (strcmp(name,"SealevelchangeViscousRSL")==0) return SealevelchangeViscousRSLEnum;
     877         else stage=8;
     878   }
     879   if(stage==8){
     880              if (strcmp(name,"SealevelchangeViscousRSL")==0) return SealevelchangeViscousRSLEnum;
    874881              else if (strcmp(name,"SealevelchangeViscousU")==0) return SealevelchangeViscousUEnum;
    875882              else if (strcmp(name,"SealevelchangeViscousN")==0) return SealevelchangeViscousNEnum;
    876883              else if (strcmp(name,"SealevelchangeViscousE")==0) return SealevelchangeViscousEEnum;
    877          else stage=8;
    878    }
    879    if(stage==8){
    880               if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
     884              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
    881885              else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
    882886              else if (strcmp(name,"SedimentHeadSubstep")==0) return SedimentHeadSubstepEnum;
    … …  
    994998              else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum;
    995999              else if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum;
    996               else if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum;
     1000         else stage=9;
     1001   }
     1002   if(stage==9){
     1003              if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum;
    9971004              else if (strcmp(name,"SmbZY")==0) return SmbZYEnum;
    9981005              else if (strcmp(name,"SolidearthExternalDisplacementEastRate")==0) return SolidearthExternalDisplacementEastRateEnum;
    9991006              else if (strcmp(name,"SolidearthExternalDisplacementNorthRate")==0) return SolidearthExternalDisplacementNorthRateEnum;
    1000          else stage=9;
    1001    }
    1002    if(stage==9){
    1003               if (strcmp(name,"SolidearthExternalDisplacementUpRate")==0) return SolidearthExternalDisplacementUpRateEnum;
     1007              else if (strcmp(name,"SolidearthExternalDisplacementUpRate")==0) return SolidearthExternalDisplacementUpRateEnum;
    10041008              else if (strcmp(name,"SolidearthExternalGeoidRate")==0) return SolidearthExternalGeoidRateEnum;
    10051009              else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
    … …  
    11171121              else if (strcmp(name,"Outputdefinition43")==0) return Outputdefinition43Enum;
    11181122              else if (strcmp(name,"Outputdefinition44")==0) return Outputdefinition44Enum;
    1119               else if (strcmp(name,"Outputdefinition45")==0) return Outputdefinition45Enum;
     1123         else stage=10;
     1124   }
     1125   if(stage==10){
     1126              if (strcmp(name,"Outputdefinition45")==0) return Outputdefinition45Enum;
    11201127              else if (strcmp(name,"Outputdefinition46")==0) return Outputdefinition46Enum;
    11211128              else if (strcmp(name,"Outputdefinition47")==0) return Outputdefinition47Enum;
    11221129              else if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
    1123          else stage=10;
    1124    }
    1125    if(stage==10){
    1126               if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
     1130              else if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
    11271131              else if (strcmp(name,"Outputdefinition4")==0) return Outputdefinition4Enum;
    11281132              else if (strcmp(name,"Outputdefinition50")==0) return Outputdefinition50Enum;
    … …  
    12401244              else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
    12411245              else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
    1242               else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
     1246         else stage=11;
     1247   }
     1248   if(stage==11){
     1249              if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
    12431250              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
    12441251              else if (strcmp(name,"DataSet")==0) return DataSetEnum;
    12451252              else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum;
    1246          else stage=11;
    1247    }
    1248    if(stage==11){
    1249               if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
     1253              else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
    12501254              else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
    12511255              else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum;
    … …  
    13631367              else if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
    13641368              else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum;
    1365               else if (strcmp(name,"LoveKi")==0) return LoveKiEnum;
     1369         else stage=12;
     1370   }
     1371   if(stage==12){
     1372              if (strcmp(name,"LoveKi")==0) return LoveKiEnum;
    13661373              else if (strcmp(name,"LoveKr")==0) return LoveKrEnum;
    13671374              else if (strcmp(name,"LoveLi")==0) return LoveLiEnum;
    13681375              else if (strcmp(name,"LoveLr")==0) return LoveLrEnum;
    1369          else stage=12;
    1370    }
    1371    if(stage==12){
    1372               if (strcmp(name,"LoveSolution")==0) return LoveSolutionEnum;
     1376              else if (strcmp(name,"LoveSolution")==0) return LoveSolutionEnum;
    13731377              else if (strcmp(name,"MINI")==0) return MINIEnum;
    13741378              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
    … …  
    14861490              else if (strcmp(name,"SealevelchangePolarMotion")==0) return SealevelchangePolarMotionEnum;
    14871491              else if (strcmp(name,"SealevelNmotion")==0) return SealevelNmotionEnum;
    1488               else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum;
     1492         else stage=13;
     1493   }
     1494   if(stage==13){
     1495              if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum;
    14891496              else if (strcmp(name,"SealevelchangeAnalysis")==0) return SealevelchangeAnalysisEnum;
    14901497              else if (strcmp(name,"Seg")==0) return SegEnum;
    14911498              else if (strcmp(name,"SegInput")==0) return SegInputEnum;
    1492          else stage=13;
    1493    }
    1494    if(stage==13){
    1495               if (strcmp(name,"Segment")==0) return SegmentEnum;
     1499              else if (strcmp(name,"Segment")==0) return SegmentEnum;
    14961500              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
    14971501              else if (strcmp(name,"Separate")==0) return SeparateEnum;
Note: See TracChangeset for help on using the changeset viewer.