Index: /issm/trunk-jpl/src/c/classes/Loads/Load.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Load.h	(revision 17265)
+++ /issm/trunk-jpl/src/c/classes/Loads/Load.h	(revision 17266)
@@ -24,5 +24,4 @@
 
 	public: 
-
 		virtual       ~Load(){};
 		virtual void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0;
Index: /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp	(revision 17265)
+++ /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp	(revision 17266)
@@ -23,5 +23,4 @@
 /*FUNCTION Numericalflux::Numericalflux(){{{*/
 Numericalflux::Numericalflux(){
-	this->inputs     = NULL;
 	this->parameters = NULL;
 	this->helement   = NULL;
@@ -112,4 +111,5 @@
 	this->id=numericalflux_id;
 	this->analysis_type=in_analysis_type;
+	this->flux_type = numericalflux_type;
 
 	/*Hooks: */
@@ -118,8 +118,4 @@
 	this->helement  =new Hook(numericalflux_elem_ids,1); // take only the first element for now
 
-	//intialize  and add as many inputs per element as requested: 
-	this->inputs=new Inputs();
-	this->inputs->AddInput(new IntInput(NumericalfluxTypeEnum,numericalflux_type));
-
 	//this->parameters: we still can't point to it, it may not even exist. Configure will handle this.
 	this->parameters=NULL;
@@ -130,5 +126,4 @@
 /*FUNCTION Numericalflux::~Numericalflux(){{{*/
 Numericalflux::~Numericalflux(){
-	delete inputs;
 	this->parameters=NULL;
 	delete helement;
@@ -144,9 +139,9 @@
 	_printf_("   id: " << id << "\n");
 	_printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
+	_printf_("   flux_type: " << this->flux_type<< "\n");
 	hnodes->Echo();
 	hvertices->Echo();
 	helement->Echo();
 	_printf_("   parameters: " << parameters << "\n");
-	_printf_("   inputs: " << inputs << "\n");
 }
 /*}}}*/
@@ -157,4 +152,5 @@
 	_printf_("   id: " << id << "\n");
 	_printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
+	_printf_("   flux_type: " << this->flux_type<< "\n");
 	hnodes->DeepEcho();
 	hvertices->DeepEcho();
@@ -165,7 +161,4 @@
 	else
 	 _printf_("      NULL\n");
-	_printf_("   inputs\n");
-	inputs->DeepEcho();
-
 }		
 /*}}}*/
@@ -192,10 +185,6 @@
 	numericalflux->id=this->id;
 	numericalflux->analysis_type=this->analysis_type;
-	if(this->inputs){
-		numericalflux->inputs=(Inputs*)this->inputs->Copy();
-	}
-	else{
-		numericalflux->inputs=new Inputs();
-	}
+	numericalflux->flux_type=this->flux_type;
+
 	/*point parameters: */
 	numericalflux->parameters=this->parameters;
@@ -303,10 +292,8 @@
 void Numericalflux::GetNodesSidList(int* sidlist){
 
-	int type;
-	inputs->GetInputValue(&type,NumericalfluxTypeEnum);
 	_assert_(sidlist);
 	_assert_(nodes);
 
-	switch(type){
+	switch(this->flux_type){
 		case InternalEnum:
 			for(int i=0;i<NUMNODES_INTERNAL;i++) sidlist[i]=nodes[i]->Sid();
@@ -316,5 +303,5 @@
 			return;
 		default:
-			_error_("Numericalflux type " << EnumToStringx(type) << " not supported yet");
+			_error_("Numericalflux type " << EnumToStringx(this->flux_type) << " not supported yet");
 	}
 }
@@ -323,10 +310,8 @@
 void Numericalflux::GetNodesLidList(int* lidlist){
 
-	int type;
-	inputs->GetInputValue(&type,NumericalfluxTypeEnum);
 	_assert_(lidlist);
 	_assert_(nodes);
 
-	switch(type){
+	switch(this->flux_type){
 		case InternalEnum:
 			for(int i=0;i<NUMNODES_INTERNAL;i++) lidlist[i]=nodes[i]->Lid();
@@ -336,5 +321,5 @@
 			return;
 		default:
-			_error_("Numericalflux type " << EnumToStringx(type) << " not supported yet");
+			_error_("Numericalflux type " << EnumToStringx(this->flux_type) << " not supported yet");
 	}
 }
@@ -343,8 +328,5 @@
 int Numericalflux::GetNumberOfNodes(void){
 
-	int type;
-	inputs->GetInputValue(&type,NumericalfluxTypeEnum);
-
-	switch(type){
+	switch(this->flux_type){
 		case InternalEnum:
 			return NUMNODES_INTERNAL;
@@ -352,5 +334,5 @@
 			return NUMNODES_BOUNDARY;
 		default:
-			_error_("Numericalflux type " << EnumToStringx(type) << " not supported yet");
+			_error_("Numericalflux type " << EnumToStringx(this->flux_type) << " not supported yet");
 	}
 
@@ -444,8 +426,5 @@
 ElementMatrix* Numericalflux::CreateKMatrixMasstransport(void){
 
-	int type;
-	inputs->GetInputValue(&type,NumericalfluxTypeEnum);
-
-	switch(type){
+	switch(this->flux_type){
 		case InternalEnum:
 			return CreateKMatrixMasstransportInternal();
@@ -597,8 +576,5 @@
 ElementMatrix* Numericalflux::CreateKMatrixBalancethickness(void){
 
-	int type;
-	inputs->GetInputValue(&type,NumericalfluxTypeEnum);
-
-	switch(type){
+	switch(this->flux_type){
 		case InternalEnum:
 			return CreateKMatrixBalancethicknessInternal();
@@ -748,8 +724,5 @@
 ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethickness(void){
 
-	int type;
-	inputs->GetInputValue(&type,NumericalfluxTypeEnum);
-
-	switch(type){
+	switch(this->flux_type){
 		case InternalEnum:
 			return CreateKMatrixAdjointBalancethicknessInternal();
@@ -780,8 +753,5 @@
 ElementVector* Numericalflux::CreatePVectorMasstransport(void){
 
-	int type;
-	inputs->GetInputValue(&type,NumericalfluxTypeEnum);
-
-	switch(type){
+	switch(this->flux_type){
 		case InternalEnum:
 			return CreatePVectorMasstransportInternal();
@@ -874,8 +844,5 @@
 ElementVector* Numericalflux::CreatePVectorBalancethickness(void){
 
-	int type;
-	inputs->GetInputValue(&type,NumericalfluxTypeEnum);
-
-	switch(type){
+	switch(this->flux_type){
 		case InternalEnum:
 			return CreatePVectorBalancethicknessInternal();
Index: /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.h	(revision 17265)
+++ /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.h	(revision 17266)
@@ -22,4 +22,5 @@
 		int id;
 		int analysis_type;
+		int flux_type;
 
 		/*Hooks*/
@@ -33,5 +34,4 @@
 		Node       **nodes;
 		Parameters  *parameters;
-		Inputs      *inputs;
 
 		/*Numericalflux constructors,destructors {{{*/
Index: /issm/trunk-jpl/src/c/classes/Materials/Material.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Materials/Material.h	(revision 17265)
+++ /issm/trunk-jpl/src/c/classes/Materials/Material.h	(revision 17266)
@@ -19,5 +19,5 @@
 	public: 
 		Inputs*  inputs;
-		virtual       ~Material(){};
+		virtual ~Material(){};
 		/*WARNING: input should not be public but it is an easy way to update B from T (using UpdateFromSolution) from Pentas*/
 
Index: /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp	(revision 17265)
+++ /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp	(revision 17266)
@@ -210,5 +210,5 @@
 			this->g=constant;
 			break;
-  	        case  SurfaceforcingsDesfacEnum:
+		case  SurfaceforcingsDesfacEnum:
 			this->desfac=constant;
 			break;