Changeset 172

Timestamp:

05/01/09 14:46:39 (16 years ago)

Author:

Mathieu Morlighem

Message:

Some fixing of control.m (Cielo serial). More to come

Location:

issm/trunk/src/m/solutions/cielo

Files:

• GradJCompute.m (modified) (2 diffs)
• control.m (modified) (2 diffs)
• plot_direction.m (modified) (1 diff)
• plot_newdistribution.m (modified) (1 diff)

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

@@ -2 +2 @@
 
 %Recover solution for this stiffness and right hand side: 
+if m.parameters.debug
+        disp('      computing velocities...')
+end
 [u_g K_ff0 K_fs0 ]=diagnostic_core_nonlinear(m,inputs);
 
 %Buid Du, difference between observed velocity and model velocity.
+if m.parameters.debug
+        disp('      computing Du...')
+end
 [Du_g]=Du(m.elements,m.nodes,m.loads,m.materials,m.parameters, u_g,u_g_obs,inputs);
 
@@ -11 +17 @@
 
 %Solve for adjoint vector: 
+if m.parameters.debug
+        disp('      computing adjoint state...')
+end
 lambda_f=Solver(K_ff0,Du_f,[],m.parameters);
 

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

@@ -31 +31 @@
 
                 %Update inputs in datasets
-                [m.elements,m.nodes, loads,m.materials]=UpdateFromInputs(m.elements,m.nodes, loads,m.materials,inputs);
+                [m.elements,m.nodes,m.loads,m.materials]=UpdateFromInputs(m.elements,m.nodes,m.loads,m.materials,inputs);
 
                 disp('      computing gradJ...');
@@ -85 +85 @@
         disp('      done.');
         
-        
         t2=clock;
         disp(['      overall time spent on control code ' num2str(etime(t2,t1)) ' seconds'])

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

@@ -1 @@
-grad_g=c(n).grad_g;
-grad_gx=grad_g(1:2:end);grad_gy=grad_g(2:2:end); grad_g=sqrt(grad_gx.^2+grad_gy.^2);
-plotmodel(md,'data',grad_g,'title',['Normalized Direction for ' m.parameters.control_type],'figure',1,'colorbar#all','on'); drawnow;
-clear grad_g grad_gx grad_gy
+plotmodel(md,'data',sqrt(c(n).grad_g(1:2:end).^2+c(n).grad_g(2:2:end).^2),'title',['Normalized Direction for ' m.parameters.control_type],'figure',1,'colorbar#all','on'); drawnow; 

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

@@ -1 @@
-p_gx=p_g(1:2:end);p_gy=p_g(2:2:end); p_g=sqrt(p_gx.^2+p_gy.^2);
-plotmodel(md,'data',p_g,'title',['Distribution of ' m.parameters.control_type 'at iteration' num2str(n)],'figure',1,'colorbar#all','on'); drawnow;
-clear p_gx p_gy
+plotmodel(md,'data',p_g(1:2:end),'title',['Distribution of ' m.parameters.control_type ' at iteration ' num2str(n)],'figure',2,'colorbar#all','on'); pause(1);