Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 14539)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 14540)
@@ -446,6 +446,5 @@
 					      ./modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp\
 					      ./modules/ModelProcessorx/Hydrology/CreateLoadsHydrology.cpp \
-						  ./solutions/hydrology_core.cpp\
-						  ./solutions/hydrology_core_step.cpp 
+						  ./solutions/hydrology_core.cpp
 #}}}
 #Diagnostic sources  {{{
Index: /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp	(revision 14539)
+++ /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp	(revision 14540)
@@ -10,4 +10,5 @@
 #include "./solutions.h"
 #include "../modules/modules.h"
+#include "../include/include.h"
 #include "../solvers/solvers.h"
 
@@ -17,10 +18,10 @@
 
 	/*intermediary*/
-	IssmDouble time;
-	int    nsteps;
+	int        nsteps;
+	int        output_frequency;
+	bool       save_results;
+	bool       modify_loads=true;
 	IssmDouble starttime,final_time;
-	IssmDouble dt;
-	bool   save_results;
-	int    output_frequency;
+	IssmDouble time,dt;
 
 	//first recover parameters common to all solutions
@@ -49,12 +50,17 @@
 		femmodel->parameters->SetParam(time,TimeEnum);
 
-		/*call hydrology_core step: */
-		hydrology_core_step(femmodel,i,time);
+		/*Compute hydrology solution: */
+		if(VerboseSolution()) _pprintLine_("   computing water column");
+		femmodel->SetCurrentConfiguration(HydrologyAnalysisEnum);
+		solver_nonlinear(femmodel,modify_loads);
+
+		/*transfer water column thickness to old water column thickness: */
+		InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum,WaterColumnOldEnum);
 
 		if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
 			if(VerboseSolution()) _pprintLine_("   saving results ");
-			//InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum,i+1,time);
-			//InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVxEnum,i+1,time);
-			//InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVyEnum,i+1,time);
+			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum);
+			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVxEnum);
+			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVyEnum);
 
 			/*unload results*/
Index: sm/trunk-jpl/src/c/solutions/hydrology_core_step.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/hydrology_core_step.cpp	(revision 14539)
+++ 	(revision )
@@ -1,26 +1,0 @@
-/*!\file: hydrology_core_step.cpp
- * \brief: core of the hydrology solution 
- */ 
-
-#include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/shared.h"
-#include "../io/io.h"
-#include "../EnumDefinitions/EnumDefinitions.h"
-#include "./solutions.h"
-#include "../modules/modules.h"
-#include "../include/include.h"
-#include "../solvers/solvers.h"
-
-void hydrology_core_step(FemModel* femmodel,int step, IssmDouble time){
-
-	bool modify_loads=true;
-
-	if(VerboseSolution()) _pprintLine_("   computing water column");
-	femmodel->SetCurrentConfiguration(HydrologyAnalysisEnum);
-	solver_nonlinear(femmodel,modify_loads);
-
-	/*transfer water column thickness to old water column thickness: */
-	InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum,WaterColumnOldEnum);
-
-}
Index: /issm/trunk-jpl/src/c/solutions/solutions.h
===================================================================
--- /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 14539)
+++ /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 14540)
@@ -19,5 +19,4 @@
 void diagnostic_core(FemModel* femmodel);
 void hydrology_core(FemModel* femmodel);
-void hydrology_core_step(FemModel* femmodel,int step, IssmDouble time);
 void thermal_core(FemModel* femmodel);
 void enthalpy_core(FemModel* femmodel);