Changeset 27094


Ignore:
Timestamp:
06/22/22 16:11:18 (3 years ago)
Author:
Eric.Larour
Message:

CHG: new enums

Location:
issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enum.vim

    r27084 r27094  
    306306syn keyword cConstant MasstransportMinThicknessEnum
    307307syn keyword cConstant MasstransportNumRequestedOutputsEnum
     308syn keyword cConstant MmemasstransportNumRequestedOutputsEnum
    308309syn keyword cConstant MasstransportPenaltyFactorEnum
    309310syn keyword cConstant MasstransportRequestedOutputsEnum
     311syn keyword cConstant MmemasstransportRequestedOutputsEnum
    310312syn keyword cConstant MasstransportStabilizationEnum
    311313syn keyword cConstant MmemasstransportModelidsEnum
    … …  
    808810syn keyword cConstant MaskIceRefLevelsetEnum
    809811syn keyword cConstant MasstransportSpcthicknessEnum
    810 syn keyword cConstant MmemasstransportDeltathicknessEnum
     812syn keyword cConstant MmemasstransportThicknessEnum
    811813syn keyword cConstant MaterialsRheologyBEnum
    812814syn keyword cConstant MaterialsRheologyBbarEnum
    … …  
    17761778syn keyword cType MasstransportAnalysis
    17771779syn keyword cType MeltingAnalysis
     1780syn keyword cType MmemasstransportAnalysis
    17781781syn keyword cType OceantransportAnalysis
    17791782syn keyword cType SamplingAnalysis

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumDefinitions.h

    r27084 r27094  
    300300        MasstransportMinThicknessEnum,
    301301        MasstransportNumRequestedOutputsEnum,
     302        MmemasstransportNumRequestedOutputsEnum,
    302303        MasstransportPenaltyFactorEnum,
    303304        MasstransportRequestedOutputsEnum,
     305        MmemasstransportRequestedOutputsEnum,
    304306        MasstransportStabilizationEnum,
    305307        MmemasstransportModelidsEnum,
    … …  
    804806        MaskIceRefLevelsetEnum,
    805807        MasstransportSpcthicknessEnum,
    806         MmemasstransportDeltathicknessEnum,
     808        MmemasstransportThicknessEnum,
    807809        MaterialsRheologyBEnum,
    808810        MaterialsRheologyBbarEnum,

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumToStringx.cpp

    r27084 r27094  
    308308                case MasstransportMinThicknessEnum : return "MasstransportMinThickness";
    309309                case MasstransportNumRequestedOutputsEnum : return "MasstransportNumRequestedOutputs";
     310                case MmemasstransportNumRequestedOutputsEnum : return "MmemasstransportNumRequestedOutputs";
    310311                case MasstransportPenaltyFactorEnum : return "MasstransportPenaltyFactor";
    311312                case MasstransportRequestedOutputsEnum : return "MasstransportRequestedOutputs";
     313                case MmemasstransportRequestedOutputsEnum : return "MmemasstransportRequestedOutputs";
    312314                case MasstransportStabilizationEnum : return "MasstransportStabilization";
    313315                case MmemasstransportModelidsEnum : return "MmemasstransportModelids";
    … …  
    810812                case MaskIceRefLevelsetEnum : return "MaskIceRefLevelset";
    811813                case MasstransportSpcthicknessEnum : return "MasstransportSpcthickness";
    812                 case MmemasstransportDeltathicknessEnum : return "MmemasstransportDeltathickness";
     814                case MmemasstransportThicknessEnum : return "MmemasstransportThickness";
    813815                case MaterialsRheologyBEnum : return "MaterialsRheologyB";
    814816                case MaterialsRheologyBbarEnum : return "MaterialsRheologyBbar";

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enumjl.vim

    r27084 r27094  
    299299syn keyword juliaConstC MasstransportMinThicknessEnum
    300300syn keyword juliaConstC MasstransportNumRequestedOutputsEnum
     301syn keyword juliaConstC MmemasstransportNumRequestedOutputsEnum
    301302syn keyword juliaConstC MasstransportPenaltyFactorEnum
    302303syn keyword juliaConstC MasstransportRequestedOutputsEnum
     304syn keyword juliaConstC MmemasstransportRequestedOutputsEnum
    303305syn keyword juliaConstC MasstransportStabilizationEnum
    304306syn keyword juliaConstC MmemasstransportModelidsEnum
    … …  
    801803syn keyword juliaConstC MaskIceRefLevelsetEnum
    802804syn keyword juliaConstC MasstransportSpcthicknessEnum
    803 syn keyword juliaConstC MmemasstransportDeltathicknessEnum
     805syn keyword juliaConstC MmemasstransportThicknessEnum
    804806syn keyword juliaConstC MaterialsRheologyBEnum
    805807syn keyword juliaConstC MaterialsRheologyBbarEnum

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/StringToEnumx.cpp

    r27084 r27094  
    314314              else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum;
    315315              else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
     316              else if (strcmp(name,"MmemasstransportNumRequestedOutputs")==0) return MmemasstransportNumRequestedOutputsEnum;
    316317              else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum;
    317318              else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
     319              else if (strcmp(name,"MmemasstransportRequestedOutputs")==0) return MmemasstransportRequestedOutputsEnum;
    318320              else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
    319321              else if (strcmp(name,"MmemasstransportModelids")==0) return MmemasstransportModelidsEnum;
    … …  
    381383              else if (strcmp(name,"SamplingNumRequestedOutputs")==0) return SamplingNumRequestedOutputsEnum;
    382384              else if (strcmp(name,"SamplingRequestedOutputs")==0) return SamplingRequestedOutputsEnum;
    383               else if (strcmp(name,"SamplingRobin")==0) return SamplingRobinEnum;
    384               else if (strcmp(name,"SamplingSeed")==0) return SamplingSeedEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
     388              if (strcmp(name,"SamplingRobin")==0) return SamplingRobinEnum;
     389              else if (strcmp(name,"SamplingSeed")==0) return SamplingSeedEnum;
     390              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
    389391              else if (strcmp(name,"SolidearthPartitionIce")==0) return SolidearthPartitionIceEnum;
    390392              else if (strcmp(name,"SolidearthPartitionHydro")==0) return SolidearthPartitionHydroEnum;
    … …  
    504506              else if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum;
    505507              else if (strcmp(name,"SmbIsthermal")==0) return SmbIsthermalEnum;
    506               else if (strcmp(name,"SmbIsturbulentflux")==0) return SmbIsturbulentfluxEnum;
    507               else if (strcmp(name,"SmbK")==0) return SmbKEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SmbLapseRates")==0) return SmbLapseRatesEnum;
     511              if (strcmp(name,"SmbIsturbulentflux")==0) return SmbIsturbulentfluxEnum;
     512              else if (strcmp(name,"SmbK")==0) return SmbKEnum;
     513              else if (strcmp(name,"SmbLapseRates")==0) return SmbLapseRatesEnum;
    512514              else if (strcmp(name,"SmbNumBasins")==0) return SmbNumBasinsEnum;
    513515              else if (strcmp(name,"SmbNumElevationBins")==0) return SmbNumElevationBinsEnum;
    … …  
    627629              else if (strcmp(name,"BasalCrevasse")==0) return BasalCrevasseEnum;
    628630              else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateAutoregression")==0) return BasalforcingsDeepwaterMeltingRateAutoregressionEnum;
    629               else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateNoise")==0) return BasalforcingsDeepwaterMeltingRateNoiseEnum;
    630               else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateValuesAutoregression")==0) return BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum;
     634              if (strcmp(name,"BasalforcingsDeepwaterMeltingRateNoise")==0) return BasalforcingsDeepwaterMeltingRateNoiseEnum;
     635              else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateValuesAutoregression")==0) return BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum;
     636              else if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum;
    635637              else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
    636638              else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
    … …  
    750752              else if (strcmp(name,"FrictionCmax")==0) return FrictionCmaxEnum;
    751753              else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum;
    752               else if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum;
    753               else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"FrictionM")==0) return FrictionMEnum;
     757              if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum;
     758              else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum;
     759              else if (strcmp(name,"FrictionM")==0) return FrictionMEnum;
    758760              else if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
    759761              else if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum;
    … …  
    828830              else if (strcmp(name,"MaskIceRefLevelset")==0) return MaskIceRefLevelsetEnum;
    829831              else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum;
    830               else if (strcmp(name,"MmemasstransportDeltathickness")==0) return MmemasstransportDeltathicknessEnum;
     832              else if (strcmp(name,"MmemasstransportThickness")==0) return MmemasstransportThicknessEnum;
    831833              else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
    832834              else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
    … …  
    873875              else if (strcmp(name,"SamplingPhi")==0) return SamplingPhiEnum;
    874876              else if (strcmp(name,"SamplingTau")==0) return SamplingTauEnum;
    875               else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
    876               else if (strcmp(name,"SealevelGRD")==0) return SealevelGRDEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"SealevelBarystaticMask")==0) return SealevelBarystaticMaskEnum;
     880              if (strcmp(name,"Sealevel")==0) return SealevelEnum;
     881              else if (strcmp(name,"SealevelGRD")==0) return SealevelGRDEnum;
     882              else if (strcmp(name,"SealevelBarystaticMask")==0) return SealevelBarystaticMaskEnum;
    881883              else if (strcmp(name,"SealevelBarystaticIceMask")==0) return SealevelBarystaticIceMaskEnum;
    882884              else if (strcmp(name,"SealevelBarystaticIceWeights")==0) return SealevelBarystaticIceWeightsEnum;
    … …  
    996998              else if (strcmp(name,"SmbECDt")==0) return SmbECDtEnum;
    997999              else if (strcmp(name,"SmbECini")==0) return SmbECiniEnum;
    998               else if (strcmp(name,"SmbEla")==0) return SmbElaEnum;
    999               else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"SmbFAC")==0) return SmbFACEnum;
     1003              if (strcmp(name,"SmbEla")==0) return SmbElaEnum;
     1004              else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum;
     1005              else if (strcmp(name,"SmbFAC")==0) return SmbFACEnum;
    10041006              else if (strcmp(name,"SmbGdn")==0) return SmbGdnEnum;
    10051007              else if (strcmp(name,"SmbGdnini")==0) return SmbGdniniEnum;
    … …  
    11191121              else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
    11201122              else if (strcmp(name,"VxBase")==0) return VxBaseEnum;
    1121               else if (strcmp(name,"Vx")==0) return VxEnum;
    1122               else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"VxObs")==0) return VxObsEnum;
     1126              if (strcmp(name,"Vx")==0) return VxEnum;
     1127              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
     1128              else if (strcmp(name,"VxObs")==0) return VxObsEnum;
    11271129              else if (strcmp(name,"VxShear")==0) return VxShearEnum;
    11281130              else if (strcmp(name,"VxSurface")==0) return VxSurfaceEnum;
    … …  
    12421244              else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
    12431245              else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
    1244               else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
    1245               else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
     1249              if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
     1250              else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
     1251              else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
    12501252              else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
    12511253              else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
    … …  
    13651367              else if (strcmp(name,"FrontalForcingsRignotAutoregression")==0) return FrontalForcingsRignotAutoregressionEnum;
    13661368              else if (strcmp(name,"Fset")==0) return FsetEnum;
    1367               else if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum;
    1368               else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
     1372              if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum;
     1373              else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum;
     1374              else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
    13731375              else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
    13741376              else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
    … …  
    14881490              else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum;
    14891491              else if (strcmp(name,"Moulin")==0) return MoulinEnum;
    1490               else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
    1491               else if (strcmp(name,"Mpi")==0) return MpiEnum;
    14921492         else stage=13;
    14931493   }
    14941494   if(stage==13){
    1495               if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
     1495              if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
     1496              else if (strcmp(name,"Mpi")==0) return MpiEnum;
     1497              else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
    14961498              else if (strcmp(name,"Mumps")==0) return MumpsEnum;
    14971499              else if (strcmp(name,"NoFrictionOnPartiallyFloating")==0) return NoFrictionOnPartiallyFloatingEnum;
    … …  
    16111613              else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
    16121614              else if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum;
    1613               else if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum;
    1614               else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
    16151615         else stage=14;
    16161616   }
    16171617   if(stage==14){
    1618               if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
     1618              if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum;
     1619              else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
     1620              else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
    16191621              else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
    16201622              else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;

  • issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/issmenums.jl

    r27084 r27094  
    295295        MasstransportMinThicknessEnum
    296296        MasstransportNumRequestedOutputsEnum
     297        MmemasstransportNumRequestedOutputsEnum
    297298        MasstransportPenaltyFactorEnum
    298299        MasstransportRequestedOutputsEnum
     300        MmemasstransportRequestedOutputsEnum
    299301        MasstransportStabilizationEnum
    300302        MmemasstransportModelidsEnum
    … …  
    797799        MaskIceRefLevelsetEnum
    798800        MasstransportSpcthicknessEnum
    799         MmemasstransportDeltathicknessEnum
     801        MmemasstransportThicknessEnum
    800802        MaterialsRheologyBEnum
    801803        MaterialsRheologyBbarEnum
    … …  
    18991901        if(enum==MasstransportMinThicknessEnum) return "MasstransportMinThickness" end
    19001902        if(enum==MasstransportNumRequestedOutputsEnum) return "MasstransportNumRequestedOutputs" end
     1903        if(enum==MmemasstransportNumRequestedOutputsEnum) return "MmemasstransportNumRequestedOutputs" end
    19011904        if(enum==MasstransportPenaltyFactorEnum) return "MasstransportPenaltyFactor" end
    19021905        if(enum==MasstransportRequestedOutputsEnum) return "MasstransportRequestedOutputs" end
     1906        if(enum==MmemasstransportRequestedOutputsEnum) return "MmemasstransportRequestedOutputs" end
    19031907        if(enum==MasstransportStabilizationEnum) return "MasstransportStabilization" end
    19041908        if(enum==MmemasstransportModelidsEnum) return "MmemasstransportModelids" end
    … …  
    24012405        if(enum==MaskIceRefLevelsetEnum) return "MaskIceRefLevelset" end
    24022406        if(enum==MasstransportSpcthicknessEnum) return "MasstransportSpcthickness" end
    2403         if(enum==MmemasstransportDeltathicknessEnum) return "MmemasstransportDeltathickness" end
     2407        if(enum==MmemasstransportThicknessEnum) return "MmemasstransportThickness" end
    24042408        if(enum==MaterialsRheologyBEnum) return "MaterialsRheologyB" end
    24052409        if(enum==MaterialsRheologyBbarEnum) return "MaterialsRheologyBbar" end
Note: See TracChangeset for help on using the changeset viewer.