Changeset 25353


Ignore:
Timestamp:
08/05/20 17:43:39 (5 years ago)
Author:
Eric.Larour
Message:

CHG: diverse

Location:
issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r25352 r25353  
    142142syn keyword cConstant ExtrapolationVariableEnum
    143143syn keyword cConstant FemModelCommEnum
     144syn keyword cConstant FieldsEnum
    144145syn keyword cConstant FlowequationFeFSEnum
    145146syn keyword cConstant FlowequationIsFSEnum
    … …  
    411412syn keyword cConstant SteadystateRequestedOutputsEnum
    412413syn keyword cConstant StepEnum
     414syn keyword cConstant StepsEnum
    413415syn keyword cConstant StressbalanceAbstolEnum
    414416syn keyword cConstant StressbalanceFSreconditioningEnum

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

    r25352 r25353  
    136136        ExtrapolationVariableEnum,
    137137        FemModelCommEnum,
     138        FieldsEnum,
    138139        FlowequationFeFSEnum,
    139140        FlowequationIsFSEnum,
    … …  
    405406        SteadystateRequestedOutputsEnum,
    406407        StepEnum,
     408        StepsEnum,
    407409        StressbalanceAbstolEnum,
    408410        StressbalanceFSreconditioningEnum,

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

    r25352 r25353  
    144144                case ExtrapolationVariableEnum : return "ExtrapolationVariable";
    145145                case FemModelCommEnum : return "FemModelComm";
     146                case FieldsEnum : return "Fields";
    146147                case FlowequationFeFSEnum : return "FlowequationFeFS";
    147148                case FlowequationIsFSEnum : return "FlowequationIsFS";
    … …  
    413414                case SteadystateRequestedOutputsEnum : return "SteadystateRequestedOutputs";
    414415                case StepEnum : return "Step";
     416                case StepsEnum : return "Steps";
    415417                case StressbalanceAbstolEnum : return "StressbalanceAbstol";
    416418                case StressbalanceFSreconditioningEnum : return "StressbalanceFSreconditioning";

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

    r25352 r25353  
    147147              else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
    148148              else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
     149              else if (strcmp(name,"Fields")==0) return FieldsEnum;
    149150              else if (strcmp(name,"FlowequationFeFS")==0) return FlowequationFeFSEnum;
    150151              else if (strcmp(name,"FlowequationIsFS")==0) return FlowequationIsFSEnum;
    … …  
    259260              else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
    260261              else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum;
    261               else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
     265              if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
     266              else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
    266267              else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
    267268              else if (strcmp(name,"MaterialsEarthDensity")==0) return MaterialsEarthDensityEnum;
    … …  
    382383              else if (strcmp(name,"SmbIsd18opd")==0) return SmbIsd18opdEnum;
    383384              else if (strcmp(name,"SmbIsdelta18o")==0) return SmbIsdelta18oEnum;
    384               else if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
     388              if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
     389              else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
    389390              else if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum;
    390391              else if (strcmp(name,"SmbIsmelt")==0) return SmbIsmeltEnum;
    … …  
    422423              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    423424              else if (strcmp(name,"Step")==0) return StepEnum;
     425              else if (strcmp(name,"Steps")==0) return StepsEnum;
    424426              else if (strcmp(name,"StressbalanceAbstol")==0) return StressbalanceAbstolEnum;
    425427              else if (strcmp(name,"StressbalanceFSreconditioning")==0) return StressbalanceFSreconditioningEnum;
    … …  
    504506              else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
    505507              else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
    506               else if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
    507               else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
     511              if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
     512              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
     513              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
    512514              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
    513515              else if (strcmp(name,"BasalStressx")==0) return BasalStressxEnum;
    … …  
    627629              else if (strcmp(name,"HydrologydcEplThicknessTransient")==0) return HydrologydcEplThicknessTransientEnum;
    628630              else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
    629               else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
    630               else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
     634              if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
     635              else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
     636              else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
    635637              else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
    636638              else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
    … …  
    750752              else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
    751753              else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
    752               else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
    753               else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
     757              if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
     758              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
     759              else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
    758760              else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
    759761              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
    … …  
    873875              else if (strcmp(name,"Vx")==0) return VxEnum;
    874876              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
    875               else if (strcmp(name,"VxObs")==0) return VxObsEnum;
    876               else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Vy")==0) return VyEnum;
     880              if (strcmp(name,"VxObs")==0) return VxObsEnum;
     881              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
     882              else if (strcmp(name,"Vy")==0) return VyEnum;
    881883              else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
    882884              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
    … …  
    996998              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
    997999              else if (strcmp(name,"AdaptiveTimestepping")==0) return AdaptiveTimesteppingEnum;
    998               else if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
    999               else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
     1003              if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
     1004              else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
     1005              else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
    10041006              else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
    10051007              else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
    … …  
    11191121              else if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
    11201122              else if (strcmp(name,"GroundedArea")==0) return GroundedAreaEnum;
    1121               else if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum;
    1122               else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
     1126              if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum;
     1127              else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
     1128              else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
    11271129              else if (strcmp(name,"Gset")==0) return GsetEnum;
    11281130              else if (strcmp(name,"Gsl")==0) return GslEnum;
    … …  
    12421244              else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
    12431245              else if (strcmp(name,"Open")==0) return OpenEnum;
    1244               else if (strcmp(name,"Option")==0) return OptionEnum;
    1245               else if (strcmp(name,"Param")==0) return ParamEnum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"Parameters")==0) return ParametersEnum;
     1249              if (strcmp(name,"Option")==0) return OptionEnum;
     1250              else if (strcmp(name,"Param")==0) return ParamEnum;
     1251              else if (strcmp(name,"Parameters")==0) return ParametersEnum;
    12501252              else if (strcmp(name,"P0Array")==0) return P0ArrayEnum;
    12511253              else if (strcmp(name,"P0DG")==0) return P0DGEnum;
    … …  
    13651367              else if (strcmp(name,"Water")==0) return WaterEnum;
    13661368              else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
    1367               else if (strcmp(name,"XY")==0) return XYEnum;
    1368               else if (strcmp(name,"XYZ")==0) return XYZEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;
     1372              if (strcmp(name,"XY")==0) return XYEnum;
     1373              else if (strcmp(name,"XYZ")==0) return XYZEnum;
     1374              else if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;
    13731375              else if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
    13741376              else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
Note: See TracChangeset for help on using the changeset viewer.