Index: /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp	(revision 11822)
+++ /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp	(revision 11823)
@@ -18,43 +18,20 @@
 
 	/*intermediary*/
-	double time;
-	int    nsteps;
-	double starttime,final_time;
-	double dt;
-	double melting_offset;
 	bool   control_analysis;
 	int    solution_type;
 
 	//first recover parameters common to all solutions
-	femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum);
-	femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum);
-	femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
 	femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum);
 	femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
 
-	/*Compute number of time steps: */
-	if((dt==0)|| (final_time==0)){
-		dt=0;
-		nsteps=1;
+	/*call enthalpy_core_step: */
+	enthalpy_core_step(femmodel);
+
+	if(solution_type==EnthalpySolutionEnum && !control_analysis){
+		_printf_(VerboseSolution(),"   saving results\n");
+		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum);
+		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum);
+		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterfractionEnum);
 	}
-	else nsteps=(int)((final_time-starttime)/dt);
-	time=starttime;
 
-	/*Loop through time: */
-	for(i=0;i<nsteps;i++){
-		
-		if(nsteps)_printf_(VerboseSolution(),"time step: %i/%i\n",i+1,nsteps);
-		time+=dt;
-
-		/*call enthalpy_core_step: */
-		enthalpy_core_step(femmodel,i,time);
-
-		if(solution_type==EnthalpySolutionEnum && !control_analysis){
-			_printf_(VerboseSolution(),"   saving results\n");
-			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i+1,time);
-			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,i+1,time);
-			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterfractionEnum,i+1,time);
-		}
-
-	}
 }
Index: /issm/trunk-jpl/src/c/solutions/solutions.h
===================================================================
--- /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 11822)
+++ /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 11823)
@@ -22,5 +22,5 @@
 void thermal_core_step(FemModel* femmodel,int step=0, double time=0);
 void enthalpy_core(FemModel* femmodel);
-void enthalpy_core_step(FemModel* femmodel,int step, double time);
+void enthalpy_core_step(FemModel* femmodel,int step=0, double time=0);
 void surfaceslope_core(FemModel* femmodel);
 void bedslope_core(FemModel* femmodel);
Index: /issm/trunk-jpl/src/m/solutions/enthalpy_core.m
===================================================================
--- /issm/trunk-jpl/src/m/solutions/enthalpy_core.m	(revision 11822)
+++ /issm/trunk-jpl/src/m/solutions/enthalpy_core.m	(revision 11823)
@@ -6,30 +6,15 @@
 
 	%recover parameters common to all solutions
-	ndt=femmodel.parameters.TimesteppingFinalTime;
-	dt=femmodel.parameters.TimesteppingTimeStep;
 	control_analysis=femmodel.parameters.InversionIscontrol;
 	solution_type=femmodel.parameters.SolutionType;
 
-	%Compute number of timesteps
-	if (dt==0 | ndt==0),
-		dt=0;
-		nsteps=1;
-	else
-		nsteps=floor(ndt/dt);
-	end
+	issmprintf(VerboseSolution,'\n%s',['   computing enthalpy']);
+	femmodel=enthalpy_core_step(femmodel); 
 
-	%Loop through time
-	for i=1:nsteps,
-		issmprintf(VerboseSolution,'\n%s%i/%i\n','time step: ',i,nsteps);
-		time=(i+1)*dt;
-
-		femmodel=enthalpy_core_step(femmodel,i,time); 
-
-		if (solution_type==EnthalpySolutionEnum & ~control_analysis),
-			issmprintf(VerboseSolution,'\n%s',['   saving results']);
-			femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,EnthalpyEnum,i,time);
-			femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,i,time);
-			femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,WaterfractionEnum,i,time);
-		end
+	if (solution_type==EnthalpySolutionEnum & ~control_analysis),
+		issmprintf(VerboseSolution,'\n%s',['   saving results']);
+		femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,EnthalpyEnum);
+		femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum);
+		femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,WaterfractionEnum);
 	end
 
Index: /issm/trunk-jpl/src/m/solutions/thermal_core.m
===================================================================
--- /issm/trunk-jpl/src/m/solutions/thermal_core.m	(revision 11822)
+++ /issm/trunk-jpl/src/m/solutions/thermal_core.m	(revision 11823)
@@ -7,6 +7,4 @@
 
 	%recover parameters common to all solutions
-	ndt=femmodel.parameters.TimesteppingFinalTime;
-	dt=femmodel.parameters.TimesteppingTimeStep;
 	control_analysis=femmodel.parameters.InversionIscontrol;
 	solution_type=femmodel.parameters.SolutionType;