Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 27293)
+++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 27294)
@@ -3900,11 +3900,13 @@
 IssmDouble Penta::TimeAdapt(void){/*{{{*/
 
 	/*intermediary: */
+	bool       ishydro;
 	IssmDouble C;
 	IssmDouble xyz_list[NUMVERTICES][3];
 
 	/*get CFL coefficient:*/
 	this->parameters->FindParam(&C,TimesteppingCflCoefficientEnum);
+	this->parameters->FindParam(&ishydro,TransientIshydrologyEnum);
 
 	/*Get for Vx and Vy, the max of abs value: */
 	Input* vx_input = this->GetInput(VxEnum); _assert_(vx_input);
@@ -3939,6 +3941,20 @@
 	/*CFL criterion: */
 	IssmDouble dt = C/(maxabsvx/dx+maxabsvy/dy+maxabsvz/dz + 1.e-18);
 
+	/*Check hydro timestep also and take the minimum*/
+	if(ishydro){
+		if(IsOnBase()){
+			Input* vx_input = this->GetInput(HydrologyWaterVxEnum); _assert_(vx_input);
+			Input* vy_input = this->GetInput(HydrologyWaterVyEnum); _assert_(vy_input);
+			IssmDouble maxabsvx = vx_input->GetInputMaxAbs();
+			IssmDouble maxabsvy = vy_input->GetInputMaxAbs();
+
+			/*CFL criterion: */
+			IssmDouble dt2 = C/(maxabsvx/dx+maxabsvy/dy + 1.e-18);
+			if(dt2<dt) dt = dt2;
+		}
+	}
+
 	return dt;
 }/*}}}*/
 IssmDouble Penta::TotalCalvingFluxLevelset(bool scaled){/*{{{*/
Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 27293)
+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 27294)
@@ -5252,11 +5252,13 @@
 IssmDouble Tria::TimeAdapt(void){/*{{{*/
 
 	/*intermediary: */
+	bool       ishydro;
 	IssmDouble C;
 	IssmDouble xyz_list[NUMVERTICES][3];
 
 	/*get CFL coefficient:*/
 	this->parameters->FindParam(&C,TimesteppingCflCoefficientEnum);
+	this->parameters->FindParam(&ishydro,TransientIshydrologyEnum);
 
 	/*Get for Vx and Vy, the max of abs value: */
 	Input* vx_input = this->GetInput(VxEnum); _assert_(vx_input);
@@ -5284,6 +5286,18 @@
 	/*CFL criterion: */
 	IssmDouble dt = C/(maxabsvx/dx+maxabsvy/dy + 1.e-18);
 
+	/*Check hydro timestep also and take the minimum*/
+	if(ishydro){
+		Input* vx_input = this->GetInput(HydrologyWaterVxEnum); _assert_(vx_input);
+		Input* vy_input = this->GetInput(HydrologyWaterVyEnum); _assert_(vy_input);
+		IssmDouble maxabsvx = vx_input->GetInputMaxAbs();
+		IssmDouble maxabsvy = vy_input->GetInputMaxAbs();
+
+		/*CFL criterion: */
+		IssmDouble dt2 = C/(maxabsvx/dx+maxabsvy/dy + 1.e-18);
+		if(dt2<dt) dt = dt2;
+	}
+
 	return dt;
 }
 /*}}}*/