Changeset 27684


Ignore:
Timestamp:
04/10/23 12:09:36 (2 years ago)
Author:
dlcheng
Message:

CHG: Adding Weights Vx/Vy/Melt and basal forcings floating/grounded ice melting rate enums.

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

Legend:

Unmodified
Added
Removed

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

    r27652 r27684  
    708708syn keyword cConstant BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum
    709709syn keyword cConstant BasalforcingsFloatingiceMeltingRateEnum
     710syn keyword cConstant BasalforcingsFloatingiceMeltingRateObsEnum
    710711syn keyword cConstant BasalforcingsGeothermalfluxEnum
    711712syn keyword cConstant BasalforcingsGroundediceMeltingRateEnum
     713syn keyword cConstant BasalforcingsGroundediceMeltingRateObsEnum
    712714syn keyword cConstant BasalforcingsLinearBasinIdEnum
    713715syn keyword cConstant BasalforcingsPerturbationMeltingRateEnum
    … …  
    12381240syn keyword cConstant WaterPressureValuesMovingaverageEnum
    12391241syn keyword cConstant WeightsLevelsetObservationEnum
     1242syn keyword cConstant WeightsMeltObservationEnum
     1243syn keyword cConstant WeightsVxObservationEnum
     1244syn keyword cConstant WeightsVyObservationEnum
    12401245syn keyword cConstant WeightsSurfaceObservationEnum
    12411246syn keyword cConstant OldAccumulatedDeltaBottomPressureEnum

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

    r27652 r27684  
    704704        BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum,
    705705        BasalforcingsFloatingiceMeltingRateEnum,
     706        BasalforcingsFloatingiceMeltingRateObsEnum,
    706707        BasalforcingsGeothermalfluxEnum,
    707708        BasalforcingsGroundediceMeltingRateEnum,
     709        BasalforcingsGroundediceMeltingRateObsEnum,
    708710        BasalforcingsLinearBasinIdEnum,
    709711        BasalforcingsPerturbationMeltingRateEnum,
    … …  
    12351237   WaterPressureValuesMovingaverageEnum,
    12361238        WeightsLevelsetObservationEnum,
     1239        WeightsMeltObservationEnum,
     1240        WeightsVxObservationEnum,
     1241        WeightsVyObservationEnum,
    12371242        WeightsSurfaceObservationEnum,
    12381243        OldAccumulatedDeltaBottomPressureEnum,

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

    r27652 r27684  
    710710                case BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum : return "BasalforcingsDeepwaterMeltingRateValuesMovingaverage";
    711711                case BasalforcingsFloatingiceMeltingRateEnum : return "BasalforcingsFloatingiceMeltingRate";
     712                case BasalforcingsFloatingiceMeltingRateObsEnum : return "BasalforcingsFloatingiceMeltingRateObs";
    712713                case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux";
    713714                case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate";
     715                case BasalforcingsGroundediceMeltingRateObsEnum : return "BasalforcingsGroundediceMeltingRateObs";
    714716                case BasalforcingsLinearBasinIdEnum : return "BasalforcingsLinearBasinId";
    715717                case BasalforcingsPerturbationMeltingRateEnum : return "BasalforcingsPerturbationMeltingRate";
    … …  
    12401242                case WaterPressureValuesMovingaverageEnum : return "WaterPressureValuesMovingaverage";
    12411243                case WeightsLevelsetObservationEnum : return "WeightsLevelsetObservation";
     1244                case WeightsMeltObservationEnum : return "WeightsMeltObservation";
     1245                case WeightsVxObservationEnum : return "WeightsVxObservation";
     1246                case WeightsVyObservationEnum : return "WeightsVyObservation";
    12421247                case WeightsSurfaceObservationEnum : return "WeightsSurfaceObservation";
    12431248                case OldAccumulatedDeltaBottomPressureEnum : return "OldAccumulatedDeltaBottomPressure";

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

    r27652 r27684  
    701701syn keyword juliaConstC BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum
    702702syn keyword juliaConstC BasalforcingsFloatingiceMeltingRateEnum
     703syn keyword juliaConstC BasalforcingsFloatingiceMeltingRateObsEnum
    703704syn keyword juliaConstC BasalforcingsGeothermalfluxEnum
    704705syn keyword juliaConstC BasalforcingsGroundediceMeltingRateEnum
     706syn keyword juliaConstC BasalforcingsGroundediceMeltingRateObsEnum
    705707syn keyword juliaConstC BasalforcingsLinearBasinIdEnum
    706708syn keyword juliaConstC BasalforcingsPerturbationMeltingRateEnum
    … …  
    12311233syn keyword juliaConstC WaterPressureValuesMovingaverageEnum
    12321234syn keyword juliaConstC WeightsLevelsetObservationEnum
     1235syn keyword juliaConstC WeightsMeltObservationEnum
     1236syn keyword juliaConstC WeightsVxObservationEnum
     1237syn keyword juliaConstC WeightsVyObservationEnum
    12331238syn keyword juliaConstC WeightsSurfaceObservationEnum
    12341239syn keyword juliaConstC OldAccumulatedDeltaBottomPressureEnum

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

    r27652 r27684  
    725725              else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateValuesMovingaverage")==0) return BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum;
    726726              else if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum;
     727              else if (strcmp(name,"BasalforcingsFloatingiceMeltingRateObs")==0) return BasalforcingsFloatingiceMeltingRateObsEnum;
    727728              else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
    728729              else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
     730              else if (strcmp(name,"BasalforcingsGroundediceMeltingRateObs")==0) return BasalforcingsGroundediceMeltingRateObsEnum;
    729731              else if (strcmp(name,"BasalforcingsLinearBasinId")==0) return BasalforcingsLinearBasinIdEnum;
    730732              else if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum;
    … …  
    832834              else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum;
    833835              else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
    834               else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
     836              else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
     837         else stage=7;
     838   }
     839   if(stage==7){
     840              if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
    835841              else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum;
    836842              else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
    … …  
    960966              else if (strcmp(name,"RadarAttenuationMacGregor")==0) return RadarAttenuationMacGregorEnum;
    961967              else if (strcmp(name,"RadarAttenuationWolff")==0) return RadarAttenuationWolffEnum;
    962               else if (strcmp(name,"RadarIcePeriod")==0) return RadarIcePeriodEnum;
     968              else if (strcmp(name,"RadarPowerWolff")==0) return RadarPowerWolffEnum;
     969         else stage=8;
     970   }
     971   if(stage==8){
     972              if (strcmp(name,"RadarIcePeriod")==0) return RadarIcePeriodEnum;
    963973              else if (strcmp(name,"RadarPowerMacGregor")==0) return RadarPowerMacGregorEnum;
    964974              else if (strcmp(name,"RadarPowerWolff")==0) return RadarPowerWolffEnum;
    … …  
    10891099              else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
    10901100              else if (strcmp(name,"SmbDswdiffrf")==0) return SmbDswdiffrfEnum;
    1091               else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
     1101              else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
     1102         else stage=9;
     1103   }
     1104   if(stage==9){
     1105              if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
    10921106              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
    10931107              else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
    … …  
    12291243              else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
    12301244              else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
    1231               else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
     1245              else if (strcmp(name,"ThicknessOld")==0) return ThicknessOldEnum;
     1246         else stage=10;
     1247   }
     1248   if(stage==10){
     1249              if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
    12321250              else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
    12331251              else if (strcmp(name,"ThicknessOld")==0) return ThicknessOldEnum;
    … …  
    12701288              else if (strcmp(name,"WaterPressureValuesMovingaverage")==0) return WaterPressureValuesMovingaverageEnum;
    12711289              else if (strcmp(name,"WeightsLevelsetObservation")==0) return WeightsLevelsetObservationEnum;
     1290              else if (strcmp(name,"WeightsMeltObservation")==0) return WeightsMeltObservationEnum;
     1291              else if (strcmp(name,"WeightsVxObservation")==0) return WeightsVxObservationEnum;
     1292              else if (strcmp(name,"WeightsVyObservation")==0) return WeightsVyObservationEnum;
    12721293              else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
    12731294              else if (strcmp(name,"OldAccumulatedDeltaBottomPressure")==0) return OldAccumulatedDeltaBottomPressureEnum;
    … …  
    13541375              else if (strcmp(name,"Outputdefinition81")==0) return Outputdefinition81Enum;
    13551376              else if (strcmp(name,"Outputdefinition82")==0) return Outputdefinition82Enum;
    1356               else if (strcmp(name,"Outputdefinition83")==0) return Outputdefinition83Enum;
     1377         else stage=11;
     1378   }
     1379   if(stage==11){
     1380              if (strcmp(name,"Outputdefinition83")==0) return Outputdefinition83Enum;
    13571381              else if (strcmp(name,"Outputdefinition84")==0) return Outputdefinition84Enum;
    13581382              else if (strcmp(name,"Outputdefinition85")==0) return Outputdefinition85Enum;
    … …  
    14791503              else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
    14801504              else if (strcmp(name,"FemModel")==0) return FemModelEnum;
    1481               else if (strcmp(name,"FileParam")==0) return FileParamEnum;
     1505         else stage=12;
     1506   }
     1507   if(stage==12){
     1508              if (strcmp(name,"FileParam")==0) return FileParamEnum;
    14821509              else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum;
    14831510              else if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum;
    … …  
    16071634              else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
    16081635              else if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
    1609               else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
     1636         else stage=13;
     1637   }
     1638   if(stage==13){
     1639              if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
    16101640              else if (strcmp(name,"Melange")==0) return MelangeEnum;
    16111641              else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
    … …  
    17311761              else if (strcmp(name,"StringParam")==0) return StringParamEnum;
    17321762              else if (strcmp(name,"SubelementFriction1")==0) return SubelementFriction1Enum;
    1733               else if (strcmp(name,"SubelementFriction2")==0) return SubelementFriction2Enum;
     1763         else stage=14;
     1764   }
     1765   if(stage==14){
     1766              if (strcmp(name,"SubelementFriction2")==0) return SubelementFriction2Enum;
    17341767              else if (strcmp(name,"SubelementMelt1")==0) return SubelementMelt1Enum;
    17351768              else if (strcmp(name,"SubelementMelt2")==0) return SubelementMelt2Enum;
Note: See TracChangeset for help on using the changeset viewer.