Changeset 25352


Ignore:
Timestamp:
08/05/20 13:36:42 (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

    r25349 r25352  
    298298syn keyword cConstant QmuOutputEnum
    299299syn keyword cConstant QmuCurrEvalIdEnum
     300syn keyword cConstant QmuNsampleEnum
    300301syn keyword cConstant QmuResponsedescriptorsEnum
    301302syn keyword cConstant QmuVariableDescriptorsEnum

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

    r25347 r25352  
    292292        QmuOutputEnum,
    293293        QmuCurrEvalIdEnum,
     294        QmuNsampleEnum,
    294295        QmuResponsedescriptorsEnum,
    295296        QmuVariableDescriptorsEnum,

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

    r25349 r25352  
    300300                case QmuOutputEnum : return "QmuOutput";
    301301                case QmuCurrEvalIdEnum : return "QmuCurrEvalId";
     302                case QmuNsampleEnum : return "QmuNsample";
    302303                case QmuResponsedescriptorsEnum : return "QmuResponsedescriptors";
    303304                case QmuVariableDescriptorsEnum : return "QmuVariableDescriptors";

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

    r25349 r25352  
    306306              else if (strcmp(name,"QmuOutput")==0) return QmuOutputEnum;
    307307              else if (strcmp(name,"QmuCurrEvalId")==0) return QmuCurrEvalIdEnum;
     308              else if (strcmp(name,"QmuNsample")==0) return QmuNsampleEnum;
    308309              else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
    309310              else if (strcmp(name,"QmuVariableDescriptors")==0) return QmuVariableDescriptorsEnum;
    … …  
    382383              else if (strcmp(name,"SmbIsdelta18o")==0) return SmbIsdelta18oEnum;
    383384              else if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
    384               else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum;
     388              if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
     389              else if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum;
    389390              else if (strcmp(name,"SmbIsmelt")==0) return SmbIsmeltEnum;
    390391              else if (strcmp(name,"SmbIsmungsm")==0) return SmbIsmungsmEnum;
    … …  
    505506              else if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
    506507              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
    507               else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
     511              if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
     512              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
    512513              else if (strcmp(name,"BasalStressx")==0) return BasalStressxEnum;
    513514              else if (strcmp(name,"BasalStressy")==0) return BasalStressyEnum;
    … …  
    628629              else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
    629630              else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
    630               else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
     634              if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
     635              else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
    635636              else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
    636637              else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum;
    … …  
    751752              else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
    752753              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
    753               else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
     757              if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
     758              else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
    758759              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
    759760              else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
    … …  
    874875              else if (strcmp(name,"VxObs")==0) return VxObsEnum;
    875876              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    876               else if (strcmp(name,"Vy")==0) return VyEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
     880              if (strcmp(name,"Vy")==0) return VyEnum;
     881              else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
    881882              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
    882883              else if (strcmp(name,"Vz")==0) return VzEnum;
    … …  
    997998              else if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
    998999              else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
    999               else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
     1003              if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
     1004              else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
    10041005              else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
    10051006              else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum;
    … …  
    11201121              else if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum;
    11211122              else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
    1122               else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"Gset")==0) return GsetEnum;
     1126              if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
     1127              else if (strcmp(name,"Gset")==0) return GsetEnum;
    11271128              else if (strcmp(name,"Gsl")==0) return GslEnum;
    11281129              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
    … …  
    12431244              else if (strcmp(name,"Option")==0) return OptionEnum;
    12441245              else if (strcmp(name,"Param")==0) return ParamEnum;
    1245               else if (strcmp(name,"Parameters")==0) return ParametersEnum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"P0Array")==0) return P0ArrayEnum;
     1249              if (strcmp(name,"Parameters")==0) return ParametersEnum;
     1250              else if (strcmp(name,"P0Array")==0) return P0ArrayEnum;
    12501251              else if (strcmp(name,"P0DG")==0) return P0DGEnum;
    12511252              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
    … …  
    13661367              else if (strcmp(name,"XY")==0) return XYEnum;
    13671368              else if (strcmp(name,"XYZ")==0) return XYZEnum;
    1368               else if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
     1372              if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;
     1373              else if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
    13731374              else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
    13741375              else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
Note: See TracChangeset for help on using the changeset viewer.