Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 11829)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 11830)
@@ -394,7 +394,5 @@
 
 thermal_psources = ./solutions/thermal_core.cpp\
-					    ./solutions/thermal_core_step.cpp\
 					    ./solutions/enthalpy_core.cpp\
-					    ./solutions/enthalpy_core_step.cpp\
 					    ./solvers/solver_thermal_nonlinear.cpp
 #}}}
Index: /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp	(revision 11829)
+++ /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp	(revision 11830)
@@ -17,12 +17,14 @@
 	/*intermediary*/
 	bool   save_results;
-	int    solution_type;
 
 	//first recover parameters common to all solutions
 	femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
-	femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
 
-	/*call enthalpy_core_step: */
-	enthalpy_core_step(femmodel);
+	_printf_(VerboseSolution(),"   computing enthalpy\n");
+	femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum);
+	solver_nonlinear(femmodel,true);
+
+	/*transfer enthalpy to enthalpy picard for the next step: */
+	InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,EnthalpyPicardEnum);
 
 	if(save_results){
Index: sm/trunk-jpl/src/c/solutions/enthalpy_core_step.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/enthalpy_core_step.cpp	(revision 11829)
+++ 	(revision )
@@ -1,26 +1,0 @@
-/*!\file: enthalpy_core_step.cpp
- * \brief: core of the enthalpy solution 
- */ 
-
-#include "../toolkits/toolkits.h"
-#include "../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 enthalpy_core_step(FemModel* femmodel,int step, double time){
-	
-	bool modify_loads=true;
-
-	_printf_(VerboseSolution(),"   computing enthalpy\n");
-	femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum);
-	solver_nonlinear(femmodel,modify_loads);
-
-	/*transfer enthalpy to enthalpy picard for the next step: */
-	InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,EnthalpyPicardEnum);
-
-}
Index: /issm/trunk-jpl/src/c/solutions/solutions.h
===================================================================
--- /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 11829)
+++ /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 11830)
@@ -20,7 +20,5 @@
 void hydrology_core_step(FemModel* femmodel,int step, double time);
 void thermal_core(FemModel* femmodel);
-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=0, double time=0);
 void surfaceslope_core(FemModel* femmodel);
 void bedslope_core(FemModel* femmodel);
Index: /issm/trunk-jpl/src/c/solutions/thermal_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/thermal_core.cpp	(revision 11829)
+++ /issm/trunk-jpl/src/c/solutions/thermal_core.cpp	(revision 11830)
@@ -18,5 +18,4 @@
 	double melting_offset;
 	bool   save_results;
-	int    solution_type;
 	bool   dakota_analysis  = false;
 
@@ -30,6 +29,11 @@
 	}
 
-	/*call thermal_core_step: */
-	thermal_core_step(femmodel);
+	_printf_(VerboseSolution(),"   computing temperatures\n");
+	femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);
+	solver_thermal_nonlinear(femmodel);
+
+	_printf_(VerboseSolution(),"   computing melting\n");
+	femmodel->SetCurrentConfiguration(MeltingAnalysisEnum);
+	solver_linear(femmodel);
 
 	if(save_results){
Index: sm/trunk-jpl/src/c/solutions/thermal_core_step.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/thermal_core_step.cpp	(revision 11829)
+++ 	(revision )
@@ -1,24 +1,0 @@
-/*!\file: thermal_core_step.cpp
- * \brief: core of the thermal solution 
- */ 
-
-#include "../toolkits/toolkits.h"
-#include "../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 thermal_core_step(FemModel* femmodel,int step, double time){
-
-	_printf_(VerboseSolution(),"   computing temperatures\n");
-	femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);
-	solver_thermal_nonlinear(femmodel);
-
-	_printf_(VerboseSolution(),"   computing melting\n");
-	femmodel->SetCurrentConfiguration(MeltingAnalysisEnum);
-	solver_linear(femmodel);
-}
Index: /issm/trunk-jpl/src/c/solutions/transient_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/transient_core.cpp	(revision 11829)
+++ /issm/trunk-jpl/src/c/solutions/transient_core.cpp	(revision 11830)
@@ -96,11 +96,11 @@
 
 		if(isthermal && dim==3){
-			_printf_(VerboseSolution(),"   computing temperatures:\n");
+			_printf_(VerboseSolution(),"   computing temperatures\n");
 			#ifdef _HAVE_THERMAL_
 			if(isenthalpy==0){
-				thermal_core_step(femmodel,step,time);
+				thermal_core(femmodel);
 			}
 			else{
-				enthalpy_core_step(femmodel,step,time);
+				enthalpy_core(femmodel);
 			}
 			#else
Index: /issm/trunk-jpl/src/m/model/plot/plot_section.m
===================================================================
--- /issm/trunk-jpl/src/m/model/plot/plot_section.m	(revision 11829)
+++ /issm/trunk-jpl/src/m/model/plot/plot_section.m	(revision 11830)
@@ -111,8 +111,7 @@
 
 			%plot section value
-			hold on;
-			subplot(nlines,ncols,index1)
-			%subplot(1,3,[2 3])
+			if(i==1), subplot(nlines,ncols,index1); end
 			plot(s,data_s,'color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
+			hold on
 
 
Index: /issm/trunk-jpl/src/m/solutions/enthalpy_core.m
===================================================================
--- /issm/trunk-jpl/src/m/solutions/enthalpy_core.m	(revision 11829)
+++ /issm/trunk-jpl/src/m/solutions/enthalpy_core.m	(revision 11830)
@@ -10,5 +10,6 @@
 
 	issmprintf(VerboseSolution,'\n%s',['   computing enthalpy']);
-	femmodel=enthalpy_core_step(femmodel); 
+	femmodel=SetCurrentConfiguration(femmodel,EnthalpyAnalysisEnum);
+	femmodel=solver_nonlinear(femmodel,true);
 
 	if (save_results),
Index: sm/trunk-jpl/src/m/solutions/enthalpy_core_step.m
===================================================================
--- /issm/trunk-jpl/src/m/solutions/enthalpy_core_step.m	(revision 11829)
+++ 	(revision )
@@ -1,14 +1,0 @@
-function femmodel=enthalpy_core_step(femmodel,step,time)
-%ENTHALPY_CORE_STEP - core of the enthalpy solution for one step 
-%
-%   Usage:
-%      femmodel=enthalpy_core_step(femmodel,step,time)
-
-	%some parameters
-	modify_loads=true;
-
-	issmprintf(VerboseSolution,'\n%s',['   computing enthalpy']);
-	femmodel=SetCurrentConfiguration(femmodel,EnthalpyAnalysisEnum);
-	femmodel=solver_nonlinear(femmodel,modify_loads);
-
-end %end function
Index: /issm/trunk-jpl/src/m/solutions/thermal_core.m
===================================================================
--- /issm/trunk-jpl/src/m/solutions/thermal_core.m	(revision 11829)
+++ /issm/trunk-jpl/src/m/solutions/thermal_core.m	(revision 11830)
@@ -11,5 +11,10 @@
 
 	issmprintf(VerboseSolution,'\n%s',['   computing temperature']);
-	femmodel=thermal_core_step(femmodel); 
+	femmodel=SetCurrentConfiguration(femmodel,ThermalAnalysisEnum);
+	femmodel=solver_thermal_nonlinear(femmodel);
+
+	issmprintf(VerboseSolution,'\n%s',['   computing melting']);
+	femmodel=SetCurrentConfiguration(femmodel,MeltingAnalysisEnum);
+	femmodel=solver_linear(femmodel);
 
 	if (save_results),
Index: sm/trunk-jpl/src/m/solutions/thermal_core_step.m
===================================================================
--- /issm/trunk-jpl/src/m/solutions/thermal_core_step.m	(revision 11829)
+++ 	(revision )
@@ -1,15 +1,0 @@
-function femmodel=thermal_core_step(femmodel,step,time)
-%THERMAL_CORE_STEP - core of the thermal solution for one step 
-%
-%   Usage:
-%      femmodel=thermal_core_step(femmodel,step,time)
-
-	issmprintf(VerboseSolution,'\n%s',['   computing temperature']);
-	femmodel=SetCurrentConfiguration(femmodel,ThermalAnalysisEnum);
-	femmodel=solver_thermal_nonlinear(femmodel);
-
-	issmprintf(VerboseSolution,'\n%s',['   computing melting']);
-	femmodel=SetCurrentConfiguration(femmodel,MeltingAnalysisEnum);
-	femmodel=solver_linear(femmodel);
-	
-end %end function
Index: /issm/trunk-jpl/src/m/solutions/transient_core.m
===================================================================
--- /issm/trunk-jpl/src/m/solutions/transient_core.m	(revision 11829)
+++ /issm/trunk-jpl/src/m/solutions/transient_core.m	(revision 11830)
@@ -66,7 +66,7 @@
 			issmprintf(VerboseSolution,'\n%s',['   computing temperature']);
 			if (isenthalpy==0),
-				femmodel=thermal_core_step(femmodel); 
+				femmodel=thermal_core(femmodel); 
 			else
-				femmodel=enthalpy_core_step(femmodel); 
+				femmodel=enthalpy_core(femmodel); 
 			end
 		end