Changeset 27469


Ignore:
Timestamp:
12/21/22 07:25:47 (2 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added FrictionLinearize

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

Legend:

Unmodified
Added
Removed

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

    r27462 r27469  
    209209syn keyword cConstant FrictionGammaEnum
    210210syn keyword cConstant FrictionLawEnum
     211syn keyword cConstant FrictionLinearizeEnum
    211212syn keyword cConstant FrictionPseudoplasticityExponentEnum
    212213syn keyword cConstant FrictionThresholdSpeedEnum
    … …  
    17231724syn keyword cType Cfsurfacesquare
    17241725syn keyword cType Channel
    1725 syn keyword cType classes
    17261726syn keyword cType Constraint
    17271727syn keyword cType Constraints
    … …  
    17301730syn keyword cType ControlInput
    17311731syn keyword cType Covertree
     1732syn keyword cType DataSetParam
    17321733syn keyword cType DatasetInput
    1733 syn keyword cType DataSetParam
    17341734syn keyword cType Definition
    17351735syn keyword cType DependentObject
    … …  
    17441744syn keyword cType ElementInput
    17451745syn keyword cType ElementMatrix
     1746syn keyword cType ElementVector
    17461747syn keyword cType Elements
    1747 syn keyword cType ElementVector
    17481748syn keyword cType ExponentialVariogram
    17491749syn keyword cType ExternalResult
    … …  
    17521752syn keyword cType Friction
    17531753syn keyword cType Gauss
    1754 syn keyword cType GaussianVariogram
    1755 syn keyword cType gaussobjects
    17561754syn keyword cType GaussPenta
    17571755syn keyword cType GaussSeg
    17581756syn keyword cType GaussTetra
    17591757syn keyword cType GaussTria
     1758syn keyword cType GaussianVariogram
    17601759syn keyword cType GenericExternalResult
    17611760syn keyword cType GenericOption
    … …  
    17741773syn keyword cType IssmDirectApplicInterface
    17751774syn keyword cType IssmParallelDirectApplicInterface
    1776 syn keyword cType krigingobjects
    17771775syn keyword cType Load
    17781776syn keyword cType Loads
    … …  
    17851783syn keyword cType Matice
    17861784syn keyword cType Matlitho
    1787 syn keyword cType matrixobjects
    17881785syn keyword cType MatrixParam
    17891786syn keyword cType Misfit
    … …  
    17981795syn keyword cType Observations
    17991796syn keyword cType Option
     1797syn keyword cType OptionUtilities
    18001798syn keyword cType Options
    1801 syn keyword cType OptionUtilities
    18021799syn keyword cType Param
    18031800syn keyword cType Parameters
    … …  
    18131810syn keyword cType Regionaloutput
    18141811syn keyword cType Results
     1812syn keyword cType RiftStruct
    18151813syn keyword cType Riftfront
    1816 syn keyword cType RiftStruct
    18171814syn keyword cType SealevelGeometry
    18181815syn keyword cType Seg
    18191816syn keyword cType SegInput
     1817syn keyword cType SegRef
    18201818syn keyword cType Segment
    1821 syn keyword cType SegRef
    18221819syn keyword cType SpcDynamic
    18231820syn keyword cType SpcStatic
    … …  
    18381835syn keyword cType Vertex
    18391836syn keyword cType Vertices
     1837syn keyword cType classes
     1838syn keyword cType gaussobjects
     1839syn keyword cType krigingobjects
     1840syn keyword cType matrixobjects
    18401841syn keyword cType AdjointBalancethickness2Analysis
    18411842syn keyword cType AdjointBalancethicknessAnalysis

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

    r27462 r27469  
    203203        FrictionGammaEnum,
    204204        FrictionLawEnum,
     205        FrictionLinearizeEnum,
    205206        FrictionPseudoplasticityExponentEnum,
    206207        FrictionThresholdSpeedEnum,

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

    r27462 r27469  
    211211                case FrictionGammaEnum : return "FrictionGamma";
    212212                case FrictionLawEnum : return "FrictionLaw";
     213                case FrictionLinearizeEnum : return "FrictionLinearize";
    213214                case FrictionPseudoplasticityExponentEnum : return "FrictionPseudoplasticityExponent";
    214215                case FrictionThresholdSpeedEnum : return "FrictionThresholdSpeed";

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

    r27462 r27469  
    202202syn keyword juliaConstC FrictionGammaEnum
    203203syn keyword juliaConstC FrictionLawEnum
     204syn keyword juliaConstC FrictionLinearizeEnum
    204205syn keyword juliaConstC FrictionPseudoplasticityExponentEnum
    205206syn keyword juliaConstC FrictionThresholdSpeedEnum

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

    r27462 r27469  
    214214              else if (strcmp(name,"FrictionGamma")==0) return FrictionGammaEnum;
    215215              else if (strcmp(name,"FrictionLaw")==0) return FrictionLawEnum;
     216              else if (strcmp(name,"FrictionLinearize")==0) return FrictionLinearizeEnum;
    216217              else if (strcmp(name,"FrictionPseudoplasticityExponent")==0) return FrictionPseudoplasticityExponentEnum;
    217218              else if (strcmp(name,"FrictionThresholdSpeed")==0) return FrictionThresholdSpeedEnum;
    … …  
    259260              else if (strcmp(name,"HydrologyarmaNumParams")==0) return HydrologyarmaNumParamsEnum;
    260261              else if (strcmp(name,"Hydrologyarmapolyparams")==0) return HydrologyarmapolyparamsEnum;
    261               else if (strcmp(name,"HydrologyarmaTimestep")==0) return HydrologyarmaTimestepEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"HydrologyAveraging")==0) return HydrologyAveragingEnum;
     265              if (strcmp(name,"HydrologyarmaTimestep")==0) return HydrologyarmaTimestepEnum;
     266              else if (strcmp(name,"HydrologyAveraging")==0) return HydrologyAveragingEnum;
    266267              else if (strcmp(name,"HydrologyCavitySpacing")==0) return HydrologyCavitySpacingEnum;
    267268              else if (strcmp(name,"HydrologyChannelSheetWidth")==0) return HydrologyChannelSheetWidthEnum;
    … …  
    382383              else if (strcmp(name,"MaterialsEffectiveconductivityAveraging")==0) return MaterialsEffectiveconductivityAveragingEnum;
    383384              else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum;
    384               else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
     388              if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum;
     389              else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
    389390              else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
    390391              else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
    … …  
    505506              else if (strcmp(name,"StochasticForcingCovariance")==0) return StochasticForcingCovarianceEnum;
    506507              else if (strcmp(name,"StochasticForcingDefaultDimension")==0) return StochasticForcingDefaultDimensionEnum;
    507               else if (strcmp(name,"StochasticForcingDimensions")==0) return StochasticForcingDimensionsEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"StochasticForcingFields")==0) return StochasticForcingFieldsEnum;
     511              if (strcmp(name,"StochasticForcingDimensions")==0) return StochasticForcingDimensionsEnum;
     512              else if (strcmp(name,"StochasticForcingFields")==0) return StochasticForcingFieldsEnum;
    512513              else if (strcmp(name,"StochasticForcingIsEffectivePressure")==0) return StochasticForcingIsEffectivePressureEnum;
    513514              else if (strcmp(name,"StochasticForcingIsStochasticForcing")==0) return StochasticForcingIsStochasticForcingEnum;
    … …  
    628629              else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
    629630              else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum;
    630               else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"ThermalReltol")==0) return ThermalReltolEnum;
     634              if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum;
     635              else if (strcmp(name,"ThermalReltol")==0) return ThermalReltolEnum;
    635636              else if (strcmp(name,"ThermalRequestedOutputs")==0) return ThermalRequestedOutputsEnum;
    636637              else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
    … …  
    751752              else if (strcmp(name,"CalvingCalvingrate")==0) return CalvingCalvingrateEnum;
    752753              else if (strcmp(name,"CalvingHabFraction")==0) return CalvingHabFractionEnum;
    753               else if (strcmp(name,"CalvingAblationrate")==0) return CalvingAblationrateEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum;
     757              if (strcmp(name,"CalvingAblationrate")==0) return CalvingAblationrateEnum;
     758              else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum;
    758759              else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum;
    759760              else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum;
    … …  
    874875              else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum;
    875876              else if (strcmp(name,"HydrologyHeadOld")==0) return HydrologyHeadOldEnum;
    876               else if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
     880              if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum;
     881              else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
    881882              else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum;
    882883              else if (strcmp(name,"HydrologySheetConductivity")==0) return HydrologySheetConductivityEnum;
    … …  
    997998              else if (strcmp(name,"SealevelchangeConvolutionVertices")==0) return SealevelchangeConvolutionVerticesEnum;
    998999              else if (strcmp(name,"SealevelchangeAlphaIndex")==0) return SealevelchangeAlphaIndexEnum;
    999               else if (strcmp(name,"SealevelchangeAzimuthIndex")==0) return SealevelchangeAzimuthIndexEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"SealevelchangeGrot")==0) return SealevelchangeGrotEnum;
     1003              if (strcmp(name,"SealevelchangeAzimuthIndex")==0) return SealevelchangeAzimuthIndexEnum;
     1004              else if (strcmp(name,"SealevelchangeGrot")==0) return SealevelchangeGrotEnum;
    10041005              else if (strcmp(name,"SealevelchangeGSatGravirot")==0) return SealevelchangeGSatGravirotEnum;
    10051006              else if (strcmp(name,"SealevelchangeGUrot")==0) return SealevelchangeGUrotEnum;
    … …  
    11201121              else if (strcmp(name,"SmbTa")==0) return SmbTaEnum;
    11211122              else if (strcmp(name,"SmbTeValue")==0) return SmbTeValueEnum;
    1122               else if (strcmp(name,"SmbTemperaturesAnomaly")==0) return SmbTemperaturesAnomalyEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"SmbTemperaturesLgm")==0) return SmbTemperaturesLgmEnum;
     1126              if (strcmp(name,"SmbTemperaturesAnomaly")==0) return SmbTemperaturesAnomalyEnum;
     1127              else if (strcmp(name,"SmbTemperaturesLgm")==0) return SmbTemperaturesLgmEnum;
    11271128              else if (strcmp(name,"SmbTemperaturesPresentday")==0) return SmbTemperaturesPresentdayEnum;
    11281129              else if (strcmp(name,"SmbTemperaturesReconstructed")==0) return SmbTemperaturesReconstructedEnum;
    … …  
    12431244              else if (strcmp(name,"Outputdefinition15")==0) return Outputdefinition15Enum;
    12441245              else if (strcmp(name,"Outputdefinition16")==0) return Outputdefinition16Enum;
    1245               else if (strcmp(name,"Outputdefinition17")==0) return Outputdefinition17Enum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"Outputdefinition18")==0) return Outputdefinition18Enum;
     1249              if (strcmp(name,"Outputdefinition17")==0) return Outputdefinition17Enum;
     1250              else if (strcmp(name,"Outputdefinition18")==0) return Outputdefinition18Enum;
    12501251              else if (strcmp(name,"Outputdefinition19")==0) return Outputdefinition19Enum;
    12511252              else if (strcmp(name,"Outputdefinition20")==0) return Outputdefinition20Enum;
    … …  
    13661367              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
    13671368              else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
    1368               else if (strcmp(name,"IntInput")==0) return IntInputEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
     1372              if (strcmp(name,"IntInput")==0) return IntInputEnum;
     1373              else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
    13731374              else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
    13741375              else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
    … …  
    14891490              else if (strcmp(name,"HydrologySubsteps")==0) return HydrologySubstepsEnum;
    14901491              else if (strcmp(name,"HydrologySubTime")==0) return HydrologySubTimeEnum;
    1491               else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
    14921492         else stage=13;
    14931493   }
    14941494   if(stage==13){
    1495               if (strcmp(name,"Hydrologypism")==0) return HydrologypismEnum;
     1495              if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
     1496              else if (strcmp(name,"Hydrologypism")==0) return HydrologypismEnum;
    14961497              else if (strcmp(name,"Hydrologyshakti")==0) return HydrologyshaktiEnum;
    14971498              else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum;
    … …  
    16121613              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
    16131614              else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
    1614               else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    16151615         else stage=14;
    16161616   }
    16171617   if(stage==14){
    1618               if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
     1618              if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
     1619              else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
    16191620              else if (strcmp(name,"P1xP3")==0) return P1xP3Enum;
    16201621              else if (strcmp(name,"P1xP4")==0) return P1xP4Enum;
    … …  
    17351736              else if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
    17361737              else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
    1737               else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
    17381738         else stage=15;
    17391739   }
    17401740   if(stage==15){
    1741               if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
     1741              if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
     1742              else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
    17421743              else if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum;
    17431744              else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
Note: See TracChangeset for help on using the changeset viewer.