Changeset 379

Timestamp:

05/13/09 09:44:00 (16 years ago)

Author:

Mathieu Morlighem

Message:

the input velocity is computed after each iteration

File:

• issm/trunk/src/m/solutions/cielo/control.m (modified) (4 diffs)

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

@@ -13 +13 @@
         %initialize control parameters, gradients and observations
         u_g_obs=m.parameters.u_g_obs;
+        u_g=m.parameters.u_g;
         p_g=m.parameters.p_g;
         grad_g=zeros(m.nodesets.gsize,1);
@@ -21 +22 @@
         %initialize inputs, ie m.nparameters on which we invert.
         inputs=inputlist;
-        inputs=add(inputs,'velocity',m.parameters.u_g,'doublevec',3,m.parameters.numberofnodes);
+        inputs=add(inputs,m.parameters.control_type,p_g,'doublevec',2,m.parameters.numberofnodes);
+        inputs=add(inputs,'velocity',u_g,'doublevec',3,m.parameters.numberofnodes);
 
         for n=1:m.parameters.nsteps,
@@ -30 +32 @@
                 disp(sprintf('\n%s%s%s%s\n',['   control method step ' num2str(n) '/' num2str(m.parameters.nsteps)]));
 
-                %update inputs with new parameter and fit
-                inputs=add(inputs,m.parameters.control_type,p_g,'doublevec',2,m.parameters.numberofnodes);
+                %update inputs with new fit
                 inputs=add(inputs,'fit',m.parameters.fit(n),'double');
 
@@ -72 +73 @@
                 end
 
+                disp('      update velocity...');    
+                inputs=add(inputs,m.parameters.control_type,p_g,'doublevec',2,m.parameters.numberofnodes);
+                u_g=diagnostic_core_nonlinear(m,inputs,md.analysis_type);
+                inputs=add(inputs,'velocity',u_g,'doublevec',2,m.parameters.numberofnodes);
+                disp('      done.');
+
                 %some temporary saving 
                 if(mod(n,5)==0),