Changeset 24019


Ignore:
Timestamp:
06/14/19 02:31:05 (6 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added BasalStress as Enums for requested 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

    r24018 r24019  
    461461syn keyword cConstant BasalforcingsPicoSubShelfOceanSalinityEnum
    462462syn keyword cConstant BasalforcingsPicoSubShelfOceanTempEnum
     463syn keyword cConstant BasalStressxEnum
     464syn keyword cConstant BasalStressyEnum
     465syn keyword cConstant BasalStressEnum
    463466syn keyword cConstant BaseEnum
    464467syn keyword cConstant BaseSlopeXEnum

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

    r23999 r24019  
    457457        BasalforcingsPicoSubShelfOceanSalinityEnum,
    458458        BasalforcingsPicoSubShelfOceanTempEnum,
     459        BasalStressxEnum,
     460        BasalStressyEnum,
     461        BasalStressEnum,
    459462        BaseEnum,
    460463        BaseSlopeXEnum,

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

    r23999 r24019  
    463463                case BasalforcingsPicoSubShelfOceanSalinityEnum : return "BasalforcingsPicoSubShelfOceanSalinity";
    464464                case BasalforcingsPicoSubShelfOceanTempEnum : return "BasalforcingsPicoSubShelfOceanTemp";
     465                case BasalStressxEnum : return "BasalStressx";
     466                case BasalStressyEnum : return "BasalStressy";
     467                case BasalStressEnum : return "BasalStress";
    465468                case BaseEnum : return "Base";
    466469                case BaseSlopeXEnum : return "BaseSlopeX";

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

    r23999 r24019  
    472472              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
    473473              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
     474              else if (strcmp(name,"BasalStressx")==0) return BasalStressxEnum;
     475              else if (strcmp(name,"BasalStressy")==0) return BasalStressyEnum;
     476              else if (strcmp(name,"BasalStress")==0) return BasalStressEnum;
    474477              else if (strcmp(name,"Base")==0) return BaseEnum;
    475478              else if (strcmp(name,"BaseSlopeX")==0) return BaseSlopeXEnum;
    … …  
    503506              else if (strcmp(name,"DeviatoricStress1")==0) return DeviatoricStress1Enum;
    504507              else if (strcmp(name,"DeviatoricStress2")==0) return DeviatoricStress2Enum;
    505               else if (strcmp(name,"DistanceToCalvingfront")==0) return DistanceToCalvingfrontEnum;
    506               else if (strcmp(name,"DistanceToGroundingline")==0) return DistanceToGroundinglineEnum;
    507               else if (strcmp(name,"Domain2Dhorizontal")==0) return Domain2DhorizontalEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum;
     511              if (strcmp(name,"DistanceToCalvingfront")==0) return DistanceToCalvingfrontEnum;
     512              else if (strcmp(name,"DistanceToGroundingline")==0) return DistanceToGroundinglineEnum;
     513              else if (strcmp(name,"Domain2Dhorizontal")==0) return Domain2DhorizontalEnum;
     514              else if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum;
    512515              else if (strcmp(name,"Domain3D")==0) return Domain3DEnum;
    513516              else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
    … …  
    626629              else if (strcmp(name,"Node")==0) return NodeEnum;
    627630              else if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum;
    628               else if (strcmp(name,"P0")==0) return P0Enum;
    629               else if (strcmp(name,"P1")==0) return P1Enum;
    630               else if (strcmp(name,"Pressure")==0) return PressureEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"RheologyBAbsGradient")==0) return RheologyBAbsGradientEnum;
     634              if (strcmp(name,"P0")==0) return P0Enum;
     635              else if (strcmp(name,"P1")==0) return P1Enum;
     636              else if (strcmp(name,"Pressure")==0) return PressureEnum;
     637              else if (strcmp(name,"RheologyBAbsGradient")==0) return RheologyBAbsGradientEnum;
    635638              else if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum;
    636639              else if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum;
    … …  
    749752              else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum;
    750753              else if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum;
    751               else if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum;
    752               else if (strcmp(name,"SmbZY")==0) return SmbZYEnum;
    753               else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
     757              if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum;
     758              else if (strcmp(name,"SmbZY")==0) return SmbZYEnum;
     759              else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
     760              else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
    758761              else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
    759762              else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
    … …  
    872875              else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
    873876              else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
    874               else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
    875               else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
    876               else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
     880              if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
     881              else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
     882              else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
     883              else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
    881884              else if (strcmp(name,"Outputdefinition67")==0) return Outputdefinition67Enum;
    882885              else if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum;
    … …  
    995998              else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
    996999              else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
    997               else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
    998               else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;
    999               else if (strcmp(name,"EsaTransitions")==0) return EsaTransitionsEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
     1003              if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
     1004              else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;
     1005              else if (strcmp(name,"EsaTransitions")==0) return EsaTransitionsEnum;
     1006              else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
    10041007              else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
    10051008              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
    … …  
    11181121              else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
    11191122              else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
    1120               else if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
    1121               else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
    1122               else if (strcmp(name,"Melange")==0) return MelangeEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
     1126              if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
     1127              else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
     1128              else if (strcmp(name,"Melange")==0) return MelangeEnum;
     1129              else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
    11271130              else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
    11281131              else if (strcmp(name,"MeshX")==0) return MeshXEnum;
    … …  
    12411244              else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
    12421245              else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
    1243               else if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum;
    1244               else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
    1245               else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
     1249              if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum;
     1250              else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
     1251              else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
     1252              else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
    12501253              else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
    12511254              else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
Note: See TracChangeset for help on using the changeset viewer.