Index: /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp	(revision 25470)
+++ /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp	(revision 25471)
@@ -31,8 +31,5 @@
 	this->weights_enum = UNDEF;
 	this->misfit=0;
-	this->lock=0;
 	this->timepassedflag = false;
-	this->last_time = 0.;
-
 }
 /*}}}*/
@@ -48,5 +45,4 @@
 
 	this->misfit=0;
-	this->lock=0;
 }
 /*}}}*/
@@ -54,5 +50,4 @@
 	if(this->name)xDelete(this->name);
 	this->misfit=0;
-	this->lock=0;
 }
 /*}}}*/
@@ -61,5 +56,4 @@
 	Cfdragcoeffabsgrad* mf = new Cfdragcoeffabsgrad(this->name,this->definitionenum, this->weights_enum,this->timepassedflag);
 	mf->misfit=this->misfit;
-	mf->lock=this->lock;
 	return (Object*) mf;
 }
@@ -100,25 +94,21 @@
 /*}}}*/
 IssmDouble Cfdragcoeffabsgrad::Response(FemModel* femmodel){/*{{{*/
-	 /*diverse: */
-	 IssmDouble time;
 
-	 /*recover time parameters: */
-		 int i;
-		 IssmDouble J=0.;
-		 IssmDouble J_sum=0.;
+	/*recover parameters: */
+	IssmDouble J=0.;
+	IssmDouble J_sum=0.;
 
-		 for(i=0;i<femmodel->elements->Size();i++){
-			 Element* element=(Element*)femmodel->elements->GetObjectByOffset(i);
-			 J+=this->Cfdragcoeffabsgrad_Calculation(element,weights_enum);
-		 }
+	for(int i=0;i<femmodel->elements->Size();i++){
+		Element* element=(Element*)femmodel->elements->GetObjectByOffset(i);
+		J+=this->Cfdragcoeffabsgrad_Calculation(element,weights_enum);
+	}
 
-		 ISSM_MPI_Allreduce ( (void*)&J,(void*)&J_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
-		 ISSM_MPI_Bcast(&J_sum,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
-		 J=J_sum;
+	ISSM_MPI_Allreduce ( (void*)&J,(void*)&J_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+	ISSM_MPI_Bcast(&J_sum,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
+	J=J_sum;
 
-		 timepassedflag = true;
-		 return J;
- }
-	/*}}}*/
+	timepassedflag = true;
+	return J;
+}/*}}}*/
 IssmDouble Cfdragcoeffabsgrad::Cfdragcoeffabsgrad_Calculation(Element* element, int weights_enum){/*{{{*/
 
Index: /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h	(revision 25470)
+++ /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h	(revision 25471)
@@ -21,7 +21,5 @@
 		int         weights_enum;
 		bool			timepassedflag;
-		IssmDouble	last_time;
 		
-		int         lock; // if lock is on, we just return the value stored in "misfit".  this is used so we don't compute misfit past the final_time
 		IssmDouble  misfit; //value carried over in time.
 		
Index: /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.cpp	(revision 25470)
+++ /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.cpp	(revision 25471)
@@ -30,8 +30,6 @@
 	this->name = NULL;
 	this->misfit=0;
-	this->lock=0;
 	this->datatime=0.;
 	this->timepassedflag = false;
-	this->last_time=0.;
 
 }
@@ -48,5 +46,4 @@
 
 	this->misfit=0;
-	this->lock=0;
 }
 /*}}}*/
@@ -54,5 +51,4 @@
 	if(this->name)xDelete(this->name);
 	this->misfit=0;
-	this->lock=0;
 }
 /*}}}*/
@@ -61,5 +57,4 @@
 	Cfsurfacelogvel* mf = new Cfsurfacelogvel(this->name,this->definitionenum,this->datatime,this->timepassedflag);
 	mf->misfit=this->misfit;
-	mf->lock=this->lock;
 	return (Object*) mf;
 }
@@ -105,6 +100,4 @@
 	IssmDouble time;
 	femmodel->parameters->FindParam(&time,TimeEnum);
-	if(time < last_time) this->timepassedflag = false; //FIXME: do we really need this? looks like an old piece of code before copy
-	this->last_time = time;
 
 	IssmDouble J=0.;
Index: /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.h	(revision 25470)
+++ /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.h	(revision 25471)
@@ -21,7 +21,5 @@
 		IssmDouble	datatime;
 		bool			timepassedflag;
-		IssmDouble	last_time;
 		
-		int         lock; // if lock is on, we just return the value stored in "misfit".  this is used so we don't compute misfit past the final_time
 		IssmDouble  misfit; //value carried over in time.
 		
Index: /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp	(revision 25470)
+++ /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp	(revision 25471)
@@ -33,9 +33,6 @@
 	this->weights_enum = UNDEF;
 	this->misfit=0;
-	this->lock=0;
 	this->datatime=0.;
 	this->timepassedflag = false;
-	this->last_time = 0.;
-
 }
 /*}}}*/
@@ -54,5 +51,4 @@
 
 	this->misfit=0;
-	this->lock=0;
 }
 /*}}}*/
@@ -60,5 +56,4 @@
 	if(this->name)xDelete(this->name);
 	this->misfit=0;
-	this->lock=0;
 }
 /*}}}*/
@@ -67,5 +62,4 @@
 	Cfsurfacesquare* mf = new Cfsurfacesquare(this->name,this->definitionenum, this->model_enum,this->observation_enum,this->weights_enum,this->datatime,this->timepassedflag);
 	mf->misfit=this->misfit;
-	mf->lock=this->lock;
 	return (Object*) mf;
 }
@@ -114,13 +108,10 @@
 	 /*recover time parameters: */
 	 femmodel->parameters->FindParam(&time,TimeEnum);
-	 if(time < last_time) timepassedflag = false;
-	 last_time = time;
 
-		 int i;
-		 IssmDouble J=0.;
-		 IssmDouble J_sum=0.;
+	 IssmDouble J=0.;
+	 IssmDouble J_sum=0.;
 
 	 if(datatime<=time && !timepassedflag){
-		 for(i=0;i<femmodel->elements->Size();i++){
+		 for(int i=0;i<femmodel->elements->Size();i++){
 			 Element* element=(Element*)femmodel->elements->GetObjectByOffset(i);
 			 J+=this->Cfsurfacesquare_Calculation(element,model_enum,observation_enum,weights_enum);
@@ -133,5 +124,5 @@
 		 timepassedflag = true;
 		 return J;
-	}
+	 }
 	 else return J;
  }
Index: /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h	(revision 25470)
+++ /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h	(revision 25471)
@@ -26,7 +26,5 @@
 		IssmDouble	datatime;
 		bool			timepassedflag;
-		IssmDouble	last_time;
 		
-		int         lock; // if lock is on, we just return the value stored in "misfit".  this is used so we don't compute misfit past the final_time
 		IssmDouble  misfit; //value carried over in time.
 		
Index: /issm/trunk-jpl/src/c/classes/Misfit.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Misfit.cpp	(revision 25470)
+++ /issm/trunk-jpl/src/c/classes/Misfit.cpp	(revision 25471)
@@ -229,5 +229,5 @@
 
 		 /*If we are locked, return time average: */
-		 if(this->lock)return misfit/(time-starttime);
+		 if(this->lock) return misfit/(time-starttime);
 
 		 /*First, the global  model response: */