Index: /issm/trunk/src/m/solutions/cielo/control_core.m
===================================================================
--- /issm/trunk/src/m/solutions/cielo/control_core.m	(revision 2226)
+++ /issm/trunk/src/m/solutions/cielo/control_core.m	(revision 2227)
@@ -113,6 +113,15 @@
 
 %compute final velocity from diagnostic_core (horiz+vertical)
-inputs=add(inputs,model.parameters.control_type,param_g,'doublevec',1,model.parameters.numberofnodes);
-results_diag=diagnostic_core(models,inputs);
+if model.parameters.control_steady;
+	inputs=add(inputs,model.parameters.control_type,param_g,'doublevec',1,model.parameters.numberofnodes);
+	steadystate_results=steadystate_core(models,inputs); t_g=results.t_g; 
+	u_g=steadystate_results.u_g;
+	t_g=steadystate_results.t_g;
+	m_g=steadystate_results.m_g;
+else
+	inputs=add(inputs,model.parameters.control_type,param_g,'doublevec',1,model.parameters.numberofnodes);
+	results_diag=diagnostic_core(models,inputs);
+	u_g=results_diag.u_g;
+end
 
 %Recover misfit at each iteration of the control method 
@@ -127,3 +136,7 @@
 results.J=J;
 results.param_g=param_g;
-results.u_g=results_diag.u_g;
+results.u_g=u_g;
+if model.parameters.control_steady,
+	results.t_g=t_g;
+	results.m_g=m_g;
+end