Changeset 25467


Ignore:
Timestamp:
08/25/20 13:56:36 (5 years ago)
Author:
Mathieu Morlighem
Message:

CHG: adding more controls as output

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

Legend:

Unmodified
Added
Removed

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

    r25454 r25467  
    477477syn keyword cConstant BalancethicknessOmega0Enum
    478478syn keyword cConstant BalancethicknessOmegaEnum
     479syn keyword cConstant BalancethicknessSpcthicknessEnum
    479480syn keyword cConstant BalancethicknessThickeningRateEnum
    480481syn keyword cConstant BasalCrevasseEnum
    … …  
    987988syn keyword cConstant BalancethicknessSoftSolutionEnum
    988989syn keyword cConstant BalancethicknessSolutionEnum
    989 syn keyword cConstant BalancethicknessSpcthicknessEnum
    990990syn keyword cConstant BalancevelocityAnalysisEnum
    991991syn keyword cConstant BalancevelocitySolutionEnum
    … …  
    10861086syn keyword cConstant Gradient2Enum
    10871087syn keyword cConstant Gradient3Enum
     1088syn keyword cConstant Gradient4Enum
    10881089syn keyword cConstant GroundedAreaEnum
    10891090syn keyword cConstant GroundedAreaScaledEnum

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

    r25379 r25467  
    473473        BalancethicknessOmega0Enum,
    474474        BalancethicknessOmegaEnum,
     475        BalancethicknessSpcthicknessEnum,
    475476        BalancethicknessThickeningRateEnum,
    476477        BasalCrevasseEnum,
    … …  
    986987        BalancethicknessSoftSolutionEnum,
    987988        BalancethicknessSolutionEnum,
    988         BalancethicknessSpcthicknessEnum,
    989989        BalancevelocityAnalysisEnum,
    990990        BalancevelocitySolutionEnum,
    … …  
    10851085        Gradient2Enum,
    10861086        Gradient3Enum,
     1087        Gradient4Enum,
    10871088        GroundedAreaEnum,
    10881089        GroundedAreaScaledEnum,

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

    r25379 r25467  
    479479                case BalancethicknessOmega0Enum : return "BalancethicknessOmega0";
    480480                case BalancethicknessOmegaEnum : return "BalancethicknessOmega";
     481                case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
    481482                case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate";
    482483                case BasalCrevasseEnum : return "BasalCrevasse";
    … …  
    989990                case BalancethicknessSoftSolutionEnum : return "BalancethicknessSoftSolution";
    990991                case BalancethicknessSolutionEnum : return "BalancethicknessSolution";
    991                 case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
    992992                case BalancevelocityAnalysisEnum : return "BalancevelocityAnalysis";
    993993                case BalancevelocitySolutionEnum : return "BalancevelocitySolution";
    … …  
    10881088                case Gradient2Enum : return "Gradient2";
    10891089                case Gradient3Enum : return "Gradient3";
     1090                case Gradient4Enum : return "Gradient4";
    10901091                case GroundedAreaEnum : return "GroundedArea";
    10911092                case GroundedAreaScaledEnum : return "GroundedAreaScaled";

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

    r25379 r25467  
    488488              else if (strcmp(name,"BalancethicknessOmega0")==0) return BalancethicknessOmega0Enum;
    489489              else if (strcmp(name,"BalancethicknessOmega")==0) return BalancethicknessOmegaEnum;
     490              else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
    490491              else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
    491492              else if (strcmp(name,"BasalCrevasse")==0) return BasalCrevasseEnum;
    … …  
    505506              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
    506507              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
    507               else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"BasalStressx")==0) return BasalStressxEnum;
     511              if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
     512              else if (strcmp(name,"BasalStressx")==0) return BasalStressxEnum;
    512513              else if (strcmp(name,"BasalStressy")==0) return BasalStressyEnum;
    513514              else if (strcmp(name,"BasalStress")==0) return BasalStressEnum;
    … …  
    628629              else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
    629630              else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
    630               else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
     634              if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
     635              else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
    635636              else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum;
    636637              else if (strcmp(name,"HydrologyGapHeight")==0) return HydrologyGapHeightEnum;
    … …  
    751752              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
    752753              else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
    753               else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
     757              if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
     758              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
    758759              else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
    759760              else if (strcmp(name,"SmbEC")==0) return SmbECEnum;
    … …  
    874875              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    875876              else if (strcmp(name,"Vy")==0) return VyEnum;
    876               else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"VyObs")==0) return VyObsEnum;
     880              if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
     881              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
    881882              else if (strcmp(name,"Vz")==0) return VzEnum;
    882883              else if (strcmp(name,"VzFS")==0) return VzFSEnum;
    … …  
    997998              else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
    998999              else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
    999               else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
     1003              if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
     1004              else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
    10041005              else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum;
    10051006              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    … …  
    10131014              else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
    10141015              else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
    1015               else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
    10161016              else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
    10171017              else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
    … …  
    11121112              else if (strcmp(name,"Gradient2")==0) return Gradient2Enum;
    11131113              else if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
     1114              else if (strcmp(name,"Gradient4")==0) return Gradient4Enum;
    11141115              else if (strcmp(name,"GroundedArea")==0) return GroundedAreaEnum;
    11151116              else if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum;
    … …  
    11201121              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
    11211122              else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
    1122               else if (strcmp(name,"Hook")==0) return HookEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
     1126              if (strcmp(name,"Hook")==0) return HookEnum;
     1127              else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
    11271128              else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
    11281129              else if (strcmp(name,"HydrologyGlaDSAnalysis")==0) return HydrologyGlaDSAnalysisEnum;
    … …  
    12431244              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    12441245              else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
    1245               else if (strcmp(name,"P1xP3")==0) return P1xP3Enum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"P1xP4")==0) return P1xP4Enum;
     1249              if (strcmp(name,"P1xP3")==0) return P1xP3Enum;
     1250              else if (strcmp(name,"P1xP4")==0) return P1xP4Enum;
    12501251              else if (strcmp(name,"P2")==0) return P2Enum;
    12511252              else if (strcmp(name,"P2bubble")==0) return P2bubbleEnum;
    … …  
    13661367              else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
    13671368              else if (strcmp(name,"SealevelObs")==0) return SealevelObsEnum;
    1368               else if (strcmp(name,"SealevelWeights")==0) return SealevelWeightsEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
     1372              if (strcmp(name,"SealevelWeights")==0) return SealevelWeightsEnum;
     1373              else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
    13731374              else if (strcmp(name,"StressTensor")==0) return StressTensorEnum;
    13741375              else if (strcmp(name,"StressbalanceViscosityOvershoot")==0) return StressbalanceViscosityOvershootEnum;
Note: See TracChangeset for help on using the changeset viewer.