Index: /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (revision 24060) +++ /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (revision 24061) @@ -115,4 +115,5 @@ iomodel->FetchDataToInput(elements,"md.geometry.bed",BedEnum); iomodel->FetchDataToInput(elements,"md.basalforcings.geothermalflux",BasalforcingsGeothermalfluxEnum); + iomodel->FetchDataToInput(elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum); if(iomodel->domaintype!=Domain2DhorizontalEnum){ iomodel->FetchDataToInput(elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum); @@ -161,4 +162,5 @@ parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.cavity_spacing",HydrologyCavitySpacingEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.ischannels",HydrologyIschannelsEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.melt_flag",HydrologyMeltFlagEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.channel_conductivity",HydrologyChannelConductivityEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.channel_sheet_width",HydrologyChannelSheetWidthEnum)); @@ -315,4 +317,6 @@ /*Retrieve all inputs and parameters*/ + bool meltflag; + element->FindParam(&meltflag,HydrologyMeltFlagEnum); element->GetVerticesCoordinates(&xyz_list); IssmDouble L = element->FindParam(MaterialsLatentheatEnum); @@ -330,4 +334,5 @@ Input* b_input = element->GetInput(BedEnum); _assert_(b_input); Input* G_input = element->GetInput(BasalforcingsGeothermalfluxEnum);_assert_(G_input); + Input* m_input = element->GetInput(BasalforcingsGroundediceMeltingRateEnum);_assert_(G_input); Input* B_input = element->GetInput(MaterialsRheologyBEnum); _assert_(B_input); Input* n_input = element->GetInput(MaterialsRheologyNEnum); _assert_(n_input); @@ -357,4 +362,5 @@ b_input->GetInputValue(&b,gauss); H_input->GetInputValue(&H,gauss); + m_input->GetInputValue(&m,gauss); /*Get basal velocity*/ @@ -370,5 +376,7 @@ /*Compute melt*/ - m = (G + frictionheat)/(rho_ice*L); + if(!meltflag){ + m = (G + frictionheat)/(rho_ice*L); + } /*Compute closing rate*/ Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24060) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24061) @@ -162,4 +162,5 @@ syn keyword cConstant HydrologyEnglacialVoidRatioEnum syn keyword cConstant HydrologyIschannelsEnum +syn keyword cConstant HydrologyMeltFlagEnum syn keyword cConstant HydrologyModelEnum syn keyword cConstant HydrologyNumRequestedOutputsEnum Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24060) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24061) @@ -156,4 +156,5 @@ HydrologyEnglacialVoidRatioEnum, HydrologyIschannelsEnum, + HydrologyMeltFlagEnum, HydrologyModelEnum, HydrologyNumRequestedOutputsEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24060) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24061) @@ -164,4 +164,5 @@ case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio"; case HydrologyIschannelsEnum : return "HydrologyIschannels"; + case HydrologyMeltFlagEnum : return "HydrologyMeltFlag"; case HydrologyModelEnum : return "HydrologyModel"; case HydrologyNumRequestedOutputsEnum : return "HydrologyNumRequestedOutputs"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24060) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24061) @@ -167,4 +167,5 @@ else if (strcmp(name,"HydrologyEnglacialVoidRatio")==0) return HydrologyEnglacialVoidRatioEnum; else if (strcmp(name,"HydrologyIschannels")==0) return HydrologyIschannelsEnum; + else if (strcmp(name,"HydrologyMeltFlag")==0) return HydrologyMeltFlagEnum; else if (strcmp(name,"HydrologyModel")==0) return HydrologyModelEnum; else if (strcmp(name,"HydrologyNumRequestedOutputs")==0) return HydrologyNumRequestedOutputsEnum; @@ -259,9 +260,9 @@ else if (strcmp(name,"MaterialsMantleShearModulus")==0) return MaterialsMantleShearModulusEnum; else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; - else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; + if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; + else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; else if (strcmp(name,"MaterialsRhoFreshwater")==0) return MaterialsRhoFreshwaterEnum; @@ -382,9 +383,9 @@ else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum; else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum; - else if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum; + if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum; + else if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum; else if (strcmp(name,"SmoothThicknessMultiplier")==0) return SmoothThicknessMultiplierEnum; else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum; @@ -505,9 +506,9 @@ else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum; else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum; - else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; + if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum; + else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; else if (strcmp(name,"DeviatoricStress1")==0) return DeviatoricStress1Enum; @@ -628,9 +629,9 @@ else if (strcmp(name,"MeshVertexonboundary")==0) return MeshVertexonboundaryEnum; else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; - else if (strcmp(name,"Misfit")==0) return MisfitEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum; + if (strcmp(name,"Misfit")==0) return MisfitEnum; + else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum; else if (strcmp(name,"NewDamage")==0) return NewDamageEnum; else if (strcmp(name,"Node")==0) return NodeEnum; @@ -751,9 +752,9 @@ else if (strcmp(name,"SmbV")==0) return SmbVEnum; else if (strcmp(name,"SmbVmean")==0) return SmbVmeanEnum; - else if (strcmp(name,"SmbVz")==0) return SmbVzEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"SmbW")==0) return SmbWEnum; + if (strcmp(name,"SmbVz")==0) return SmbVzEnum; + else if (strcmp(name,"SmbW")==0) return SmbWEnum; else if (strcmp(name,"SmbWini")==0) return SmbWiniEnum; else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum; @@ -874,9 +875,9 @@ else if (strcmp(name,"Outputdefinition57")==0) return Outputdefinition57Enum; else if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum; - else if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum; else stage=8; } if(stage==8){ - if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum; + if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum; + else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum; else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum; else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum; @@ -997,9 +998,9 @@ else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum; else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum; - else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"Element")==0) return ElementEnum; + if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; + else if (strcmp(name,"Element")==0) return ElementEnum; else if (strcmp(name,"ElementHook")==0) return ElementHookEnum; else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum; @@ -1120,9 +1121,9 @@ else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum; else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum; - else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; + if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum; + else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum; else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; @@ -1243,9 +1244,9 @@ else if (strcmp(name,"SubelementMelt2")==0) return SubelementMelt2Enum; else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum; - else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; else stage=11; } if(stage==11){ - if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; + if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; + else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; else if (strcmp(name,"Tetra")==0) return TetraEnum; else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; Index: /issm/trunk-jpl/src/m/classes/hydrologyglads.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyglads.m (revision 24060) +++ /issm/trunk-jpl/src/m/classes/hydrologyglads.m (revision 24061) @@ -23,4 +23,5 @@ englacial_void_ratio = 0.; requested_outputs = {}; + melt_flag = 0; end methods @@ -53,4 +54,5 @@ self.englacial_void_ratio = 1.e-5;% Dow's default, Table from Werder et al. uses 1e-3; self.requested_outputs={'default'}; + self.melt_flag=false; end % }}} function md = checkconsistency(self,md,solution,analyses) % {{{ @@ -78,4 +80,8 @@ md = checkfield(md,'fieldname','hydrology.neumannflux','timeseries',1,'NaN',1,'Inf',1); md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1); + md = checkfield(md,'fieldname','hydrology.melt_flag','numel',[1],'values',[0 1]); + if self.melt_flag + md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1); + end end % }}} function disp(self) % {{{ @@ -95,4 +101,5 @@ fielddisplay(self,'englacial_void_ratio','englacial void ratio (e_v)'); fielddisplay(self,'requested_outputs','additional outputs requested'); + fielddisplay(self,'melt_flag','User specified basal melt? 0: no (default), 1: use md.basalforcings.groundedice_melting_rate'); end % }}} function marshall(self,prefix,md,fid) % {{{ @@ -119,4 +126,5 @@ WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','moulin_input','format','DoubleMat','mattype',1); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','englacial_void_ratio','format','Double'); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','melt_flag','format','Boolean'); outputs = self.requested_outputs; pos = find(ismember(outputs,'default'));