Changeset 422

Timestamp:

05/14/09 10:36:07 (16 years ago)

Author:

Mathieu Morlighem

Message:

no need to recompute the velocity that have been computed by GradJCompute. Use it to update inputs

Location:

issm/trunk/src/m/solutions/cielo

Files:

• GradJCompute.m (modified) (1 diff)
• control.m (modified) (3 diffs)

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

@@ -1 @@
-function grad_g=GradJCompute(m,inputs, u_g_obs,analysis_type);
+function [u_g grad_g]=GradJCompute(m,inputs, u_g_obs,analysis_type);
 
 %Recover solution for this stiffness and right hand side: 

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

@@ -34 +34 @@
                 %update inputs with new fit
                 inputs=add(inputs,'fit',m.parameters.fit(n),'double');
+                inputs=add(inputs,m.parameters.control_type,p_g,'doublevec',2,m.parameters.numberofnodes);
 
                 %Update inputs in datasets
@@ -39 +40 @@
 
                 disp('      computing gradJ...');
-                c(n).grad_g=GradJCompute(m,inputs,u_g_obs,md.analysis_type);
+                [u_g c(n).grad_g]=GradJCompute(m,inputs,u_g_obs,md.analysis_type);
+                inputs=add(inputs,'velocity',u_g,'doublevec',2,m.parameters.numberofnodes);
                 disp('      done.');
 
@@ -72 +74 @@
                 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),