Index: /issm/trunk/src/c/Makefile.am
===================================================================
--- /issm/trunk/src/c/Makefile.am	(revision 4072)
+++ /issm/trunk/src/c/Makefile.am	(revision 4073)
@@ -516,6 +516,6 @@
 					./modules/FieldDepthAveragex/FieldDepthAveragex.cpp\
 					./modules/FieldDepthAveragex/FieldDepthAveragex.h\
-					./modules/DepthAverageInputx/DepthAverageInputx.cpp\
-					./modules/DepthAverageInputx/DepthAverageInputx.h\
+					./modules/InputDepthAveragex/InputDepthAveragex.cpp\
+					./modules/InputDepthAveragex/InputDepthAveragex.h\
 					./modules/VecExtrudex/VecExtrudex.cpp\
 					./modules/VecExtrudex/VecExtrudex.h\
@@ -1030,6 +1030,6 @@
 					./modules/FieldDepthAveragex/FieldDepthAveragex.cpp\
 					./modules/FieldDepthAveragex/FieldDepthAveragex.h\
-					./modules/DepthAverageInputx/DepthAverageInputx.cpp\
-					./modules/DepthAverageInputx/DepthAverageInputx.h\
+					./modules/InputDepthAveragex/InputDepthAveragex.cpp\
+					./modules/InputDepthAveragex/InputDepthAveragex.h\
 					./modules/VecExtrudex/VecExtrudex.cpp\
 					./modules/VecExtrudex/VecExtrudex.h\
Index: /issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.cpp
===================================================================
--- /issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.cpp	(revision 4072)
+++ /issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.cpp	(revision 4073)
@@ -1,7 +1,7 @@
-/*!\file DepthAverageInputx
+/*!\file InputDepthAveragex
  * \brief: average field throfieldh thickness
  */
 
-#include "./DepthAverageInputx.h"
+#include "./InputDepthAveragex.h"
 #include "../InputExtrudex/InputExtrudex.h"
 #include "../../shared/shared.h"
@@ -10,5 +10,5 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void DepthAverageInputx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type){
+void InputDepthAveragex( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type){
 	
 	/*Intermediary*/
@@ -22,5 +22,5 @@
 	for (i=0;i<elements->Size();i++){
 		element=(Element*)elements->GetObjectByOffset(i);
-		element->DepthAverageInputAtBase(enum_type,average_enum_type);
+		element->InputDepthAverageAtBase(enum_type,average_enum_type);
 	}
 
Index: /issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.h
===================================================================
--- /issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.h	(revision 4072)
+++ /issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.h	(revision 4073)
@@ -1,3 +1,3 @@
-/*!\file:  DepthAverageInputx.h
+/*!\file:  InputDepthAveragex.h
  * \brief header file for averaging a field throfieldh thickness
  */ 
@@ -9,5 +9,5 @@
 
 /* local prototypes: */
-void DepthAverageInputx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type);
+void InputDepthAveragex( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type);
 
 #endif  /* _DEPTHAVERAGEINPUTX_H */
Index: /issm/trunk/src/c/modules/modules.h
===================================================================
--- /issm/trunk/src/c/modules/modules.h	(revision 4072)
+++ /issm/trunk/src/c/modules/modules.h	(revision 4073)
@@ -62,5 +62,5 @@
 #include "./BamgConvertMeshx/BamgConvertMeshx.h"
 #include "./SplitSolutionVectorx/SplitSolutionVectorx.h"
-#include "./DepthAverageInputx/DepthAverageInputx.h"
+#include "./InputDepthAveragex/InputDepthAveragex.h"
 #include "./InputExtrudex/InputExtrudex.h"
 #include "./InputToResultx/InputToResultx.h"
Index: /issm/trunk/src/c/objects/Elements/Beam.h
===================================================================
--- /issm/trunk/src/c/objects/Elements/Beam.h	(revision 4072)
+++ /issm/trunk/src/c/objects/Elements/Beam.h	(revision 4073)
@@ -62,5 +62,5 @@
 		void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
 		void  UpdateInputsFromSolution(double* solution);
-		void  DepthAverageInputAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");};
+		void  InputDepthAverageAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");};
 		void  InputToResult(int enum_type,int step,double time);
 		void   ProcessResultsUnits(void);
Index: /issm/trunk/src/c/objects/Elements/Element.h
===================================================================
--- /issm/trunk/src/c/objects/Elements/Element.h	(revision 4072)
+++ /issm/trunk/src/c/objects/Elements/Element.h	(revision 4073)
@@ -43,5 +43,5 @@
 		virtual double CostFunction(void)=0;
 		virtual double SurfaceArea(void)=0;
-		virtual void   DepthAverageInputAtBase(int enum_type,int average_enum_type)=0;
+		virtual void   InputDepthAverageAtBase(int enum_type,int average_enum_type)=0;
 		virtual void   ComputeBasalStress(Vec sigma_b)=0;
 		virtual void   ComputePressure(Vec p_g)=0;
Index: /issm/trunk/src/c/objects/Elements/Penta.cpp
===================================================================
--- /issm/trunk/src/c/objects/Elements/Penta.cpp	(revision 4072)
+++ /issm/trunk/src/c/objects/Elements/Penta.cpp	(revision 4073)
@@ -3367,6 +3367,6 @@
 }
 /*}}}*/
-/*FUNCTION Penta::DepthAverageInputAtBase{{{1*/
-void  Penta::DepthAverageInputAtBase(int enum_type,int average_enum_type){
+/*FUNCTION Penta::InputDepthAverageAtBase{{{1*/
+void  Penta::InputDepthAverageAtBase(int enum_type,int average_enum_type){
 	ISSMERROR("Not implemented yet (see Penta::InputExtrude and Node::FieldDepthAverageAtBase)");
 }
Index: /issm/trunk/src/c/objects/Elements/Penta.h
===================================================================
--- /issm/trunk/src/c/objects/Elements/Penta.h	(revision 4072)
+++ /issm/trunk/src/c/objects/Elements/Penta.h	(revision 4073)
@@ -112,5 +112,5 @@
 		void  VecExtrude(Vec vector,double* vector_serial,int iscollapsed);
 		void  InputExtrude(int enum_type);
-		void  DepthAverageInputAtBase(int enum_type,int average_enum_type);
+		void  InputDepthAverageAtBase(int enum_type,int average_enum_type);
 		void  ComputeBasalStress(Vec sigma_bg);
 		void  ComputePressure(Vec p_gg);
Index: /issm/trunk/src/c/objects/Elements/Sing.h
===================================================================
--- /issm/trunk/src/c/objects/Elements/Sing.h	(revision 4072)
+++ /issm/trunk/src/c/objects/Elements/Sing.h	(revision 4073)
@@ -62,5 +62,5 @@
 		void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
 		void  UpdateInputsFromSolution(double* solutiong);
-		void  DepthAverageInputAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");};
+		void  InputDepthAverageAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");};
 		void  InputToResult(int enum_type,int step,double time);
 		void   ProcessResultsUnits(void);
Index: /issm/trunk/src/c/objects/Elements/Tria.cpp
===================================================================
--- /issm/trunk/src/c/objects/Elements/Tria.cpp	(revision 4072)
+++ /issm/trunk/src/c/objects/Elements/Tria.cpp	(revision 4073)
@@ -5016,6 +5016,6 @@
 }
 /*}}}*/
-/*FUNCTION Tria::DepthAverageInputAtBase {{{1*/
-void  Tria::DepthAverageInputAtBase(int enum_type,int average_enum_type){
+/*FUNCTION Tria::InputDepthAverageAtBase {{{1*/
+void  Tria::InputDepthAverageAtBase(int enum_type,int average_enum_type){
 
 	/*New input*/
Index: /issm/trunk/src/c/objects/Elements/Tria.h
===================================================================
--- /issm/trunk/src/c/objects/Elements/Tria.h	(revision 4072)
+++ /issm/trunk/src/c/objects/Elements/Tria.h	(revision 4073)
@@ -55,5 +55,5 @@
 		int   MyRank(void);
 		void  SetClone(int* minranks);
-		void  DepthAverageInputAtBase(int enum_type,int average_enum_type);
+		void  InputDepthAverageAtBase(int enum_type,int average_enum_type);
 		void*  SpawnSing(int g0);
 		void*  SpawnBeam(int g0, int g1);
Index: /issm/trunk/src/c/solutions/balancedthickness2_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/balancedthickness2_core.cpp	(revision 4072)
+++ /issm/trunk/src/c/solutions/balancedthickness2_core.cpp	(revision 4073)
@@ -26,7 +26,7 @@
 
 	_printf_("depth averaging velocity...\n");
-	DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
-	DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
-	if(dim==3) DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
+	InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+	InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
+	if(dim==3) InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
 
 
Index: /issm/trunk/src/c/solutions/balancedthickness_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/balancedthickness_core.cpp	(revision 4072)
+++ /issm/trunk/src/c/solutions/balancedthickness_core.cpp	(revision 4073)
@@ -26,7 +26,7 @@
 
 	_printf_("depth averaging velocity...\n");
-	DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
-	DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
-	if(dim==3) DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
+	InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+	InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
+	if(dim==3) InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
 
 	_printf_("call computational core:\n");
Index: /issm/trunk/src/c/solutions/balancedvelocities_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/balancedvelocities_core.cpp	(revision 4072)
+++ /issm/trunk/src/c/solutions/balancedvelocities_core.cpp	(revision 4073)
@@ -25,7 +25,7 @@
 
 	_printf_("depth averaging velocity...\n");
-	DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
-	DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
-	if(dim==3) DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
+	InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+	InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
+	if(dim==3) InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
 
 	_printf_("call computational core:\n");
Index: /issm/trunk/src/c/solutions/prognostic_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/prognostic_core.cpp	(revision 4072)
+++ /issm/trunk/src/c/solutions/prognostic_core.cpp	(revision 4073)
@@ -23,6 +23,6 @@
 
 	_printf_("depth averaging velocity...\n");
-	DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
-	DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
+	InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+	InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
 	
 	_printf_("call computational core:\n");
Index: /issm/trunk/src/c/solutions/steadystate_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/steadystate_core.cpp	(revision 4072)
+++ /issm/trunk/src/c/solutions/steadystate_core.cpp	(revision 4073)
@@ -34,5 +34,5 @@
 
 		if(verbose)_printf_("%s\n","computing depth average temperature");
-		DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
+		InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
 	
 		if(verbose)_printf_("%s\n","computing new velocity");
Index: /issm/trunk/src/c/solutions/transient3d_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/transient3d_core.cpp	(revision 4072)
+++ /issm/trunk/src/c/solutions/transient3d_core.cpp	(revision 4073)
@@ -43,5 +43,5 @@
 
 		if(verbose)_printf_("%s\n","computing depth average temperature");
-		DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
+		InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
 
 		if(verbose)_printf_("%s\n","computing new velocity");