Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp	(revision 16985)
+++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp	(revision 16986)
@@ -236,5 +236,5 @@
 
 	/*Enthalpy diffusion parameter*/
-	IssmDouble kappa=this->EnthalpyDiffusionParameterVolume(element,EnthalpyEnum); _assert_(kappa>0.);
+	IssmDouble kappa=this->EnthalpyDiffusionParameterVolume(element,EnthalpyPicardEnum); _assert_(kappa>0.);
 
 	/* Start  looping on the number of gaussian points: */
@@ -332,9 +332,7 @@
 	if(!element->IsOnBed() || !element->IsFloating()) return NULL;
 
+	/*Intermediaries*/
 	IssmDouble  dt,Jdet,D;
 	IssmDouble *xyz_list_base = NULL;
-
-	/*Get basal element*/
-	if(!element->IsOnBed() || !element->IsFloating()) return NULL;
 
 	/*Fetch number of nodes for this finite element*/