Changeset 23947


Ignore:
Timestamp:
05/29/19 15:03:16 (6 years ago)
Author:
felicity
Message:

BUG: GlaDS hydrology model enums

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

Legend:

Unmodified
Added
Removed

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

    r23946 r23947  
    150150        GroundinglineFrictionInterpolationEnum,
    151151        GroundinglineMeltInterpolationEnum,
     152        HydrologyBumpSpacingEnum,
     153        HydrologyCavitySpacingEnum,
    152154        HydrologydcEplflipLockEnum,
    153155        HydrologydcEplThickCompEnum,
    … …  
    173175        HydrologydcUnconfinedFlagEnum,
    174176        HydrologydtEnum,
     177        HydrologyIschannelsEnum,
     178        HydrologyChannelConductivityEnum,
     179        HydrologyChannelSheetWidthEnum,
     180        HydrologyEnglacialVoidRatioEnum,
    175181        HydrologyModelEnum,
    176182        HydrologyNumRequestedOutputsEnum,
     183        HydrologyPressureMeltCoefficientEnum,
    177184        HydrologyRelaxationEnum,
    178185        HydrologyRequestedOutputsEnum,
    … …  
    539546        HydraulicPotentialOldEnum,
    540547        HydrologyBasalFluxEnum,
     548        HydrologyBumpHeightEnum,
    541549        HydrologySheetThicknessEnum,
    542         HydrologyBumpHeightEnum,
    543         HydrologyBumpSpacingEnum,
    544550        HydrologydcBasalMoulinInputEnum,
    545551        HydrologydcEplThicknessHydrostepEnum,
    … …  
    550556        HydrologydcMaskThawedNodeEnum,
    551557        HydrologydcSedimentTransmitivityEnum,
    552         HydrologySheetConductivityEnum,
    553         HydrologyPressureMeltCoefficientEnum,
    554         HydrologyCavitySpacingEnum,
    555         HydrologyIschannelsEnum,
    556         HydrologyChannelConductivityEnum,
    557         HydrologyChannelSheetWidthEnum,
    558         HydrologyEnglacialVoidRatioEnum,
    559558        HydrologyEnglacialInputEnum,
    560559        HydrologydcEplThicknessStackedEnum,
    … …  
    566565        HydrologyNeumannfluxEnum,
    567566        HydrologyReynoldsEnum,
     567        HydrologySheetConductivityEnum,
    568568        HydrologyWaterVxEnum,
    569569        HydrologyWaterVyEnum,

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

    r23946 r23947  
    158158                case GroundinglineFrictionInterpolationEnum : return "GroundinglineFrictionInterpolation";
    159159                case GroundinglineMeltInterpolationEnum : return "GroundinglineMeltInterpolation";
     160                case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing";
     161                case HydrologyCavitySpacingEnum : return "HydrologyCavitySpacing";
    160162                case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock";
    161163                case HydrologydcEplThickCompEnum : return "HydrologydcEplThickComp";
    … …  
    181183                case HydrologydcUnconfinedFlagEnum : return "HydrologydcUnconfinedFlag";
    182184                case HydrologydtEnum : return "Hydrologydt";
     185                case HydrologyIschannelsEnum : return "HydrologyIschannels";
     186                case HydrologyChannelConductivityEnum : return "HydrologyChannelConductivity";
     187                case HydrologyChannelSheetWidthEnum : return "HydrologyChannelSheetWidth";
     188                case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio";
    183189                case HydrologyModelEnum : return "HydrologyModel";
    184190                case HydrologyNumRequestedOutputsEnum : return "HydrologyNumRequestedOutputs";
     191                case HydrologyPressureMeltCoefficientEnum : return "HydrologyPressureMeltCoefficient";
    185192                case HydrologyRelaxationEnum : return "HydrologyRelaxation";
    186193                case HydrologyRequestedOutputsEnum : return "HydrologyRequestedOutputs";
    … …  
    545552                case HydraulicPotentialOldEnum : return "HydraulicPotentialOld";
    546553                case HydrologyBasalFluxEnum : return "HydrologyBasalFlux";
     554                case HydrologyBumpHeightEnum : return "HydrologyBumpHeight";
    547555                case HydrologySheetThicknessEnum : return "HydrologySheetThickness";
    548                 case HydrologyBumpHeightEnum : return "HydrologyBumpHeight";
    549                 case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing";
    550556                case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput";
    551557                case HydrologydcEplThicknessHydrostepEnum : return "HydrologydcEplThicknessHydrostep";
    … …  
    556562                case HydrologydcMaskThawedNodeEnum : return "HydrologydcMaskThawedNode";
    557563                case HydrologydcSedimentTransmitivityEnum : return "HydrologydcSedimentTransmitivity";
    558                 case HydrologySheetConductivityEnum : return "HydrologySheetConductivity";
    559                 case HydrologyPressureMeltCoefficientEnum : return "HydrologyPressureMeltCoefficient";
    560                 case HydrologyCavitySpacingEnum : return "HydrologyCavitySpacing";
    561                 case HydrologyIschannelsEnum : return "HydrologyIschannels";
    562                 case HydrologyChannelConductivityEnum : return "HydrologyChannelConductivity";
    563                 case HydrologyChannelSheetWidthEnum : return "HydrologyChannelSheetWidth";
    564                 case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio";
    565564                case HydrologyEnglacialInputEnum : return "HydrologyEnglacialInput";
    566565                case HydrologydcEplThicknessStackedEnum : return "HydrologydcEplThicknessStacked";
    … …  
    572571                case HydrologyNeumannfluxEnum : return "HydrologyNeumannflux";
    573572                case HydrologyReynoldsEnum : return "HydrologyReynolds";
     573                case HydrologySheetConductivityEnum : return "HydrologySheetConductivity";
    574574                case HydrologyWaterVxEnum : return "HydrologyWaterVx";
    575575                case HydrologyWaterVyEnum : return "HydrologyWaterVy";

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

    r23946 r23947  
    161161              else if (strcmp(name,"GroundinglineFrictionInterpolation")==0) return GroundinglineFrictionInterpolationEnum;
    162162              else if (strcmp(name,"GroundinglineMeltInterpolation")==0) return GroundinglineMeltInterpolationEnum;
     163              else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum;
     164              else if (strcmp(name,"HydrologyCavitySpacing")==0) return HydrologyCavitySpacingEnum;
    163165              else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
    164166              else if (strcmp(name,"HydrologydcEplThickComp")==0) return HydrologydcEplThickCompEnum;
    … …  
    184186              else if (strcmp(name,"HydrologydcUnconfinedFlag")==0) return HydrologydcUnconfinedFlagEnum;
    185187              else if (strcmp(name,"Hydrologydt")==0) return HydrologydtEnum;
     188              else if (strcmp(name,"HydrologyIschannels")==0) return HydrologyIschannelsEnum;
     189              else if (strcmp(name,"HydrologyChannelConductivity")==0) return HydrologyChannelConductivityEnum;
     190              else if (strcmp(name,"HydrologyChannelSheetWidth")==0) return HydrologyChannelSheetWidthEnum;
     191              else if (strcmp(name,"HydrologyEnglacialVoidRatio")==0) return HydrologyEnglacialVoidRatioEnum;
    186192              else if (strcmp(name,"HydrologyModel")==0) return HydrologyModelEnum;
    187193              else if (strcmp(name,"HydrologyNumRequestedOutputs")==0) return HydrologyNumRequestedOutputsEnum;
     194              else if (strcmp(name,"HydrologyPressureMeltCoefficient")==0) return HydrologyPressureMeltCoefficientEnum;
    188195              else if (strcmp(name,"HydrologyRelaxation")==0) return HydrologyRelaxationEnum;
    189196              else if (strcmp(name,"HydrologyRequestedOutputs")==0) return HydrologyRequestedOutputsEnum;
    … …  
    253260              else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
    254261              else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
    255               else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
     262         else stage=3;
     263   }
     264   if(stage==3){
     265              if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
    256266              else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
    257267              else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    … …  
    260270              else if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum;
    261271              else if (strcmp(name,"MaterialsEffectiveconductivityAveraging")==0) return MaterialsEffectiveconductivityAveragingEnum;
    262          else stage=3;
    263    }
    264    if(stage==3){
    265               if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
     272              else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
    266273              else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
    267274              else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
    … …  
    376383              else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum;
    377384              else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum;
    378               else if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum;
    379389              else if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum;
    380390              else if (strcmp(name,"SmoothThicknessMultiplier")==0) return SmoothThicknessMultiplierEnum;
    … …  
    383393              else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    384394              else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
     395              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    389396              else if (strcmp(name,"Step")==0) return StepEnum;
    390397              else if (strcmp(name,"StressbalanceAbstol")==0) return StressbalanceAbstolEnum;
    … …  
    499506              else if (strcmp(name,"DistanceToGroundingline")==0) return DistanceToGroundinglineEnum;
    500507              else if (strcmp(name,"Domain2Dhorizontal")==0) return Domain2DhorizontalEnum;
    501               else if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum;
     508         else stage=5;
     509   }
     510   if(stage==5){
     511              if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum;
    502512              else if (strcmp(name,"Domain3D")==0) return Domain3DEnum;
    503513              else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
    … …  
    506516              else if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum;
    507517              else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
    508          else stage=5;
    509    }
    510    if(stage==5){
    511               if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
     518              else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
    512519              else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
    513520              else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
    … …  
    557564              else if (strcmp(name,"HydraulicPotentialOld")==0) return HydraulicPotentialOldEnum;
    558565              else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
     566              else if (strcmp(name,"HydrologyBumpHeight")==0) return HydrologyBumpHeightEnum;
    559567              else if (strcmp(name,"HydrologySheetThickness")==0) return HydrologySheetThicknessEnum;
    560               else if (strcmp(name,"HydrologyBumpHeight")==0) return HydrologyBumpHeightEnum;
    561               else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum;
    562568              else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
    563569              else if (strcmp(name,"HydrologydcEplThicknessHydrostep")==0) return HydrologydcEplThicknessHydrostepEnum;
    … …  
    568574              else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
    569575              else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
    570               else if (strcmp(name,"HydrologySheetConductivity")==0) return HydrologySheetConductivityEnum;
    571               else if (strcmp(name,"HydrologyPressureMeltCoefficient")==0) return HydrologyPressureMeltCoefficientEnum;
    572               else if (strcmp(name,"HydrologyCavitySpacing")==0) return HydrologyCavitySpacingEnum;
    573               else if (strcmp(name,"HydrologyIschannels")==0) return HydrologyIschannelsEnum;
    574               else if (strcmp(name,"HydrologyChannelConductivity")==0) return HydrologyChannelConductivityEnum;
    575               else if (strcmp(name,"HydrologyChannelSheetWidth")==0) return HydrologyChannelSheetWidthEnum;
    576               else if (strcmp(name,"HydrologyEnglacialVoidRatio")==0) return HydrologyEnglacialVoidRatioEnum;
    577576              else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum;
    578577              else if (strcmp(name,"HydrologydcEplThicknessStacked")==0) return HydrologydcEplThicknessStackedEnum;
    … …  
    584583              else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
    585584              else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum;
     585              else if (strcmp(name,"HydrologySheetConductivity")==0) return HydrologySheetConductivityEnum;
    586586              else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
    587587              else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
Note: See TracChangeset for help on using the changeset viewer.