Changeset 1121

Timestamp:

06/26/09 10:44:01 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed control output velocity

File:

• issm/trunk/src/m/solutions/cielo/control_core.m (modified) (1 diff)

issm/trunk/src/m/solutions/cielo/control_core.m

@@ -73 +73 @@
 %generate output
 displaystring(debug,'\n%s',['      preparing final velocity solution...']);
-results=controlfinalsol(c,m_dh,param_g,inputs,'diagnostic','horiz');
+
+%compute final velocity from diagnostic_core (horiz+vertical)
+inputs=add(inputs,m_dh.parameters.control_type,param_g,'doublevec',1,m_dh.parameters.numberofnodes);
+results_diag=diagnostic_core(models,inputs);
+
+%Recover misfit at each iteration of the control method 
+J=zeros(length(c),1);
+for i=1:length(c),
+        J(i)=c(i).J;
+end
+
+%build results
+results.time=0;
+results.step=1;
+results.J=J;
+results.param_g=param_g;
+results.u_g=results_diag.u_g;