Index: /issm/trunk/src/m/solutions/cielo/objectivefunctionC.m
===================================================================
--- /issm/trunk/src/m/solutions/cielo/objectivefunctionC.m	(revision 2217)
+++ /issm/trunk/src/m/solutions/cielo/objectivefunctionC.m	(revision 2218)
@@ -17,16 +17,5 @@
 
 %Run diagnostic with updated parameters.
-if ~m.parameters.control_steady;
-	%do a simple diagnostic, with the current temperature profile, do not look for steady state.
-	u_g=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);
-else
-	%do a full thermal mechanical steady state converged computation, much slower!
-	results=steadystate_core(models,inputs); u_g=results.u_g; 
-
-	%u_g ships with 3 or 4 dofs, we only want the horizontal ones!
-	if ~models.dh.parameters.isstokes, 
-		u_g=u_g(dofsetgen([1,2],3,m.parameters.numberofnodes*3));
-	end
-end
+u_g=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);
 
 %add velocity to inputs.