Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp	(revision 17350)
+++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp	(revision 17351)
@@ -48,11 +48,8 @@
 		}
 	}
-
 	iomodel->FetchDataToInput(elements,ThicknessEnum);
-	iomodel->FetchDataToInput(elements,SurfaceEnum);
 	iomodel->FetchDataToInput(elements,BedEnum);
 	iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
 	iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
-	iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
 	iomodel->FetchDataToInput(elements,EplHeadEnum);
 	iomodel->FetchDataToInput(elements,SedimentHeadEnum);
@@ -60,5 +57,5 @@
 	iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum);
 
-	//	iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveNodeEnum);
+	iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveNodeEnum);
 	
 	elements->InputDuplicate(HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum);
@@ -131,5 +128,5 @@
 
 	/*Check that all nodes are active, else return empty matrix*/
-	if(!basalelement->AllActive()) {
+	if(!basalelement->AllActive()) { /*This could probably replaced by active elt mask*/
 	if(meshtype!=Mesh2DhorizontalEnum){
 			basalelement->DeleteMaterials(); 
@@ -327,8 +324,4 @@
 	
 	IssmDouble* eplHeads    = xNew<IssmDouble>(numnodes);
-	IssmDouble* eplOldHeads    = xNew<IssmDouble>(numnodes); 
-
-	/*Get previous water head*/
-	basalelement->GetInputListOnNodes(&eplOldHeads[0],EplHeadEnum);
 
 	/*Use the dof list to index into the solution vector: */
@@ -347,4 +340,5 @@
 	if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
 } /*}}}*/
+
 void HydrologyDCEfficientAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
 	/*Default, do nothing*/
Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp	(revision 17350)
+++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp	(revision 17351)
@@ -137,5 +137,4 @@
 				delete analysis;
 			}
-			
 			sedconverged=false;
 			
@@ -175,4 +174,5 @@
 			EplConv=1.0;
 
+
 			for(;;){
 				eplconverged=false;
@@ -181,21 +181,21 @@
 
 				/* {{{ *//*Retriev the EPL head slopes and compute EPL Thickness*/
-					if(VerboseSolution()) _printf0_("computing EPL Head slope...\n");
-					femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum);
-					femmodel->UpdateConstraintsL2ProjectionEPLx();
-					femmodel->parameters->SetParam(EplHeadSlopeXEnum,InputToL2ProjectEnum);
-					solutionsequence_linear(femmodel);
-					femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum);
-					solutionsequence_linear(femmodel);
-					femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
-					femmodel->HydrologyEPLThicknessx();
-					
-					//updating mask after the computation of the epl thickness (Allow to close too thin EPL)
-					femmodel->HydrologyEPLupdateDomainx();
-
-					HydrologyDCInefficientAnalysis* analysis = new HydrologyDCInefficientAnalysis();
-					analysis->ElementizeEplMask(femmodel);
-					delete analysis;
-					/* }}} */
+				if(VerboseSolution()) _printf0_("computing EPL Head slope...\n");
+				femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum);
+				femmodel->UpdateConstraintsL2ProjectionEPLx();
+				femmodel->parameters->SetParam(EplHeadSlopeXEnum,InputToL2ProjectEnum);
+				solutionsequence_linear(femmodel);
+				femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum);
+				solutionsequence_linear(femmodel);
+				femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
+				femmodel->HydrologyEPLThicknessx();
+				
+				//updating mask after the computation of the epl thickness (Allow to close too thin EPL)
+				femmodel->HydrologyEPLupdateDomainx();
+				
+				HydrologyDCInefficientAnalysis* analysis = new HydrologyDCInefficientAnalysis();
+				analysis->ElementizeEplMask(femmodel);
+				delete analysis;
+				/* }}} */
 					
 				if(VerboseSolution()) _printf0_("Building EPL Matrix...\n");
@@ -283,6 +283,7 @@
 	}
 	/* }}} */
+	if(isefficientlayer)InputUpdateFromSolutionx(femmodel,ug_epl);
+	femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);
 	InputUpdateFromSolutionx(femmodel,ug_sed);
-	if(isefficientlayer)InputUpdateFromSolutionx(femmodel,ug_epl);
 	/*Free ressources: */
 	delete ug_epl;