Index: /issm/trunk/src/c/solutions/control_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/control_core.cpp	(revision 4387)
+++ /issm/trunk/src/c/solutions/control_core.cpp	(revision 4388)
@@ -90,11 +90,11 @@
 		BrentSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs);
 
-		_printf_("%s","      updating parameter using optimized search scalar...");
+		_printf_("%s\n","      updating parameter using optimized search scalar...");
 		InputAXPYx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],ControlParameterEnum);
 
-		_printf_("%s","      constraining the new distribution...");    
+		_printf_("%s\n","      constraining the new distribution...");    
 		InputControlConstrainx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
 		
-		_printf_("%s","      save new parameter...");
+		_printf_("%s\n","      save new parameter...");
 		InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,ControlParameterEnum);
 		
Index: /issm/trunk/src/c/solutions/objectivefunctionC.cpp
===================================================================
--- /issm/trunk/src/c/solutions/objectivefunctionC.cpp	(revision 4387)
+++ /issm/trunk/src/c/solutions/objectivefunctionC.cpp	(revision 4388)
@@ -37,4 +37,5 @@
 	int     analysis_type;
 	bool    control_steady;
+	bool  isstokes=false;
 	bool    conserve_loads=true;
 	
@@ -49,7 +50,12 @@
 	femmodel->parameters->FindParam(&cm_min,CmMinEnum);
 	femmodel->parameters->FindParam(&cm_max,CmMaxEnum);
+	femmodel->parameters->FindParam(&isstokes,IsStokesEnum);
 	femmodel->parameters->FindParam(&control_type,ControlTypeEnum);
 	femmodel->parameters->FindParam(&control_steady,ControlSteadyEnum);
 	femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+
+	/*set analysis type to compute velocity: */
+	if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum);
+	else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
 
 	/*Use ControlParameterEnum input to  reinitialize our input parameter: */
@@ -67,5 +73,5 @@
 
 	/*Compute misfit for this velocity field.*/
-	InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,fit[n],FitEnum);
+	InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,(int)fit[n],FitEnum);
 	CostFunctionx( &J, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters);