Index: /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp	(revision 23947)
+++ /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp	(revision 23948)
@@ -70,5 +70,6 @@
 	}
 	iomodel->FetchDataToInput(elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
-
+	iomodel->FetchDataToInput(elements,"md.mask.groundedice_levelset",MaskGroundediceLevelsetEnum);
+	iomodel->FetchDataToInput(elements,"md.hydrology.bump_height",HydrologyBumpHeightEnum);
 	iomodel->FetchDataToInput(elements,"md.hydrology.sheet_conductivity",HydrologySheetConductivityEnum);
 	iomodel->FetchDataToInput(elements,"md.initialization.watercolumn",HydrologySheetThicknessEnum);
@@ -106,5 +107,4 @@
 	parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.pressure_melt_coefficient",HydrologyPressureMeltCoefficientEnum));
 	parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.cavity_spacing",HydrologyCavitySpacingEnum));
-	parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.bump_height",HydrologyBumpHeightEnum));
 	parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.ischannels",HydrologyIschannelsEnum));
 	parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.channel_conductivity",HydrologyChannelConductivityEnum));
@@ -155,5 +155,5 @@
 	element->FindParam(&dt,TimesteppingTimeStepEnum);
 	element->FindParam(&c_t,HydrologyPressureMeltCoefficientEnum);
-	element->FindParam(&k,HydrologySheetConductivityEnum);
+	Input* k_input   = element->GetInput(HydrologySheetConductivityEnum);_assert_(k_input);
 	Input* phi_input = element->GetInput(HydraulicPotentialEnum);      _assert_(phi_input);
 	Input* h_input   = element->GetInput(HydrologySheetThicknessEnum); _assert_(h_input);
@@ -170,4 +170,5 @@
 		phi_input->GetInputDerivativeValue(&dphi[0],xyz_list,gauss);
 		h_input->GetInputValue(&h,gauss);
+		k_input->GetInputValue(&k,gauss);
 
 		/*Get norm of gradient of hydraulic potential and make sure it is >0*/
@@ -201,5 +202,5 @@
 
 	/*Intermediaries */
-	IssmDouble  Jdet,w,v,vx,vy,ub,h,N;
+	IssmDouble  Jdet,w,v,vx,vy,ub,h,N,h_r;
 	IssmDouble  G,m,frictionheat,alpha2;
 	IssmDouble  A,B,n;
@@ -215,8 +216,8 @@
 	/*Retrieve all inputs and parameters*/
 	element->GetVerticesCoordinates(&xyz_list);
-	IssmDouble  h_r     = element->FindParam(HydrologyBumpHeightEnum);
-	IssmDouble  l_r     = element->FindParam(HydrologyBumpSpacingEnum);
 	IssmDouble  L       = element->FindParam(MaterialsLatentheatEnum);
 	IssmDouble  rho_ice = element->FindParam(MaterialsRhoIceEnum);
+	IssmDouble l_r      = element->FindParam(HydrologyCavitySpacingEnum);
+	Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input);
 	Input* vx_input = element->GetInput(VxEnum);_assert_(vx_input);
 	Input* vy_input = element->GetInput(VyEnum);_assert_(vy_input);
@@ -246,4 +247,5 @@
 		n_input->GetInputValue(&n,gauss);
 		N_input->GetInputValue(&N,gauss);
+		hr_input->GetInputValue(&h_r,gauss);
 
 		/*Get basal velocity*/
@@ -359,5 +361,5 @@
 
 	/*Intermediaries */
-	IssmDouble  Jdet,w,v,vx,vy,ub,h_old,N;
+	IssmDouble  Jdet,w,v,vx,vy,ub,h_old,N,h_r;
 	IssmDouble  A,B,n;
 
@@ -369,7 +371,7 @@
 
 	/*Retrieve all inputs and parameters*/
-	IssmDouble  h_r = element->FindParam(HydrologyBumpHeightEnum);
-	IssmDouble  l_r = element->FindParam(HydrologyBumpSpacingEnum);
 	IssmDouble  dt  = element->FindParam(TimesteppingTimeStepEnum);
+	IssmDouble  l_r = element->FindParam(HydrologyCavitySpacingEnum);
+	Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input);
 	Input* vx_input = element->GetInput(VxEnum);_assert_(vx_input);
 	Input* vy_input = element->GetInput(VyEnum);_assert_(vy_input);
@@ -391,4 +393,5 @@
 		n_input->GetInputValue(&n,gauss);
 		N_input->GetInputValue(&N,gauss);
+		hr_input->GetInputValue(&h_r,gauss);
 
 		/*Get basal velocity*/
Index: /issm/trunk-jpl/src/c/cores/hydrology_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/hydrology_core.cpp	(revision 23947)
+++ /issm/trunk-jpl/src/c/cores/hydrology_core.cpp	(revision 23948)
@@ -192,5 +192,5 @@
 
 	/*Using the GlaDS model*/
-	else if (hydrology_model==HydrologyGlaDSAnalysisEnum){
+	else if (hydrology_model==HydrologyGlaDSEnum){
 		femmodel->SetCurrentConfiguration(HydrologyGlaDSAnalysisEnum);
 		InputDuplicatex(femmodel,HydraulicPotentialEnum,HydraulicPotentialOldEnum);