Changeset 79

Timestamp:

04/28/09 13:33:24 (16 years ago)

Author:

Mathieu Morlighem

Message:

Fixed message if eps_abs=NaN

File:

• issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m (modified) (1 diff)

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

@@ -84 +84 @@
 
                         %Absolute criterion
-                        if (isnan(m.parameters.eps_abs) | nduinf<=m.parameters.eps_abs),
-                                if m.parameters.debug, disp(sprintf('%s %g %s %g','      convergence criterion: max(du)=',nduinf,' < ',m.parameters.eps_abs)); end
-                        else
-                                if m.parameters.debug, disp(sprintf('%s %g %s %g','      convergence criterion: max(du)=',nduinf,' > ',m.parameters.eps_abs)); end
-                                converged=0;
+                        if ~isnan(m.parameters.eps_abs),
+                                if (nduinf<=m.parameters.eps_abs),
+                                        if m.parameters.debug, disp(sprintf('%s %g %s %g','      convergence criterion: max(du)=',nduinf,' < ',m.parameters.eps_abs)); end
+                                else
+                                        if m.parameters.debug, disp(sprintf('%s %g %s %g','      convergence criterion: max(du)=',nduinf,' > ',m.parameters.eps_abs)); end
+                                                converged=0;
+                                end
                         end
-                        
+
                         %rift convergence criterion
                         if ~constraints_converged,