Index: /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (revision 27912) +++ /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (revision 27913) @@ -183,4 +183,5 @@ parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.melt_flag",HydrologyMeltFlagEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.channel_sheet_width",HydrologyChannelSheetWidthEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.islaminar",HydrologyIsLaminarEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.englacial_void_ratio",HydrologyEnglacialVoidRatioEnum)); Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27912) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27913) @@ -265,4 +265,5 @@ syn keyword cConstant HydrologyEnglacialVoidRatioEnum syn keyword cConstant HydrologyIschannelsEnum +syn keyword cConstant HydrologyIsLaminarEnum syn keyword cConstant HydrologyIsWaterPressureArmaEnum syn keyword cConstant HydrologyMeltFlagEnum Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27912) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27913) @@ -259,4 +259,5 @@ HydrologyEnglacialVoidRatioEnum, HydrologyIschannelsEnum, + HydrologyIsLaminarEnum, HydrologyIsWaterPressureArmaEnum, HydrologyMeltFlagEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27912) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27913) @@ -267,4 +267,5 @@ case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio"; case HydrologyIschannelsEnum : return "HydrologyIschannels"; + case HydrologyIsLaminarEnum : return "HydrologyIsLaminar"; case HydrologyIsWaterPressureArmaEnum : return "HydrologyIsWaterPressureArma"; case HydrologyMeltFlagEnum : return "HydrologyMeltFlag"; Index: /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27912) +++ /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27913) @@ -258,4 +258,5 @@ syn keyword juliaConstC HydrologyEnglacialVoidRatioEnum syn keyword juliaConstC HydrologyIschannelsEnum +syn keyword juliaConstC HydrologyIsLaminarEnum syn keyword juliaConstC HydrologyIsWaterPressureArmaEnum syn keyword juliaConstC HydrologyMeltFlagEnum Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27912) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27913) @@ -273,4 +273,5 @@ else if (strcmp(name,"HydrologyEnglacialVoidRatio")==0) return HydrologyEnglacialVoidRatioEnum; else if (strcmp(name,"HydrologyIschannels")==0) return HydrologyIschannelsEnum; + else if (strcmp(name,"HydrologyIsLaminar")==0) return HydrologyIsLaminarEnum; else if (strcmp(name,"HydrologyIsWaterPressureArma")==0) return HydrologyIsWaterPressureArmaEnum; else if (strcmp(name,"HydrologyMeltFlag")==0) return HydrologyMeltFlagEnum; @@ -382,9 +383,9 @@ else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum; else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum; - else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum; + if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum; + else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum; else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum; else if (strcmp(name,"MaterialsEarthDensity")==0) return MaterialsEarthDensityEnum; @@ -505,9 +506,9 @@ else if (strcmp(name,"SolidearthSettingsRunFrequency")==0) return SolidearthSettingsRunFrequencyEnum; else if (strcmp(name,"SolidearthSettingsTimeAcc")==0) return SolidearthSettingsTimeAccEnum; - else if (strcmp(name,"SolidearthSettingsHoriz")==0) return SolidearthSettingsHorizEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"SolidearthSettingsMaxiter")==0) return SolidearthSettingsMaxiterEnum; + if (strcmp(name,"SolidearthSettingsHoriz")==0) return SolidearthSettingsHorizEnum; + else if (strcmp(name,"SolidearthSettingsMaxiter")==0) return SolidearthSettingsMaxiterEnum; else if (strcmp(name,"SolidearthSettingsGrdOcean")==0) return SolidearthSettingsGrdOceanEnum; else if (strcmp(name,"SolidearthSettingsOceanAreaScaling")==0) return SolidearthSettingsOceanAreaScalingEnum; @@ -628,9 +629,9 @@ else if (strcmp(name,"SmbSWgrad")==0) return SmbSWgradEnum; else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum; - else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"SmbTcIdx")==0) return SmbTcIdxEnum; + if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum; + else if (strcmp(name,"SmbTcIdx")==0) return SmbTcIdxEnum; else if (strcmp(name,"SmbTeThresh")==0) return SmbTeThreshEnum; else if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum; @@ -751,9 +752,9 @@ else if (strcmp(name,"BasalforcingsSpatialUpperwaterElevation")==0) return BasalforcingsSpatialUpperwaterElevationEnum; else if (strcmp(name,"BasalforcingsSpatialUpperwaterMeltingRate")==0) return BasalforcingsSpatialUpperwaterMeltingRateEnum; - else if (strcmp(name,"BasalforcingsIsmip6BasinId")==0) return BasalforcingsIsmip6BasinIdEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"BasalforcingsIsmip6Tf")==0) return BasalforcingsIsmip6TfEnum; + if (strcmp(name,"BasalforcingsIsmip6BasinId")==0) return BasalforcingsIsmip6BasinIdEnum; + else if (strcmp(name,"BasalforcingsIsmip6Tf")==0) return BasalforcingsIsmip6TfEnum; else if (strcmp(name,"BasalforcingsIsmip6TfShelf")==0) return BasalforcingsIsmip6TfShelfEnum; else if (strcmp(name,"BasalforcingsIsmip6MeltAnomaly")==0) return BasalforcingsIsmip6MeltAnomalyEnum; @@ -874,9 +875,9 @@ else if (strcmp(name,"FrictionTillFrictionAngle")==0) return FrictionTillFrictionAngleEnum; else if (strcmp(name,"FrictionWaterLayer")==0) return FrictionWaterLayerEnum; - else if (strcmp(name,"FrictionWaterPressure")==0) return FrictionWaterPressureEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"FrictionWaterPressureNoise")==0) return FrictionWaterPressureNoiseEnum; + if (strcmp(name,"FrictionWaterPressure")==0) return FrictionWaterPressureEnum; + else if (strcmp(name,"FrictionWaterPressureNoise")==0) return FrictionWaterPressureNoiseEnum; else if (strcmp(name,"Frictionf")==0) return FrictionfEnum; else if (strcmp(name,"FrontalForcingsBasinId")==0) return FrontalForcingsBasinIdEnum; @@ -997,9 +998,9 @@ else if (strcmp(name,"SatGraviGRD")==0) return SatGraviGRDEnum; else if (strcmp(name,"SealevelBarystaticMask")==0) return SealevelBarystaticMaskEnum; - else if (strcmp(name,"SealevelBarystaticIceMask")==0) return SealevelBarystaticIceMaskEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"SealevelBarystaticIceWeights")==0) return SealevelBarystaticIceWeightsEnum; + if (strcmp(name,"SealevelBarystaticIceMask")==0) return SealevelBarystaticIceMaskEnum; + else if (strcmp(name,"SealevelBarystaticIceWeights")==0) return SealevelBarystaticIceWeightsEnum; else if (strcmp(name,"SealevelBarystaticIceArea")==0) return SealevelBarystaticIceAreaEnum; else if (strcmp(name,"SealevelBarystaticIceLatbar")==0) return SealevelBarystaticIceLatbarEnum; @@ -1120,9 +1121,9 @@ else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum; else if (strcmp(name,"SmbFAC")==0) return SmbFACEnum; - else if (strcmp(name,"SmbGdn")==0) return SmbGdnEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"SmbGdnini")==0) return SmbGdniniEnum; + if (strcmp(name,"SmbGdn")==0) return SmbGdnEnum; + else if (strcmp(name,"SmbGdnini")==0) return SmbGdniniEnum; else if (strcmp(name,"SmbGsp")==0) return SmbGspEnum; else if (strcmp(name,"SmbGspini")==0) return SmbGspiniEnum; @@ -1243,9 +1244,9 @@ else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum; else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum; - else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum; else stage=11; } if(stage==11){ - if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; + if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum; + else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; @@ -1366,9 +1367,9 @@ else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum; else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum; - else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum; else stage=12; } if(stage==12){ - if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum; + if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum; + else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum; else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum; else if (strcmp(name,"Outputdefinition67")==0) return Outputdefinition67Enum; @@ -1489,9 +1490,9 @@ else if (strcmp(name,"Dense")==0) return DenseEnum; else if (strcmp(name,"DependentObject")==0) return DependentObjectEnum; - else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum; else stage=13; } if(stage==13){ - if (strcmp(name,"DeviatoricStressErrorEstimator")==0) return DeviatoricStressErrorEstimatorEnum; + if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum; + else if (strcmp(name,"DeviatoricStressErrorEstimator")==0) return DeviatoricStressErrorEstimatorEnum; else if (strcmp(name,"Divergence")==0) return DivergenceEnum; else if (strcmp(name,"Domain3Dsurface")==0) return Domain3DsurfaceEnum; @@ -1612,9 +1613,9 @@ else if (strcmp(name,"LoveKf")==0) return LoveKfEnum; else if (strcmp(name,"LoveKt")==0) return LoveKtEnum; - else if (strcmp(name,"LoveLf")==0) return LoveLfEnum; else stage=14; } if(stage==14){ - if (strcmp(name,"LoveLt")==0) return LoveLtEnum; + if (strcmp(name,"LoveLf")==0) return LoveLfEnum; + else if (strcmp(name,"LoveLt")==0) return LoveLtEnum; else if (strcmp(name,"LoveTidalHt")==0) return LoveTidalHtEnum; else if (strcmp(name,"LoveTidalKt")==0) return LoveTidalKtEnum; @@ -1735,9 +1736,9 @@ else if (strcmp(name,"Scaled")==0) return ScaledEnum; else if (strcmp(name,"SealevelAbsolute")==0) return SealevelAbsoluteEnum; - else if (strcmp(name,"SealevelEmotion")==0) return SealevelEmotionEnum; else stage=15; } if(stage==15){ - if (strcmp(name,"SealevelchangePolarMotionX")==0) return SealevelchangePolarMotionXEnum; + if (strcmp(name,"SealevelEmotion")==0) return SealevelEmotionEnum; + else if (strcmp(name,"SealevelchangePolarMotionX")==0) return SealevelchangePolarMotionXEnum; else if (strcmp(name,"SealevelchangePolarMotionY")==0) return SealevelchangePolarMotionYEnum; else if (strcmp(name,"SealevelchangePolarMotionZ")==0) return SealevelchangePolarMotionZEnum; Index: /issm/trunk-jpl/src/m/classes/hydrologyglads.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyglads.m (revision 27912) +++ /issm/trunk-jpl/src/m/classes/hydrologyglads.m (revision 27913) @@ -16,4 +16,5 @@ channel_conductivity = NaN; channel_sheet_width = 0.; + islaminar = 0; %Other @@ -50,4 +51,5 @@ self.channel_conductivity = 5.e-2; %Dow's default, Table uses 0.1 self.channel_sheet_width = 2.; %m + self.islaminar = 0; %by default use GlaDS default turbulent code %Other @@ -73,4 +75,5 @@ md = checkfield(md,'fieldname','hydrology.channel_conductivity','size',[md.mesh.numberofvertices 1],'>=',0,'NaN',1,'Inf',1); md = checkfield(md,'fieldname','hydrology.channel_sheet_width','numel',[1],'>=',0); + md = checkfield(md,'fieldname','hydrology.islaminar','numel',[1],'values',[0 1]); %Other @@ -95,4 +98,6 @@ fielddisplay(self,'ischannels','Do we allow for channels? 1: yes, 0: no'); fielddisplay(self,'channel_conductivity','channel conductivity (k_c) [m^(3/2) kg^(-1/2)]'); + fielddisplay(self,'channel_sheet_width','channel sheet width [m]'); + fielddisplay(self,'islaminar','do we use laminar [1] or turbulent physics [0, default]'); disp(sprintf(' OTHER')); fielddisplay(self,'spcphi','Hydraulic potential Dirichlet constraints [Pa]'); @@ -120,4 +125,5 @@ WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_conductivity','format','DoubleMat','mattype',1); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_sheet_width','format','Double'); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','islaminar','format','Boolean'); %Others Index: /issm/trunk-jpl/src/m/classes/hydrologyglads.py =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyglads.py (revision 27912) +++ /issm/trunk-jpl/src/m/classes/hydrologyglads.py (revision 27913) @@ -24,4 +24,5 @@ self.channel_conductivity = np.nan self.channel_sheet_width = 0. + self.islaminar = 0 # Other @@ -53,4 +54,6 @@ s += '{}\n'.format(fielddisplay(self, 'ischannels', 'Do we allow for channels? 1: yes, 0: no')) s += '{}\n'.format(fielddisplay(self, 'channel_conductivity', 'channel conductivity (k_c) [m^(3 / 2) kg^(- 1 / 2)]')) + s += '{}\n'.format(fielddisplay(self, 'channel_sheet_width', 'channel sheet width [m]')) + s += '{}\n'.format(fielddisplay(self, 'islaminar','do we use laminar [1] or turbulent physics [0, default]')) s = '\t--OTHER\n' s += '{}\n'.format(fielddisplay(self, 'spcphi', 'Hydraulic potential Dirichlet constraints [Pa]')) @@ -88,4 +91,5 @@ self.channel_conductivity = 5.e-2 #Dow's default, Table uses 0.1 self.channel_sheet_width = 2. #m + self.islaminar = 0 #by default use turbulent physics # Other @@ -112,4 +116,5 @@ md = checkfield(md, 'fieldname', 'hydrology.channel_conductivity', 'size', [md.mesh.numberofvertices], '>', 0) md = checkfield(md, 'fieldname', 'hydrology.channel_sheet_width', 'numel', [1], '>=', 0) + md = checkfield(md, 'fieldname', 'hydrology.islaminar', 'numel', [1], 'values', [0, 1]) # Other @@ -139,4 +144,5 @@ WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'channel_conductivity', 'format', 'DoubleMat', 'mattype', 1) WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'channel_sheet_width', 'format', 'Double') + WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'islaminar', 'format', 'Boolean') # Others