/[MITgcm]/MITgcm_contrib/dgoldberg/streamice/streamice_vel_solve.F
ViewVC logotype

Diff of /MITgcm_contrib/dgoldberg/streamice/streamice_vel_solve.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.5 by dgoldberg, Thu Jul 26 16:13:18 2012 UTC revision 1.6 by dgoldberg, Mon Jul 30 19:04:55 2012 UTC
# Line 43  C     LOCAL VARIABLES Line 43  C     LOCAL VARIABLES
43        INTEGER conv_flag, i, j, k, l, iter, cg_iters, bi, bj        INTEGER conv_flag, i, j, k, l, iter, cg_iters, bi, bj
44        INTEGER iter_numconv        INTEGER iter_numconv
45        INTEGER ikey_nl        INTEGER ikey_nl
46        _RL err_max, err_tempu, err_tempv, err_init, area        _RL err_max, err_tempu, err_tempv, err_init, area, err_max_fp
47        _RL max_vel, tempu, tempv, err_lastchange, cgtol        _RL max_vel, tempu, tempv, err_lastchange, cgtol
48        CHARACTER*(MAX_LEN_MBUF) msgBuf        CHARACTER*(MAX_LEN_MBUF) msgBuf
49  !       _RL taudx (1-OLx:sNx+OLx,1-OLy:sNy+Oly,nSx,nSy)  !       _RL taudx (1-OLx:sNx+OLx,1-OLy:sNy+Oly,nSx,nSy)
# Line 151  C     LOCAL VARIABLES Line 151  C     LOCAL VARIABLES
151    
152        iter_numconv = 0        iter_numconv = 0
153        err_max = err_init        err_max = err_init
154          err_max_fp = streamice_nonlin_tol_fp * 10.
155        err_lastchange = err_init        err_lastchange = err_init
156    
157  C START NL ITER. LOOP  C START NL ITER. LOOP
# Line 184  C       but after convergence loop does Line 185  C       but after convergence loop does
185  !$TAF STORE zv_old_si = comlev1_stream_nl, key=ikey_nl  !$TAF STORE zv_old_si = comlev1_stream_nl, key=ikey_nl
186  #endif  #endif
187    
188         IF (err_max .GT. streamice_nonlin_tol * err_init) THEN         IF ((err_max .GT. streamice_nonlin_tol * err_init) .and.
189         &     (err_max_fp .GT. streamice_nonlin_tol_fp)) THEN
190    
191         iter_numconv = iter_numconv + 1         iter_numconv = iter_numconv + 1
192    
# Line 289  C       but after convergence loop does Line 291  C       but after convergence loop does
291  !$TAF STORE V_streamice = comlev1_stream_nl, key=ikey_nl  !$TAF STORE V_streamice = comlev1_stream_nl, key=ikey_nl
292  #endif  #endif
293    
294           DO bj = myByLo(myThid), myByHi(myThid)
295            DO bi = myBxLo(myThid), myBxHi(myThid)
296             DO j=1-OLy,sNy+OLy
297              DO i=1-OLx,sNx+OLx
298               u_old_SI (i,j,bi,bj) = U_streamice (i,j,bi,bj)
299               v_old_SI (i,j,bi,bj) = V_streamice (i,j,bi,bj)
300              ENDDO
301             ENDDO
302            ENDDO
303           ENDDO
304    
305         err_max = 0. _d 0         err_max = 0. _d 0
306    
307  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
# Line 321  C       but after convergence loop does Line 334  C       but after convergence loop does
334    
335         CALL GLOBAL_MAX_R8 (err_max, myThid)         CALL GLOBAL_MAX_R8 (err_max, myThid)
336    
337           DO bj = myByLo(myThid), myByHi(myThid)
338            DO bi = myBxLo(myThid), myBxHi(myThid)
339             DO j=1,sNy
340              DO i=1,sNx
341               err_tempu = 0. _d 0
342               err_tempv = 0. _d 0
343               IF (STREAMICE_umask(i,j,bi,bj).eq.1) THEN
344                err_tempu =
345         &       ABS (U_streamice(i,j,bi,bj)-u_old_SI(i,j,bi,bj))
346               ENDIF
347               IF (STREAMICE_vmask(i,j,bi,bj).eq.1) THEN
348                err_tempv = MAX( err_tempu,
349         &       ABS (V_streamice(i,j,bi,bj)-v_old_SI(i,j,bi,bj)))
350               ENDIF
351               IF (err_tempv .ge. err_max_fp) err_max_fp = err_tempv
352              ENDDO
353             ENDDO
354            ENDDO
355           ENDDO
356    
357           CALL GLOBAL_MAX_R8 (err_max_fp, myThid)
358    
359         WRITE(msgBuf,'(A,F11.7)') 'err/err_init',         WRITE(msgBuf,'(A,F11.7)') 'err/err_init',
360       &                       err_max/err_init       &                       err_max/err_init
361         CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,         CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6
  ViewVC Help
Powered by ViewVC 1.1.22