Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp	(revision 18619)
+++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp	(revision 18620)
@@ -1185,4 +1185,5 @@
 		UpdateBasalConstraints(element);
 	}
+	femmodel->UpdateConstraintsx();
 }/*}}}*/
 void EnthalpyAnalysis::UpdateBasalConstraints(Element* element){/*{{{*/
@@ -1394,27 +1395,14 @@
 	element->FindParam(&dt,TimesteppingTimeStepEnum);
 
-	if(dt==0.){ // steadystate case
-		state=0; //TODO: add consistent steadystate basal condition scheme
-// 		if(enthalpy<PureIceEnthalpy(element,pressure)){ /*is base cold?*/
-// 			if(watercolumn<=0.) state=0; // cold, dry base
-// 			else state=1; // cold, wet base (refreezing)
-// 		}
-// 		else{ /*base is temperate, check if upper node is temperate, too.*/
-// 			if(enthalpyup<PureIceEnthalpy(element,pressureup))
-// 				if(meltingrate<0.)	state=2; // refreezing temperate base (non-physical, only for steadystate solver)
-// 				else						state=3; // melting temperate base with no temperate layer
-// 			else
-// 				state=4; // melting temperate base with temperate layer of positive thickness
-// 		}
-	}
-	else{ // transient case
-		if(enthalpy<PureIceEnthalpy(element,pressure)){
-			if(watercolumn<=0.) state=0; // cold, dry base
-			else state=1; // cold, wet base (refreezing)
-		}
-		else{
-			if(enthalpyup<PureIceEnthalpy(element,pressureup))	state=3; // temperate base, but no temperate layer
-			else state=4; // temperate layer with positive thickness
-		}
+	if(enthalpy<PureIceEnthalpy(element,pressure)){
+		if(watercolumn<=0.) state=0; // cold, dry base
+		else state=1; // cold, wet base (refreezing)
+	}
+	else{
+		if(enthalpyup<PureIceEnthalpy(element,pressureup)){
+			if((dt==0.) && (meltingrate<0.)) state=2;	// refreezing temperate base (non-physical, only for steadystate solver)
+			else	state=3; // temperate base, but no temperate layer
+		}
+		else state=4; // temperate layer with positive thickness
 	}
 
Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h
===================================================================
--- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h	(revision 18619)
+++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h	(revision 18620)
@@ -51,6 +51,4 @@
 		static void UpdateBasalConstraintsTransient(Element* element);
 		static void UpdateBasalConstraintsSteadystate(Element* element);
-// 		static int GetThermalBasalCondition(Element* element, Gauss* gauss, Gauss* gaussup, int enthalpy_enum);
-// 		static int GetThermalBasalCondition(Element* element, GaussPenta* gauss, GaussPenta* gaussup, int enthalpy_enum);
 		static int GetThermalBasalCondition(Element* element, IssmDouble enthalpy, IssmDouble enthalpy_up, IssmDouble pressure, IssmDouble pressure_up, IssmDouble watercolumn, IssmDouble meltingrate);
 		static IssmDouble GetWetIceConductivity(Element* element, IssmDouble enthalpy, IssmDouble pressure);
Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp	(revision 18619)
+++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp	(revision 18620)
@@ -50,5 +50,5 @@
 		femmodel->UpdateConstraintsx();
 
-		//Update the solution to make sure that vx and vxold are similar (for next step in transient or steadystate)
+		//Update the solution to make sure that tf and tf_old are similar (for next step in transient or steadystate)
 		GetSolutionFromInputsx(&tg,femmodel);
 		Reducevectorgtofx(&tf, tg, femmodel->nodes,femmodel->parameters);
@@ -65,8 +65,12 @@
 	for(;;){
 		delete tf_old;tf_old=tf;
+
+		if(isenthalpy){ 
+			SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
+			/*Update old solution, such that sizes of tf_old and tf are comparable*/
+			if(isdynamicbasalspc)	Reducevectorgtofx(&tf_old, tg, femmodel->nodes,femmodel->parameters);
+		}
+		else SystemMatricesx(&Kff, &Kfs, &pf,&df, &melting_offset,femmodel);
 		delete tg;
-
-		if(isenthalpy) SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
-		else SystemMatricesx(&Kff, &Kfs, &pf,&df, &melting_offset,femmodel);
 		CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
 		Reduceloadx(pf, Kfs, ys); delete Kfs;
@@ -82,9 +86,18 @@
 		if(VerboseConvergence()) _printf0_("   number of unstable constraints: " << num_unstable_constraints << "\n");
 
-		if(isenthalpy){
-			/*Increase count: */
+		if(isenthalpy){ // enthalpy method
+			IssmDouble dt;
+			femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
+
 			count++;
+			bool max_iteration_state=false;
+			if(count>=thermal_maxiter){
+				_printf0_("   maximum number of nonlinear iterations (" << thermal_maxiter << ") exceeded\n"); 
+				converged=true;
+				InputUpdateFromConstantx(femmodel,converged,ConvergedEnum);
+				InputUpdateFromSolutionx(femmodel,tg);		
+				max_iteration_state=true;
+			}
 			if(converged==true){
-				bool max_iteration_state=false;
 				int step; IssmDouble time;
 				femmodel->parameters->FindParam(&time,TimeEnum);
@@ -93,18 +106,10 @@
 				break;
 			}
-			if(count>=thermal_maxiter){
-				_printf0_("   maximum number of nonlinear iterations (" << thermal_maxiter << ") exceeded\n"); 
-				converged=true;
-				InputUpdateFromConstantx(femmodel,converged,ConvergedEnum);
-				InputUpdateFromSolutionx(femmodel,tg);		
-				bool max_iteration_state=true;
-				int step; IssmDouble time;
-				femmodel->parameters->FindParam(&time,TimeEnum);
-				femmodel->parameters->FindParam(&step,StepEnum);
-				femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time));
-				break;
+			else if(dt==0.){
+				EnthalpyAnalysis::ComputeBasalMeltingrate(femmodel);
+				EnthalpyAnalysis::UpdateBasalConstraints(femmodel);
 			}
 		}
-		else{
+		else{ // dry ice method
 			if(!converged){
 				if(num_unstable_constraints<=thermal_penalty_threshold) converged=true;
Index: /issm/trunk-jpl/src/m/classes/thermal.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/thermal.m	(revision 18619)
+++ /issm/trunk-jpl/src/m/classes/thermal.m	(revision 18620)
@@ -100,8 +100,7 @@
 				if(md.thermal.isenthalpy)
 					if isnan(md.stressbalance.reltol),
-						md = checkmessage(md,['for a steadystate computation, stressbalance.reltol (relative convergence criterion) must be defined!']);
-					end
+						md = checkmessage(md,['for a steadystate computation, thermal.reltol (relative convergence criterion) must be defined!']);
+					end 
 					md = checkfield(md,'fieldname','thermal.reltol','>',0.,'message','reltol must be larger than zero');
-					md = checkfield(md,'fieldname','thermal.isdynamicbasalspc','numel', [1],'values',[1], 'message',['for enthalpy run thermal.isdynamicbasalspc should be 1']);
 				end
 	    end
Index: /issm/trunk-jpl/src/m/classes/thermal.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/thermal.py	(revision 18619)
+++ /issm/trunk-jpl/src/m/classes/thermal.py	(revision 18620)
@@ -95,7 +95,6 @@
 			if(md.thermal.isenthalpy):
 				if numpy.isnan(md.stressbalance.reltol):
-					md.checkmessage("for a steadystate computation, stressbalance.reltol (relative convergence criterion) must be defined!")
+					md.checkmessage("for a steadystate computation, thermal.reltol (relative convergence criterion) must be defined!")
 				md = checkfield(md,'fieldname','thermal.reltol','>',0.,'message',"reltol must be larger than zero");
-				md = checkfield(md,'fieldname','thermal.isdynamicbasalspc','numel', [1],'values',[1], 'message',"for enthalpy run thermal.isdynamicbasalspc should be true")
 		md = checkfield(md,'fieldname','thermal.requested_outputs','stringrow',1)