Index: ../trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp
===================================================================
--- ../trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp	(revision 18725)
+++ ../trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp	(revision 18726)
@@ -93,14 +93,14 @@
 		/*Reset constraint on the ZigZag Lock, this thing doesn't work, it have to disapear*/
 		ResetConstraintsx(femmodel);
 
-		/* {{{ *//*Treating the sediment*/
+		/*{{{*//*Treating the sediment*/
 		for(;;){
 			sedconverged=false;
 			uf_sed_sub_iter=uf_sed->Duplicate();_assert_(uf_sed_sub_iter);
 			uf_sed->Copy(uf_sed_sub_iter);
-			/* {{{ *//*Loop on the sediment layer to deal with the penalization*/
+			/*{{{*//*Loop on the sediment layer to deal with the penalization*/
 			for(;;){
-				/* {{{ *//*Core of the computation*/
+				/*{{{*/ /*Core of the computation*/
 				if(VerboseSolution()) _printf0_("Building Sediment Matrix...\n");
 				SystemMatricesx(&Kff,&Kfs,&pf,&df,&sediment_kmax,femmodel);
 				CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCInefficientAnalysisEnum);
@@ -112,7 +112,7 @@
 				Mergesolutionfromftogx(&ug_sed,uf_sed,ys,femmodel->nodes,femmodel->parameters); delete ys;
 				InputUpdateFromSolutionx(femmodel,ug_sed);
 				ConstraintsStatex(&constraints_converged,&num_unstable_constraints,femmodel);
-				/* }}} */
+				/*}}}*/
 				if (!sedconverged){
 					if(VerboseConvergence()) _printf0_("   # Sediment unstable constraints = " << num_unstable_constraints << "\n");
 					if(num_unstable_constraints==0) sedconverged = true;
@@ -125,11 +125,15 @@
 				if(sedconverged)break;
 			}
 		
-			/* }}} *//*End of the sediment penalization loop*/
+			/*}}}*//*End of the sediment penalization loop*/
 			/*Update EPL mask*/
-			if(isefficientlayer){
-				inefanalysis->ElementizeEplMask(femmodel);
-			}
+			
+			/*++++++This is probably useless+++++++*/
+			/* if(isefficientlayer){ */
+			/* 	inefanalysis->ElementizeEplMask(femmodel); */
+			/* } */
+			/*+++++++++++++*/
+
 			sedconverged=false;
 			
 			/*Checking convegence on the value of the sediment head*/
@@ -155,12 +159,13 @@
 				break;
 			}
 		}
-		/* }}} *//*End of the global sediment loop*/
-		/* {{{ *//*Now dealing with the EPL in the same way*/
+		/*}}}*//*End of the global sediment loop*/
+		/*{{{*//*Now dealing with the EPL in the same way*/
 		if(isefficientlayer){
 			femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
 			/*updating mask*/
 			femmodel->HydrologyEPLupdateDomainx();
+			inefanalysis->ElementizeEplMask(femmodel);
 			InputUpdateFromConstantx(femmodel,true,ResetPenaltiesEnum);
 			InputUpdateFromConstantx(femmodel,false,ConvergedEnum);
 			femmodel->parameters->SetParam(HydrologyEfficientEnum,HydrologyLayerEnum);
@@ -169,9 +174,9 @@
 				eplconverged=false;
 				ug_epl_sub_iter=ug_epl->Duplicate();_assert_(ug_epl_sub_iter);
 				ug_epl->Copy(ug_epl_sub_iter);
-				/* {{{ *//*Retrieve the EPL head slopes and compute EPL Thickness*/
+				/*{{{*//*Retrieve the EPL head slopes and compute EPL Thickness*/
 				if(VerboseSolution()) _printf0_("computing EPL Head slope...\n");
-				inefanalysis->ElementizeEplMask(femmodel);
+				//				inefanalysis->ElementizeEplMask(femmodel);
 				femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum);
 				femmodel->UpdateConstraintsL2ProjectionEPLx();
 				inefanalysis->ElementizeEplMask(femmodel);
@@ -179,14 +184,13 @@
 				solutionsequence_linear(femmodel);
 				femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum);
 				solutionsequence_linear(femmodel);
+
 				femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
-
 				effanalysis->ComputeEPLThickness(femmodel);
-
 				//updating mask after the computation of the epl thickness (Allow to close too thin EPL)
 				femmodel->HydrologyEPLupdateDomainx();
 				inefanalysis->ElementizeEplMask(femmodel);
-				/* }}} */
+				/*}}}*/
 					
 				if(VerboseSolution()) _printf0_("Building EPL Matrix...\n");
 				SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
@@ -228,9 +232,9 @@
 				}
 			}
 		}
-		/* }}} */ /*End of the global EPL loop*/
+		/*}}}*/ /*End of the global EPL loop*/
 
-		/* {{{ */ /*Now dealing with the convergence of the whole system*/
+		/*{{{*/ /*Now dealing with the convergence of the whole system*/
 		if(!hydroconverged){
 			//compute norm(du)/norm(u)
 			dug=ug_sed_main_iter->Duplicate(); _assert_(dug);
@@ -270,7 +274,7 @@
 		hydrocount++;
 		if(hydroconverged)break;
 	}
-	/* }}} */
+	/*}}}*/
 	if(isefficientlayer)InputUpdateFromSolutionx(femmodel,ug_epl);
 	femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);
 	InputUpdateFromSolutionx(femmodel,ug_sed);
Index: ../trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/FemModel.cpp	(revision 18725)
+++ ../trunk-jpl/src/c/classes/FemModel.cpp	(revision 18726)
@@ -1913,7 +1913,9 @@
 	counter=sum_counter;
 	if(VerboseSolution()) _printf0_("   Number of active nodes L2 Projection: "<< counter <<"\n");
 
+	/*+++++++this is done in the solution sequence+++++++++++++++*/
 	/*Update dof indexings*/
-	this->UpdateConstraintsx();
+	//	this->UpdateConstraintsx();
+	/*++++++++++++++++++++++++++*/
 }
 /*}}}*/
