Changeset 1225

Timestamp:

07/02/09 16:52:27 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added residue

Location:

issm/trunk/src/m/solutions/cielo

Files:

• control_core.m (modified) (1 diff)
• diagnostic_core_nonlinear.m (modified) (2 diffs)

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

@@ -27 +27 @@
 %Take car of Stokes : compute slope and get spc once for all
 if isstokes,
-        [inputs m_ds]=ControlProcessStokes(models,inputs);
+        [inputs m_ds]=ControlPrepareStokes(models,inputs);
 end
 

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

@@ -49 +49 @@
                 [soln(count).u_f]=Solver(K_ff,p_f,[],m.parameters);
 
+                %Get residue
+                residu=norm(K_ff*soln(count).u_f-p_f,2);
+
                 %Merge back to g set
                 [soln(count).u_g]= Mergesolutionfromftog( soln(count).u_f, m.Gmn, m.ys, m.nodesets ); 
@@ -67 +70 @@
                 ndu=norm(dug,2); 
                 nu=norm(soln(count-1).u_g,2); 
+
+                %Residue criterion
+                displaystring(m.parameters.debug,'%s%g','      convergence criterion: norm(residue)=',residu);
 
                 %Relative criterion