Index: /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.h	(revision 17268)
+++ /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.h	(revision 17269)
@@ -10,5 +10,4 @@
 class Hook;
 class Parameters;
-class Inputs;
 class IoModel;
 class Element;
Index: /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp	(revision 17268)
+++ /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp	(revision 17269)
@@ -22,5 +22,4 @@
 /*FUNCTION Riftfront::Riftfront(){{{*/
 Riftfront::Riftfront(){
-	this->inputs=NULL;
 	this->parameters=NULL;
 	this->hnodes=NULL;
@@ -90,18 +89,10 @@
 	this->state=reCast<int,IssmDouble>(*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+11));
 
-	//intialize inputs, and add as many inputs per element as requested: 
-	this->inputs=new Inputs();
-
-	riftfront_type=SegmentRiftfrontEnum;
-	riftfront_fill = reCast<int,IssmDouble>(*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+7));
-	riftfront_friction=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+8);
-	riftfront_fractionincrement=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+10);
-	riftfront_shelf=reCast<bool,IssmDouble>(iomodel->Data(MaskGroundediceLevelsetEnum)[node1-1]<0.);
-
-	this->inputs->AddInput(new IntInput(RiftfrontTypeEnum,riftfront_type));
-	this->inputs->AddInput(new IntInput(FillEnum,riftfront_fill));
-	this->inputs->AddInput(new DoubleInput(FrictionEnum,riftfront_friction));
-	this->inputs->AddInput(new DoubleInput(FractionIncrementEnum,riftfront_fractionincrement));
-	this->inputs->AddInput(new BoolInput(SegmentOnIceShelfEnum,riftfront_shelf));
+	//intialize properties
+	this->type=SegmentRiftfrontEnum;
+	this->fill = reCast<int,IssmDouble>(*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+7));
+	this->friction=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+8);
+	this->fractionincrement=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+10);
+	this->shelf=reCast<bool,IssmDouble>(iomodel->Data(MaskGroundediceLevelsetEnum)[node1-1]<0.);
 
 	//parameters and hooked fields: we still can't point to them, they may not even exist. Configure will handle this.
@@ -115,7 +106,5 @@
 /*FUNCTION Riftfront::~Riftfront(){{{*/
 Riftfront::~Riftfront(){
-	delete inputs;
 	this->parameters=NULL;
-
 	delete hnodes;
 	delete helements;
@@ -127,13 +116,4 @@
 /*FUNCTION Riftfront::Echo {{{*/
 void Riftfront::Echo(void){
-
-	Input* input=NULL;
-	int fill;
-	IssmDouble friction,fractionincrement;
-
-	/*recover some inputs first: */
-	input=(Input*)this->inputs->GetInput(FillEnum); input->GetInputValue(&fill);
-	input=(Input*)this->inputs->GetInput(FrictionEnum); input->GetInputValue(&friction);
-	input=(Input*)this->inputs->GetInput(FractionIncrementEnum); input->GetInputValue(&fractionincrement);
 
 	_printf_("Riftfront:\n");
@@ -144,5 +124,4 @@
 	_printf_("   hmatpar: " << hmatpar << "\n");
 	_printf_("   parameters: " << parameters << "\n");
-	_printf_("   inputs: " << inputs << "\n");
 	_printf_("   internal parameters: \n");
 	_printf_("   normal: " << normal[0] << "|" << normal[1] << "\n");
@@ -173,6 +152,4 @@
 	_printf_("   parameters\n");
 	if(parameters)parameters->DeepEcho();
-	_printf_("   inputs\n");
-	if(inputs)inputs->DeepEcho();
 }
 /*}}}*/
@@ -197,10 +174,10 @@
 	riftfront->id=this->id;
 	riftfront->analysis_type=this->analysis_type;
-	if(this->inputs){
-		riftfront->inputs=(Inputs*)this->inputs->Copy();
-	}
-	else{
-		riftfront->inputs=new Inputs();
-	}
+	riftfront->type=this->type;
+	riftfront->fill=this->fill;
+	riftfront->friction=this->friction;
+	riftfront->fractionincrement=this->fractionincrement;
+	riftfront->shelf=this->shelf;
+
 	/*point parameters: */
 	riftfront->parameters=this->parameters;
@@ -237,11 +214,4 @@
 /*FUNCTION Riftfront::InputUpdateFromConstant(bool constant,int name) {{{*/
 void  Riftfront::InputUpdateFromConstant(bool constant,int name){
-
-	/*Check that name is a Riftfront input*/
-	if (!IsInput(name)) return;
-
-	/*update input*/
-	this->inputs->AddInput(new BoolInput(name,constant));
-
 }
 /*}}}*/
@@ -249,10 +219,4 @@
 void  Riftfront::InputUpdateFromConstant(IssmDouble constant,int name){
 
-	/*Check that name is a Riftfront input*/
-	if (!IsInput(name)) return;
-
-	/*update input*/
-	this->inputs->AddInput(new DoubleInput(name,constant));
-
 }
 /*}}}*/
@@ -260,10 +224,5 @@
 void    Riftfront::InputUpdateFromVector(IssmDouble* vector, int name, int type){
 
-	/*Check that name is a Riftfront input*/
-	if (!IsInput(name)) return;
-
-	/*update input*/
 	_error_("not implemented yet");
-	//this->inputs->AddInput(new DoubleInput(name,constant));
 
 }
@@ -458,5 +417,4 @@
 	IssmDouble  h[2];
 	IssmDouble  penalty_offset;
-	IssmDouble  friction;
 
 	/*Objects: */
@@ -475,5 +433,4 @@
 	/*Get some parameters: */
 	this->parameters->FindParam(&penalty_offset,StressbalancePenaltyFactorEnum);
-	this->inputs->GetInputValue(&friction,FrictionEnum);
 	tria1->GetInputValue(&h[0],nodes[0],ThicknessEnum);
 	tria2->GetInputValue(&h[1],nodes[1],ThicknessEnum);
@@ -547,6 +504,4 @@
 	IssmDouble pressure_melange;
 	IssmDouble pressure_water;
-	int        fill;
-	bool       shelf;
 
 	/*Objects: */
@@ -564,6 +519,4 @@
 
 	/*Get some inputs: */
-	this->inputs->GetInputValue(&fill,FillEnum);
-	this->inputs->GetInputValue(&shelf,SegmentOnIceShelfEnum);
 	rho_ice=matpar->GetRhoIce();
 	rho_water=matpar->GetRhoWater();
@@ -642,5 +595,4 @@
 	IssmDouble  vx2;
 	IssmDouble  vy2;
-	IssmDouble  fractionincrement;
 
 	/*Objects: */
@@ -671,7 +623,4 @@
 		return 1;
 	}
-
-	/*recover parameters: */
-	this->inputs->GetInputValue(&fractionincrement,FractionIncrementEnum);
 
 	/*First recover velocity: */
@@ -734,15 +683,2 @@
 }
 /*}}}*/
-/*FUNCTION Riftfront::IsInput{{{*/
-bool Riftfront::IsInput(int name){
-	if (
-				name==ConvergedEnum ||
-				name==ThicknessEnum ||
-				name==SurfaceEnum ||
-				name==BedEnum 
-		){
-		return true;
-	}
-	else return false;
-}
-/*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Loads/Riftfront.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Riftfront.h	(revision 17268)
+++ /issm/trunk-jpl/src/c/classes/Loads/Riftfront.h	(revision 17269)
@@ -11,5 +11,4 @@
 class Hook;
 class Parameters;
-class Inputs;
 class IoModel;
 /*}}}*/
@@ -20,4 +19,11 @@
 		int		id;
 		int     analysis_type;
+
+		/*properties*/
+		int        type;
+		int        fill;
+		IssmDouble friction;
+		IssmDouble fractionincrement;
+		bool       shelf;
 
 		/*hooks: */
@@ -44,5 +50,4 @@
 
 		Parameters *parameters;           //pointer to solution parameters
-		Inputs     *inputs;
 
 		/*Riftfrontconstructors,destructors: {{{*/
@@ -89,5 +94,4 @@
 		void  FreezeConstraints(void);
 		bool  IsFrozen(void);
-		bool  IsInput(int name);
 		/*}}}*/
 };