Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 11807)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 11808)
@@ -448,5 +448,5 @@
 					  ./solutions/controlrestart.cpp\
 					  ./solutions/controlconvergence.cpp\
-					  ./solutions/objectivefunctionC.cpp\
+					  ./solutions/objectivefunction.cpp\
 					  ./solutions/gradient_core.cpp\
 					  ./solutions/adjointdiagnostic_core.cpp\
Index: /issm/trunk-jpl/src/c/solutions/control_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/control_core.cpp	(revision 11807)
+++ /issm/trunk-jpl/src/c/solutions/control_core.cpp	(revision 11808)
@@ -99,5 +99,5 @@
 		_printf_(VerboseControl(),"%s\n","   optimizing along gradient direction");
 		optpars.maxiter=(int)maxiter[n]; optpars.cm_jump=cm_jump[n];
-		BrentSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs);
+		BrentSearch(&search_scalar,J+n,&optpars,&objectivefunction,&optargs);
 
 		_printf_(VerboseControl(),"%s\n","   updating parameter using optimized search scalar"); //true means update save controls
Index: /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp	(revision 11808)
+++ /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp	(revision 11808)
@@ -0,0 +1,76 @@
+/*!\file:  objectivefunction
+ * \brief  objective function that returns a misfit, for a certain parameter.
+ */ 
+
+/*include files: {{{1*/
+#ifdef HAVE_CONFIG_H
+	#include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+#include "../toolkits/toolkits.h"
+#include "../objects/objects.h"
+#include "../shared/shared.h"
+#include "../EnumDefinitions/EnumDefinitions.h"
+#include "../solvers/solvers.h"
+#include "./solutions.h"
+#include "../modules/modules.h"
+#include "../include/include.h"
+/*}}}*/
+
+double objectivefunction(double search_scalar,OptArgs* optargs){
+
+	int i;  
+	
+	/*output: */
+	double J;
+	
+	/*parameters: */
+	int        solution_type,analysis_type;
+	bool       isstokes       = false;
+	bool       conserve_loads = true;
+	FemModel  *femmodel       = NULL;
+
+	/*Recover finite element model: */
+	femmodel=optargs->femmodel;
+
+	/*Recover parameters: */
+	femmodel->parameters->FindParam(&isstokes,FlowequationIsstokesEnum);
+	femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+	femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+
+	/*set analysis type to compute velocity: */
+	if (solution_type==SteadystateSolutionEnum || solution_type==DiagnosticSolutionEnum){
+		femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
+	}
+	else if (solution_type==BalancethicknessSolutionEnum){
+		femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum);
+	}
+	else{
+		_error_("Solution %s not implemented yet",EnumToStringx(solution_type));
+	}
+
+	/*update parameter according to scalar: */ //false means: do not save control
+	InputControlUpdatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,search_scalar,false);
+
+	/*Run diagnostic with updated inputs: */
+	if (solution_type==SteadystateSolutionEnum){
+		diagnostic_core(femmodel);	//We need a 3D velocity!! (vz is required for the next thermal run)
+	}
+	else if (solution_type==DiagnosticSolutionEnum){
+		solver_nonlinear(femmodel,conserve_loads); 
+	}
+	else if (solution_type==BalancethicknessSolutionEnum){
+		solver_linear(femmodel); 
+	}
+	else{
+		_error_("Solution %s not implemented yet",EnumToStringx(solution_type));
+	}
+
+	/*Compute misfit for this velocity field.*/
+	CostFunctionx(&J, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters);
+
+	/*Free ressources:*/
+	return J;
+}
Index: sm/trunk-jpl/src/c/solutions/objectivefunctionC.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/objectivefunctionC.cpp	(revision 11807)
+++ 	(revision )
@@ -1,76 +1,0 @@
-/*!\file:  objectivefunctionC
- * \brief  objective function that returns a misfit, for a certain parameter.
- */ 
-
-/*include files: {{{1*/
-#ifdef HAVE_CONFIG_H
-	#include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-#include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
-#include "../shared/shared.h"
-#include "../EnumDefinitions/EnumDefinitions.h"
-#include "../solvers/solvers.h"
-#include "./solutions.h"
-#include "../modules/modules.h"
-#include "../include/include.h"
-/*}}}*/
-
-double objectivefunctionC(double search_scalar,OptArgs* optargs){
-
-	int i;  
-	
-	/*output: */
-	double J;
-	
-	/*parameters: */
-	int        solution_type,analysis_type;
-	bool       isstokes       = false;
-	bool       conserve_loads = true;
-	FemModel  *femmodel       = NULL;
-
-	/*Recover finite element model: */
-	femmodel=optargs->femmodel;
-
-	/*Recover parameters: */
-	femmodel->parameters->FindParam(&isstokes,FlowequationIsstokesEnum);
-	femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-	femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
-
-	/*set analysis type to compute velocity: */
-	if (solution_type==SteadystateSolutionEnum || solution_type==DiagnosticSolutionEnum){
-		femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
-	}
-	else if (solution_type==BalancethicknessSolutionEnum){
-		femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum);
-	}
-	else{
-		_error_("Solution %s not implemented yet",EnumToStringx(solution_type));
-	}
-
-	/*update parameter according to scalar: */ //false means: do not save control
-	InputControlUpdatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,search_scalar,false);
-
-	/*Run diagnostic with updated inputs: */
-	if (solution_type==SteadystateSolutionEnum){
-		diagnostic_core(femmodel);	//We need a 3D velocity!! (vz is required for the next thermal run)
-	}
-	else if (solution_type==DiagnosticSolutionEnum){
-		solver_nonlinear(femmodel,conserve_loads); 
-	}
-	else if (solution_type==BalancethicknessSolutionEnum){
-		solver_linear(femmodel); 
-	}
-	else{
-		_error_("Solution %s not implemented yet",EnumToStringx(solution_type));
-	}
-
-	/*Compute misfit for this velocity field.*/
-	CostFunctionx(&J, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters);
-
-	/*Free ressources:*/
-	return J;
-}
Index: /issm/trunk-jpl/src/c/solutions/solutions.h
===================================================================
--- /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 11807)
+++ /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 11808)
@@ -32,5 +32,5 @@
 void steadystate_core(FemModel* femmodel);
 void transient_core(FemModel* femmodel);
-double objectivefunctionC(double search_scalar,OptArgs* optargs);
+double objectivefunction(double search_scalar,OptArgs* optargs);
 
 //convergence: