--- MITgcm/pkg/seaice/seaice_jfnk.F 2012/11/09 12:56:00 1.7 +++ MITgcm/pkg/seaice/seaice_jfnk.F 2012/11/12 09:46:38 1.9 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_jfnk.F,v 1.7 2012/11/09 12:56:00 mlosch Exp $ +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 $Name: $ #include "SEAICE_OPTIONS.h" @@ -74,6 +74,7 @@ C _RL recip_deltaT LOGICAL JFNKconverged, krylovConverged + LOGICAL writeNow CHARACTER*(MAX_LEN_MBUF) msgBuf C C u/vIceRes :: residual of sea-ice momentum equations @@ -86,6 +87,7 @@ C zeta, eta, and DWATN, press _RL zetaPre (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) _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 @@ -152,6 +154,7 @@ 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) ENDDO @@ -244,7 +247,7 @@ IF ( SOLV_MAX_ITERS .GT. 0 ) & CALL SEAICE_PRECONDITIONER( U duIce, dvIce, - I zetaPre, etaPre, dwatPre, pressPre, + I zetaPre, etaPre, etaZpre, dwatPre, pressPre, I newtonIter, krylovIter, myTime, myIter, myThid ) ELSEIF (iCode.GE.2) THEN C Compute Jacobian times vector @@ -305,8 +308,17 @@ ENDIF ENDIF C Decide whether it is time to dump and reset the counter - IF ( DIFFERENT_MULTIPLE(SEAICE_monFreq,myTime+deltaTClock, - & deltaTClock) ) THEN + writeNow = DIFFERENT_MULTIPLE(SEAICE_monFreq, + & myTime+deltaTClock, deltaTClock) +#ifdef ALLOW_CAL + IF ( useCAL ) THEN + CALL CAL_TIME2DUMP( + I zeroRL, SEAICE_monFreq, deltaTClock, + U writeNow, + I myTime+deltaTclock, myIter+1, myThid ) + ENDIF +#endif + IF ( writeNow ) THEN _BEGIN_MASTER( myThid ) WRITE(msgBuf,'(A)') &' // ======================================================='