Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 15352)
+++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 15353)
@@ -336,5 +336,4 @@
 			_error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
 	}
-
 }
 /*}}}*/
@@ -1485,11 +1484,11 @@
 	#ifdef _HAVE_HYDROLOGY_
 	case HydrologyShreveAnalysisEnum:
-		GetSolutionFromInputsHydrologyShreve(solution);
+		GetSolutionFromInputsOneDof(solution,WatercolumnEnum);
 		break;
 	case HydrologyDCInefficientAnalysisEnum:
-		GetSolutionFromInputsHydrologyDCInefficient(solution);
+		GetSolutionFromInputsOneDof(solution,SedimentHeadEnum);
 		break;
 	case HydrologyDCEfficientAnalysisEnum:
-		GetSolutionFromInputsHydrologyDCEfficient(solution);
+		GetSolutionFromInputsOneDof(solution,EplHeadEnum);
 		break;
 	#endif
@@ -6339,11 +6338,12 @@
 }
 /*}}}*/
-/*FUNCTION Tria::GetSolutionFromInputsHydrologyShreve{{{*/
-void  Tria::GetSolutionFromInputsHydrologyShreve(Vector<IssmDouble>* solution){
+/*FUNCTION Tria::GetSolutionFromInputsOneDof{{{*/
+void  Tria::GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution, int enum_type){
+	
 	const int    numdof=NDOF1*NUMVERTICES;
 
 	int         i;
 	int        *doflist = NULL;
-	IssmDouble  watercolumn;
+	IssmDouble  enum_value;
 	IssmDouble  values[numdof];
 	GaussTria  *gauss   = NULL;
@@ -6353,7 +6353,7 @@
 
 	/*Get inputs*/
-	Input* watercolumn_input=inputs->GetInput(WatercolumnEnum); _assert_(watercolumn_input);
-
-	/*Ok, we have watercolumn values, fill in watercolumn array: */
+	Input* enum_input=inputs->GetInput(enum_type); _assert_(enum_input);
+
+	/*Ok, we have the values, fill in the array: */
 	/*P1 element only for now*/
 	gauss=new GaussTria();
@@ -6362,72 +6362,7 @@
 		gauss->GaussVertex(i);
 
-		/*Recover watercolumn*/
-		watercolumn_input->GetInputValue(&watercolumn,gauss);
-		values[i]=watercolumn;
-	}
-
-	solution->SetValues(numdof,doflist,values,INS_VAL);
-
-	/*Free ressources:*/
-	delete gauss;
-	xDelete<int>(doflist);
-}
-/*}}}*/
-/*FUNCTION Tria::GetSolutionFromInputsHydrologyDCInefficient{{{*/
-void  Tria::GetSolutionFromInputsHydrologyDCInefficient(Vector<IssmDouble>* solution){
-
-	const int    numdof=NDOF1*NUMVERTICES;
-
-	int         i;
-	int        *doflist = NULL;
-	IssmDouble  sedimenthead;
-	IssmDouble  values[numdof];
-	GaussTria  *gauss   = NULL;
-
-	/*Get dof list: */
-	GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
-
-	/*Get inputs*/
-	Input* sedimenthead_input=inputs->GetInput(SedimentHeadEnum); _assert_(sedimenthead_input);
-
-	/*P1 element only for now*/
-	gauss=new GaussTria();
-	for(i=0;i<NUMVERTICES;i++){
-
-		gauss->GaussVertex(i);
-		sedimenthead_input->GetInputValue(&sedimenthead,gauss);
-		values[i]=sedimenthead;
-	}
-
-	solution->SetValues(numdof,doflist,values,INS_VAL);
-
-	/*Free ressources:*/
-	delete gauss;
-	xDelete<int>(doflist);
-}
-/*}}}*/
-/*FUNCTION Tria::GetSolutionFromInputsHydrologyDCEfficient{{{*/
-void  Tria::GetSolutionFromInputsHydrologyDCEfficient(Vector<IssmDouble>* solution){
-
-	const int    numdof=NDOF1*NUMVERTICES;
-
-	int         i;
-	int        *doflist = NULL;
-	IssmDouble  eplhead;
-	IssmDouble  values[numdof];
-	GaussTria  *gauss   = NULL;
-
-	/*Get dof list: */
-	GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
-
-	/*Get inputs*/
-	Input* eplhead_input=inputs->GetInput(EplHeadEnum); _assert_(eplhead_input);
-
-	/*P1 element only for now*/
-	gauss=new GaussTria();
-	for(i=0;i<NUMVERTICES;i++){
-		gauss->GaussVertex(i);
-		eplhead_input->GetInputValue(&eplhead,gauss);
-		values[i]=eplhead;
+		/*Recover dof values*/
+		enum_input->GetInputValue(&enum_value,gauss);
+		values[i]=enum_value;
 	}
 
Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Tria.h	(revision 15352)
+++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h	(revision 15353)
@@ -246,7 +246,5 @@
 		ElementVector* CreatePVectorHydrologyDCInefficient(void);
 		ElementVector* CreatePVectorHydrologyDCEfficient(void);
-		void	  GetSolutionFromInputsHydrologyShreve(Vector<IssmDouble>* solution);
-		void	  GetSolutionFromInputsHydrologyDCInefficient(Vector<IssmDouble>* solution);
-		void	  GetSolutionFromInputsHydrologyDCEfficient(Vector<IssmDouble>* solution);
+		void    GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution,int enum_type);
 		void    CreateHydrologyWaterVelocityInput(void);
 		void    UpdateConstraints(void);