--- MITgcm/pkg/seaice/seaice_jfnk.F 2012/11/12 09:46:38 1.9 +++ MITgcm/pkg/seaice/seaice_jfnk.F 2012/12/17 10:08:16 1.12 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_jfnk.F,v 1.9 2012/11/12 09:46:38 mlosch Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_jfnk.F,v 1.12 2012/12/17 10:08:16 mlosch Exp $ C $Name: $ #include "SEAICE_OPTIONS.h" @@ -89,7 +89,6 @@ _RL etaPre (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) _RL etaZPre (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) _RL dwatPre (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) - _RL pressPre(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) CEOP C Initialise @@ -104,8 +103,8 @@ recip_deltaT = 1. _d 0 / SEAICE_deltaTdyn iOutFGMRES=0 -C iOutFgmres=1 gives a little bit of output - IF ( debugLevel.GE.debLevA .AND. +C with iOutFgmres=1, seaice_fgmres prints the residual at each iteration + IF ( debugLevel.GE.debLevC .AND. & DIFFERENT_MULTIPLE( SEAICE_monFreq, myTime, deltaTClock ) ) & iOutFGMRES=1 @@ -145,6 +144,7 @@ I uIce, vIce, O uIceRes, vIceRes, I newtonIter, 0, myTime, myIter, myThid ) +C probably not necessary, will be removed later: CALL EXCH_UV_XY_RL( uIceRes, vIceRes,.TRUE.,myThid) C local copies of precomputed coefficients that are to stay C constant for the preconditioner @@ -152,11 +152,10 @@ DO bi=myBxLo(myThid),myBxHi(myThid) DO j=1-Oly,sNy+Oly DO i=1-Olx,sNx+Olx - zetaPre(I,J,bi,bj) = zeta(I,J,bi,bj) - etaPre(I,J,bi,bj) = eta(I,J,bi,bj) - etaZPre(I,J,bi,bj) = etaZ(I,J,bi,bj) - dwatPre(I,J,bi,bj) = DWATN(I,J,bi,bj) - pressPre(I,J,bi,bj) = press(I,J,bi,bj) + zetaPre(I,J,bi,bj) = zeta(I,J,bi,bj) + etaPre(I,J,bi,bj) = eta(I,J,bi,bj) + etaZPre(I,J,bi,bj) = etaZ(I,J,bi,bj) + dwatPre(I,J,bi,bj) = DWATN(I,J,bi,bj) ENDDO ENDDO ENDDO @@ -247,7 +246,7 @@ IF ( SOLV_MAX_ITERS .GT. 0 ) & CALL SEAICE_PRECONDITIONER( U duIce, dvIce, - I zetaPre, etaPre, etaZpre, dwatPre, pressPre, + I zetaPre, etaPre, etaZpre, dwatPre, I newtonIter, krylovIter, myTime, myIter, myThid ) ELSEIF (iCode.GE.2) THEN C Compute Jacobian times vector @@ -359,7 +358,7 @@ &' // =======================================================' CALL PRINT_MESSAGE( msgBuf, standardMessageUnit, & SQUEEZE_RIGHT, myThid ) - WRITE(msgBuf,'(A)') ' // Begin JFNK statistics' + WRITE(msgBuf,'(A)') ' // End JFNK statistics' CALL PRINT_MESSAGE( msgBuf, standardMessageUnit, & SQUEEZE_RIGHT, myThid ) WRITE(msgBuf,'(A)')