Changeset 1128

Timestamp:

06/26/09 12:26:20 (16 years ago)

Author:

Mathieu Morlighem

Message:

minor cosmetics

Location:

issm/trunk/src/m/solutions/cielo

Files:

• GradJCompute.m (modified) (2 diffs)
• control_core.m (modified) (1 diff)
• diagnostic_core_linear.m (modified) (1 diff)
• diagnostic_core_nonlinear.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
+displaystring(m.parameters.debug,'%s','         computing velocities...');
 [u_g K_ff0 K_fs0 ]=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);
 
 %Buid Du, difference between observed velocity and model velocity.
-if m.parameters.debug
-        disp('         computing Du...')
-end
+displaystring(m.parameters.debug,'%s','          computing Du...');
 [Du_g]=Du(m.elements,m.nodes,m.loads,m.materials,m.parameters, u_g,u_g_obs,inputs,analysis_type,sub_analysis_type);
 
@@ -17 +13 @@
 
 %Solve for adjoint vector: 
-if m.parameters.debug
-        disp('         computing adjoint state...')
-end
+displaystring(m.parameters.debug,'%s','          computing adjoint state...');
 lambda_f=Solver(K_ff0,Du_f,[],m.parameters);
 

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

@@ -18 +18 @@
 %initialize control parameters, gradients and observations
 u_g_obs=m_dh.parameters.u_g_obs;
-grad_g=zeros(m_dh.parameters.numberofnodes,1);
 param_g=models.dh.parameters.param_g;
 

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

@@ -17 +17 @@
         %Reduce tangent matrix from g size to f size
         [K_ff, K_fs] = Reducematrixfromgtof( K_gg, m.Gmn, m.nodesets); 
-        displaystring(m.parameters.debug,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
+        displaystring(m.parameters.debug>1,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
         
         %Reduce load from g size to f size

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

@@ -46 +46 @@
 
                 %Solve  
-                if(m.parameters.debug>2)disp(sprintf('%s%g','      condition number of stiffness matrix: ',condest(K_ff)));end;
+                displaystring(m.parameters.debug>1,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
                 [soln(count).u_f]=Solver(K_ff,p_f,[],m.parameters);