Changeset 24987


Ignore:
Timestamp:
06/08/20 22:24:44 (5 years ago)
Author:
Eric.Larour
Message:

CHG: new enum for qmu variable partitions.

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

Legend:

Unmodified
Added
Removed

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

    r24977 r24987  
    298298syn keyword cConstant QmuResponsedescriptorsEnum
    299299syn keyword cConstant QmuVariableDescriptorsEnum
     300syn keyword cConstant QmuVariablePartitionsEnum
    300301syn keyword cConstant RestartFileNameEnum
    301302syn keyword cConstant ResultsEnum

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

    r24977 r24987  
    292292        QmuResponsedescriptorsEnum,
    293293        QmuVariableDescriptorsEnum,
     294        QmuVariablePartitionsEnum,
    294295        RestartFileNameEnum,
    295296        ResultsEnum,

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

    r24977 r24987  
    300300                case QmuResponsedescriptorsEnum : return "QmuResponsedescriptors";
    301301                case QmuVariableDescriptorsEnum : return "QmuVariableDescriptors";
     302                case QmuVariablePartitionsEnum : return "QmuVariablePartitions";
    302303                case RestartFileNameEnum : return "RestartFileName";
    303304                case ResultsEnum : return "Results";

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

    r24977 r24987  
    306306              else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
    307307              else if (strcmp(name,"QmuVariableDescriptors")==0) return QmuVariableDescriptorsEnum;
     308              else if (strcmp(name,"QmuVariablePartitions")==0) return QmuVariablePartitionsEnum;
    308309              else if (strcmp(name,"RestartFileName")==0) return RestartFileNameEnum;
    309310              else if (strcmp(name,"Results")==0) return ResultsEnum;
    … …  
    382383              else if (strcmp(name,"SmbIsturbulentflux")==0) return SmbIsturbulentfluxEnum;
    383384              else if (strcmp(name,"SmbK")==0) return SmbKEnum;
    384               else if (strcmp(name,"SmbNumRequestedOutputs")==0) return SmbNumRequestedOutputsEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SmbPfac")==0) return SmbPfacEnum;
     388              if (strcmp(name,"SmbNumRequestedOutputs")==0) return SmbNumRequestedOutputsEnum;
     389              else if (strcmp(name,"SmbPfac")==0) return SmbPfacEnum;
    389390              else if (strcmp(name,"SmbRdl")==0) return SmbRdlEnum;
    390391              else if (strcmp(name,"SmbRequestedOutputs")==0) return SmbRequestedOutputsEnum;
    … …  
    505506              else if (strcmp(name,"Bed")==0) return BedEnum;
    506507              else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum;
    507               else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"CalvingCalvingrate")==0) return CalvingCalvingrateEnum;
     511              if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum;
     512              else if (strcmp(name,"CalvingCalvingrate")==0) return CalvingCalvingrateEnum;
    512513              else if (strcmp(name,"CalvingHabFraction")==0) return CalvingHabFractionEnum;
    513514              else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum;
    … …  
    628629              else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
    629630              else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
    630               else if (strcmp(name,"Ice")==0) return IceEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
     634              if (strcmp(name,"Ice")==0) return IceEnum;
     635              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
    635636              else if (strcmp(name,"Input")==0) return InputEnum;
    636637              else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
    … …  
    751752              else if (strcmp(name,"SmbGdn")==0) return SmbGdnEnum;
    752753              else if (strcmp(name,"SmbGdnini")==0) return SmbGdniniEnum;
    753               else if (strcmp(name,"SmbGsp")==0) return SmbGspEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"SmbGspini")==0) return SmbGspiniEnum;
     757              if (strcmp(name,"SmbGsp")==0) return SmbGspEnum;
     758              else if (strcmp(name,"SmbGspini")==0) return SmbGspiniEnum;
    758759              else if (strcmp(name,"SmbHref")==0) return SmbHrefEnum;
    759760              else if (strcmp(name,"SmbIsInitialized")==0) return SmbIsInitializedEnum;
    … …  
    874875              else if (strcmp(name,"WaterfractionDrainageIntegrated")==0) return WaterfractionDrainageIntegratedEnum;
    875876              else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
    876               else if (strcmp(name,"Waterheight")==0) return WaterheightEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
     880              if (strcmp(name,"Waterheight")==0) return WaterheightEnum;
     881              else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
    881882              else if (strcmp(name,"Outputdefinition1")==0) return Outputdefinition1Enum;
    882883              else if (strcmp(name,"Outputdefinition10")==0) return Outputdefinition10Enum;
    … …  
    997998              else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
    998999              else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
    999               else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
     1003              if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
     1004              else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
    10041005              else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
    10051006              else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
    … …  
    11201121              else if (strcmp(name,"HydrologyShaktiAnalysis")==0) return HydrologyShaktiAnalysisEnum;
    11211122              else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;
    1122               else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
     1126              if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
     1127              else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
    11271128              else if (strcmp(name,"Hydrologypism")==0) return HydrologypismEnum;
    11281129              else if (strcmp(name,"Hydrologyshakti")==0) return HydrologyshaktiEnum;
    … …  
    12431244              else if (strcmp(name,"P2")==0) return P2Enum;
    12441245              else if (strcmp(name,"P2bubble")==0) return P2bubbleEnum;
    1245               else if (strcmp(name,"P2bubblecondensed")==0) return P2bubblecondensedEnum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
     1249              if (strcmp(name,"P2bubblecondensed")==0) return P2bubblecondensedEnum;
     1250              else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
    12501251              else if (strcmp(name,"P2xP4")==0) return P2xP4Enum;
    12511252              else if (strcmp(name,"Paterson")==0) return PatersonEnum;
    … …  
    13661367              else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
    13671368              else if (strcmp(name,"StressTensor")==0) return StressTensorEnum;
    1368               else if (strcmp(name,"StressbalanceViscosityOvershoot")==0) return StressbalanceViscosityOvershootEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"SubelementMigration4")==0) return SubelementMigration4Enum;
     1372              if (strcmp(name,"StressbalanceViscosityOvershoot")==0) return StressbalanceViscosityOvershootEnum;
     1373              else if (strcmp(name,"SubelementMigration4")==0) return SubelementMigration4Enum;
    13731374              else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
    13741375              else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
Note: See TracChangeset for help on using the changeset viewer.