Index: /issm/trunk/src/c/objects/Elements/Penta.cpp
===================================================================
--- /issm/trunk/src/c/objects/Elements/Penta.cpp	(revision 8499)
+++ /issm/trunk/src/c/objects/Elements/Penta.cpp	(revision 8500)
@@ -6096,6 +6096,6 @@
 	
 
-	this->inputs->GetParameterValue(&converged,ConvergedEnum);
-	if(converged){
+//	this->inputs->GetParameterValue(&converged,ConvergedEnum);
+//	if(converged){
 		/*Convert enthalpy into temperature and water fraction*/
 		for(i=0;i<numdof;i++) matpar->EnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]);
@@ -6129,8 +6129,8 @@
 
 		}
-	}
-	else{
-		this->inputs->AddInput(new PentaVertexInput(EnthalpyPicardEnum,values));
-	}
+//	}
+//	else{
+//		this->inputs->AddInput(new PentaVertexInput(EnthalpyPicardEnum,values));
+//	}
 
 	/*Free ressources:*/
Index: /issm/trunk/src/c/solutions/enthalpy_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/enthalpy_core.cpp	(revision 8499)
+++ /issm/trunk/src/c/solutions/enthalpy_core.cpp	(revision 8500)
@@ -52,5 +52,5 @@
 			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,BasalMeltingRateEnum,i+1,time);
+			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterFractionEnum,i+1,time);
 		}
 
Index: /issm/trunk/src/m/solutions/enthalpy_core.m
===================================================================
--- /issm/trunk/src/m/solutions/enthalpy_core.m	(revision 8500)
+++ /issm/trunk/src/m/solutions/enthalpy_core.m	(revision 8500)
@@ -0,0 +1,39 @@
+function femmodel=enthalpy_core(femmodel)
+%ENTHALPY_CORE - core of enthalpy solution
+%
+%   Usage:
+%      femmodel=enthalpy_core(femmodel)
+
+
+	%recover parameters common to all solutions
+	ndt=femmodel.parameters.Ndt;
+	dt=femmodel.parameters.Dt;
+	control_analysis=femmodel.parameters.ControlAnalysis;
+	solution_type=femmodel.parameters.SolutionType;
+
+	%Compute number of timesteps
+	if (dt==0 | ndt==0),
+		dt=0;
+		nsteps=1;
+	else
+		nsteps=floor(ndt/dt);
+	end
+
+	%Loop through time
+	for i=1:nsteps,
+		issmprintf(VerboseSolution,'\n%s%i/%i\n','time step: ',i,nsteps);
+		time=(i+1)*dt;
+
+		issmprintf(VerboseSolution,'\n%s',['   computing enthalpy']);
+		femmodel=SetCurrentConfiguration(femmodel,EnthalpyAnalysisEnum);
+		femmodel=solver_linear(femmodel);
+
+		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
+	end
+
+end %end of function