Diff of /MITgcm/pkg/seaice/seaice_jfnk.F

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm/pkg/seaice/seaice_jfnk.F	2013/01/17 08:51:15	1.16
+++ MITgcm/pkg/seaice/seaice_jfnk.F	2013/01/17 10:42:43	1.17
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_jfnk.F,v 1.16 2013/01/17 08:51:15 mlosch Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_jfnk.F,v 1.17 2013/01/17 10:42:43 mlosch Exp $
 C $Name:  $
 
 #include "SEAICE_OPTIONS.h"
@@ -254,8 +254,13 @@
         IF ( krylovIter.EQ.SEAICEkrylovIterMax ) THEN
          krylovFails = krylovFails + 1
         ENDIF
-C     Set the stopping criterion for the Newton iteration
-        IF ( newtonIter .EQ. 1 ) JFNKtol=JFNKgamma_nonlin*JFNKresidual
+C     Set the stopping criterion for the Newton iteration and the
+C     criterion for the transition from accurate to approximate FGMRES
+        IF ( newtonIter .EQ. 1 ) THEN
+         JFNKtol=JFNKgamma_nonlin*JFNKresidual
+         IF ( JFNKres_tFac .NE. UNSET_RL )
+     &        JFNKres_t = JFNKresidual * JFNKres_tFac
+        ENDIF
 C     Update linear solution vector and return to Newton iteration
 C     Do a linesearch if necessary, and compute a new residual.
 C     Note that it should be possible to do the following operations