/[MITgcm]/MITgcm/pkg/mom_vecinv/mom_vecinv.F
ViewVC logotype

Diff of /MITgcm/pkg/mom_vecinv/mom_vecinv.F

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

revision 1.60 by jmc, Thu Nov 23 00:45:21 2006 UTC revision 1.75 by jmc, Wed Dec 24 19:13:53 2014 UTC
# Line 2  C $Header$ Line 2  C $Header$
2  C $Name$  C $Name$
3    
4  #include "MOM_VECINV_OPTIONS.h"  #include "MOM_VECINV_OPTIONS.h"
5    #ifdef ALLOW_AUTODIFF
6    # include "AUTODIFF_OPTIONS.h"
7    #endif
8    #ifdef ALLOW_MOM_COMMON
9    # include "MOM_COMMON_OPTIONS.h"
10    #endif
11    
12        SUBROUTINE MOM_VECINV(        SUBROUTINE MOM_VECINV(
13       I        bi,bj,iMin,iMax,jMin,jMax,k,kUp,kDown,       I        bi,bj,k,iMin,iMax,jMin,jMax,
14       I        KappaRU, KappaRV,       I        kappaRU, kappaRV,
15       U        fVerU, fVerV,       I        fVerUkm, fVerVkm,
16         O        fVerUkp, fVerVkp,
17       O        guDiss, gvDiss,       O        guDiss, gvDiss,
18       I        myTime, myIter, myThid)       I        myTime, myIter, myThid )
19  C     /==========================================================\  C     *==========================================================*
20  C     | S/R MOM_VECINV                                           |  C     | S/R MOM_VECINV                                           |
21  C     | o Form the right hand-side of the momentum equation.     |  C     | o Form the right hand-side of the momentum equation.     |
22  C     |==========================================================|  C     *==========================================================*
23  C     | Terms are evaluated one layer at a time working from     |  C     | Terms are evaluated one layer at a time working from     |
24  C     | the bottom to the top. The vertically integrated         |  C     | the bottom to the top. The vertically integrated         |
25  C     | barotropic flow tendency term is evluated by summing the |  C     | barotropic flow tendency term is evluated by summing the |
# Line 23  C     | for the diffusion equation bc wi Line 30  C     | for the diffusion equation bc wi
30  C     | form produces a diffusive flux that does not scale with  |  C     | form produces a diffusive flux that does not scale with  |
31  C     | open-area. Need to do something to solidfy this and to   |  C     | open-area. Need to do something to solidfy this and to   |
32  C     | deal "properly" with thin walls.                         |  C     | deal "properly" with thin walls.                         |
33  C     \==========================================================/  C     *==========================================================*
34        IMPLICIT NONE        IMPLICIT NONE
35    
36  C     == Global variables ==  C     == Global variables ==
37  #include "SIZE.h"  #include "SIZE.h"
 #include "DYNVARS.h"  
38  #include "EEPARAMS.h"  #include "EEPARAMS.h"
39  #include "PARAMS.h"  #include "PARAMS.h"
 #ifdef ALLOW_MNC  
 #include "MNC_PARAMS.h"  
 #endif  
40  #include "GRID.h"  #include "GRID.h"
41    #include "SURFACE.h"
42    #include "DYNVARS.h"
43    #ifdef ALLOW_MOM_COMMON
44    # include "MOM_VISC.h"
45    #endif
46  #ifdef ALLOW_TIMEAVE  #ifdef ALLOW_TIMEAVE
47  #include "TIMEAVE_STATV.h"  # include "TIMEAVE_STATV.h"
48    #endif
49    #ifdef ALLOW_MNC
50    # include "MNC_PARAMS.h"
51  #endif  #endif
52  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
53  # include "tamc.h"  # include "tamc.h"
# Line 44  C     == Global variables == Line 55  C     == Global variables ==
55  #endif  #endif
56    
57  C     == Routine arguments ==  C     == Routine arguments ==
58  C     fVerU  :: Flux of momentum in the vertical direction, out of the upper  C     bi,bj   :: current tile indices
59  C     fVerV  :: face of a cell K ( flux into the cell above ).  C     k       :: current vertical level
60  C     guDiss :: dissipation tendency (all explicit terms), u component  C     iMin,iMax,jMin,jMax :: loop ranges
61  C     gvDiss :: dissipation tendency (all explicit terms), v component  C     fVerU   :: Flux of momentum in the vertical direction, out of the upper
62  C     bi, bj, iMin, iMax, jMin, jMax - Range of points for which calculation  C     fVerV   :: face of a cell K ( flux into the cell above ).
63  C                                      results will be set.  C     fVerUkm :: vertical viscous flux of U, interface above (k-1/2)
64  C     kUp, kDown                     - Index for upper and lower layers.  C     fVerVkm :: vertical viscous flux of V, interface above (k-1/2)
65  C     myThid :: my Thread Id number  C     fVerUkp :: vertical viscous flux of U, interface below (k+1/2)
66        _RL KappaRU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)  C     fVerVkp :: vertical viscous flux of V, interface below (k+1/2)
67        _RL KappaRV(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)  
68        _RL fVerU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)  C     guDiss  :: dissipation tendency (all explicit terms), u component
69        _RL fVerV(1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)  C     gvDiss  :: dissipation tendency (all explicit terms), v component
70    C     myTime  :: current time
71    C     myIter  :: current time-step number
72    C     myThid  :: my Thread Id number
73          INTEGER bi,bj,k
74          INTEGER iMin,iMax,jMin,jMax
75          _RL kappaRU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
76          _RL kappaRV(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
77          _RL fVerUkm(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
78          _RL fVerVkm(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
79          _RL fVerUkp(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
80          _RL fVerVkp(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
81        _RL guDiss(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL guDiss(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
82        _RL gvDiss(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL gvDiss(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       INTEGER kUp,kDown  
83        _RL     myTime        _RL     myTime
84        INTEGER myIter        INTEGER myIter
85        INTEGER myThid        INTEGER myThid
       INTEGER bi,bj,iMin,iMax,jMin,jMax  
86    
87  #ifdef ALLOW_MOM_VECINV  #ifdef ALLOW_MOM_VECINV
88    
# Line 71  C     == Functions == Line 91  C     == Functions ==
91        EXTERNAL DIFFERENT_MULTIPLE        EXTERNAL DIFFERENT_MULTIPLE
92    
93  C     == Local variables ==  C     == Local variables ==
94    C     strainBC :: same as strain but account for no-slip BC
95    C     vort3BC  :: same as vort3  but account for no-slip BC
96        _RL      vF (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL      vF (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
97        _RL      vrF(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL      vrF(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
98        _RL      uCf(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL      uCf(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
99        _RL      vCf(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL      vCf(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
100        _RS hFacZ   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RS hFacZ   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
101          _RS h0FacZ  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
102        _RS r_hFacZ (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RS r_hFacZ (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
103        _RL uFld    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL uFld    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
104        _RL vFld    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL vFld    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
# Line 85  C     == Local variables == Line 108  C     == Local variables ==
108        _RL zStar   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL zStar   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
109        _RL tension (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL tension (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
110        _RL strain  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL strain  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
111          _RL strainBC(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
112        _RL KE      (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL KE      (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
113        _RL omega3  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL omega3  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
114        _RL vort3   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL vort3   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
115          _RL vort3BC (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
116        _RL hDiv    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL hDiv    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
117        _RL viscAh_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL viscAh_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
118        _RL viscAh_D(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL viscAh_D(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
119        _RL viscA4_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL viscA4_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
120        _RL viscA4_D(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL viscA4_D(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
121  C     i,j,k  :: Loop counters  C     i,j    :: Loop counters
122        INTEGER i,j,k        INTEGER i,j
123  C     xxxFac - On-off tracer parameters used for switching terms off.  C     xxxFac :: On-off tracer parameters used for switching terms off.
124        _RL  ArDudrFac        _RL  ArDudrFac
125        _RL  ArDvdrFac        _RL  ArDvdrFac
126        _RL  sideMaskFac        _RL  sideMaskFac
127        LOGICAL bottomDragTerms        LOGICAL bottomDragTerms
128        LOGICAL writeDiag        LOGICAL writeDiag
       LOGICAL harmonic,biharmonic,useVariableViscosity  
129  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
130        INTEGER imomkey        INTEGER imomkey
131  #endif  #endif
# Line 111  C     xxxFac - On-off tracer parameters Line 135  C     xxxFac - On-off tracer parameters
135        CHARACTER*(1) pf        CHARACTER*(1) pf
136  #endif  #endif
137    
138  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF
139  C--   only the kDown part of fverU/V is set in this subroutine  C--   only the kDown part of fverU/V is set in this subroutine
140  C--   the kUp is still required  C--   the kUp is still required
141  C--   In the case of mom_fluxform Kup is set as well  C--   In the case of mom_fluxform Kup is set as well
142  C--   (at least in part)  C--   (at least in part)
143        fVerU(1,1,kUp) = fVerU(1,1,kUp)        fVerUkm(1,1) = fVerUkm(1,1)
144        fVerV(1,1,kUp) = fVerV(1,1,kUp)        fVerVkm(1,1) = fVerVkm(1,1)
145  #endif  #endif
146    
147  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
# Line 156  C--   (at least in part) Line 180  C--   (at least in part)
180            offsets(i) = 0            offsets(i) = 0
181          ENDDO          ENDDO
182          offsets(3) = k          offsets(3) = k
183  C       write(*,*) 'offsets = ',(offsets(i),i=1,9)  c       write(*,*) 'offsets = ',(offsets(i),i=1,9)
184        ENDIF        ENDIF
185  #endif /*  ALLOW_MNC  */  #endif /*  ALLOW_MNC  */
186    
187  C     Initialise intermediate terms  C--   Initialise intermediate terms
188        DO J=1-OLy,sNy+OLy        DO j=1-OLy,sNy+OLy
189         DO I=1-OLx,sNx+OLx         DO i=1-OLx,sNx+OLx
190          vF(i,j)    = 0.          vF(i,j)    = 0.
191          vrF(i,j)   = 0.          vrF(i,j)   = 0.
192          uCf(i,j)   = 0.          uCf(i,j)   = 0.
# Line 176  C     Initialise intermediate terms Line 200  C     Initialise intermediate terms
200          vort3(i,j) = 0.          vort3(i,j) = 0.
201          omega3(i,j)= 0.          omega3(i,j)= 0.
202          KE(i,j)    = 0.          KE(i,j)    = 0.
203  c       hDiv(i,j)  = 0.  C-    need to initialise hDiv for MOM_VI_DEL2UV(call FILL_CS_CORNER_TR_RL)
204          viscAh_Z(i,j) = 0.          hDiv(i,j)  = 0.
205          viscAh_D(i,j) = 0.  c       viscAh_Z(i,j) = 0.
206          viscA4_Z(i,j) = 0.  c       viscAh_D(i,j) = 0.
207          viscA4_D(i,j) = 0.  c       viscA4_Z(i,j) = 0.
208    c       viscA4_D(i,j) = 0.
209          strain(i,j)  = 0. _d 0          strain(i,j)  = 0. _d 0
210            strainBC(i,j)= 0. _d 0
211          tension(i,j) = 0. _d 0          tension(i,j) = 0. _d 0
212  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF
213          hFacZ(i,j)   = 0. _d 0          hFacZ(i,j)   = 0. _d 0
214  #endif  #endif
215         ENDDO         ENDDO
# Line 231  c     CALL MOM_VI_HFACZ_DISS(bi,bj,k,hFa Line 256  c     CALL MOM_VI_HFACZ_DISS(bi,bj,k,hFa
256    
257        CALL MOM_CALC_RELVORT3(bi,bj,k,uFld,vFld,hFacZ,vort3,myThid)        CALL MOM_CALC_RELVORT3(bi,bj,k,uFld,vFld,hFacZ,vort3,myThid)
258    
259    C-    mask vort3 and account for no-slip / free-slip BC in vort3BC:
260          DO j=1-OLy,sNy+OLy
261           DO i=1-OLx,sNx+OLx
262             vort3BC(i,j) = vort3(i,j)
263             IF ( hFacZ(i,j).EQ.zeroRS ) THEN
264               vort3BC(i,j) = sideMaskFac*vort3BC(i,j)
265               vort3(i,j)   = 0.
266             ENDIF
267           ENDDO
268          ENDDO
269    
270        IF (momViscosity) THEN        IF (momViscosity) THEN
271  C--    For viscous term, compute horizontal divergence, tension & strain  C--    For viscous term, compute horizontal divergence, tension & strain
272  C      and mask relative vorticity (free-slip case):  C      and mask relative vorticity (free-slip case):
273    
274  #ifdef ALLOW_AUTODIFF_TAMC         DO j=1-OLy,sNy+OLy
275  CADJ STORE vort3(:,:) =          DO i=1-OLx,sNx+OLx
276  CADJ &     comlev1_bibj_k, key = imomkey, byte = isbyte            h0FacZ(i,j) = hFacZ(i,j)
277  #endif          ENDDO
278           ENDDO
279    #ifdef NONLIN_FRSURF
280           IF ( no_slip_sides .AND. nonlinFreeSurf.GT.0 ) THEN
281            DO j=2-OLy,sNy+OLy
282             DO i=2-OLx,sNx+OLx
283              h0FacZ(i,j) = MIN(
284         &       MIN( h0FacW(i,j,k,bi,bj), h0FacW(i,j-1,k,bi,bj) ),
285         &       MIN( h0FacS(i,j,k,bi,bj), h0FacS(i-1,j,k,bi,bj) ) )
286             ENDDO
287            ENDDO
288           ENDIF
289    #endif /* NONLIN_FRSURF */
290    
291         CALL MOM_CALC_HDIV(bi,bj,k,2,uFld,vFld,hDiv,myThid)         CALL MOM_CALC_HDIV(bi,bj,k,2,uFld,vFld,hDiv,myThid)
292    
293         CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld,tension,myThid)         IF ( useVariableVisc .OR. useStrainTensionVisc ) THEN
294            CALL MOM_CALC_TENSION( bi,bj,k,uFld,vFld,tension,myThid )
295         CALL MOM_CALC_STRAIN(bi,bj,k,uFld,vFld,hFacZ,strain,myThid)          CALL MOM_CALC_STRAIN( bi,bj,k,uFld,vFld,hFacZ,strain,myThid )
296    C-    mask strain and account for no-slip / free-slip BC in strainBC:
297            DO j=1-OLy,sNy+OLy
298             DO i=1-OLx,sNx+OLx
299               strainBC(i,j) = strain(i,j)
300               IF ( hFacZ(i,j).EQ.zeroRS ) THEN
301                 strainBC(i,j) = sideMaskFac*strainBC(i,j)
302                 strain(i,j)   = 0.
303               ENDIF
304             ENDDO
305            ENDDO
306           ENDIF
307    
308  C-     account for no-slip / free-slip BC:  C--    Calculate Lateral Viscosities
309         DO j=1-Oly,sNy+Oly         DO j=1-OLy,sNy+OLy
310          DO i=1-Olx,sNx+Olx          DO i=1-OLx,sNx+OLx
311            IF ( hFacZ(i,j).EQ.0. ) THEN           viscAh_D(i,j) = viscAhD
312              vort3(i,j)  = sideMaskFac*vort3(i,j)           viscAh_Z(i,j) = viscAhZ
313              strain(i,j) = sideMaskFac*strain(i,j)           viscA4_D(i,j) = viscA4D
314            ENDIF           viscA4_Z(i,j) = viscA4Z
315          ENDDO          ENDDO
316         ENDDO         ENDDO
317           IF ( useVariableVisc ) THEN
318  C--    Calculate Viscosities  C-     uses vort3BC & strainBC which account for no-slip / free-slip BC
319         CALL MOM_CALC_VISC(           CALL MOM_CALC_VISC( bi, bj, k,
320       I        bi,bj,k,       O            viscAh_Z, viscAh_D, viscA4_Z, viscA4_D,
321       O        viscAh_Z,viscAh_D,viscA4_Z,viscA4_D,       I            hDiv, vort3BC, tension, strainBC, KE, hfacZ,
322       O        harmonic,biharmonic,useVariableViscosity,       I            myThid )
323       I        hDiv,vort3,tension,strain,KE,hfacZ,         ENDIF
      I        myThid)  
324    
325  C      Calculate del^2 u and del^2 v for bi-harmonic term  C      Calculate del^2 u and del^2 v for bi-harmonic term
326         IF (biharmonic) THEN         IF (useBiharmonicVisc) THEN
327           CALL MOM_VI_DEL2UV(bi,bj,k,hDiv,vort3,hFacZ,           CALL MOM_VI_DEL2UV(bi,bj,k,hDiv,vort3,hFacZ,
328       O                      del2u,del2v,       O                      del2u,del2v,
329       &                      myThid)       I                      myThid)
330           CALL MOM_CALC_HDIV(bi,bj,k,2,del2u,del2v,dStar,myThid)           CALL MOM_CALC_HDIV(bi,bj,k,2,del2u,del2v,dStar,myThid)
331           CALL MOM_CALC_RELVORT3(bi,bj,k,           CALL MOM_CALC_RELVORT3(bi,bj,k,
332       &                          del2u,del2v,hFacZ,zStar,myThid)       &                          del2u,del2v,hFacZ,zStar,myThid)
333         ENDIF         ENDIF
334    
 C-    Strain diagnostics:  
        IF ( writeDiag ) THEN  
         IF (snapshot_mdsio) THEN  
           CALL WRITE_LOCAL_RL('Ds','I10',1,strain,bi,bj,k,myIter,myThid)  
         ENDIF  
 #ifdef ALLOW_MNC  
         IF (useMNC .AND. snapshot_mnc) THEN  
           CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Ds',strain,  
      &          offsets, myThid)  
         ENDIF  
 #endif /*  ALLOW_MNC  */  
        ENDIF  
 #ifdef ALLOW_DIAGNOSTICS  
        IF ( useDiagnostics ) THEN  
         CALL DIAGNOSTICS_FILL(strain, 'Strain  ',k,1,2,bi,bj,myThid)  
        ENDIF  
 #endif /* ALLOW_DIAGNOSTICS */  
   
335  C---   Calculate dissipation terms for U and V equations  C---   Calculate dissipation terms for U and V equations
336    
337  C      in terms of tension and strain  C-     in terms of tension and strain
338         IF (useStrainTensionVisc) THEN         IF (useStrainTensionVisc) THEN
339  C        mask strain as if free-slip since side-drag is computed separately  C      use masked strain as if free-slip since side-drag is computed separately
340           DO j=1-Oly,sNy+Oly           CALL MOM_HDISSIP( bi, bj, k,
341            DO i=1-Olx,sNx+Olx       I            tension, strain, hFacZ,
342              IF ( hFacZ(i,j).EQ.0. ) strain(i,j) = 0. _d 0       I            viscAh_Z, viscAh_D, viscA4_Z, viscA4_D,
343            ENDDO       I            useHarmonicVisc, useBiharmonicVisc, useVariableVisc,
344           ENDDO       O            guDiss, gvDiss,
345           CALL MOM_HDISSIP(bi,bj,k,hDiv,vort3,tension,strain,KE,       I            myThid )
      I                    hFacZ,  
      I                    viscAh_Z,viscAh_D,viscA4_Z,viscA4_D,  
      I                    harmonic,biharmonic,useVariableViscosity,  
      O                    guDiss,gvDiss,  
      I                    myThid)  
346         ELSE         ELSE
347  C      in terms of vorticity and divergence  C-     in terms of vorticity and divergence
348           CALL MOM_VI_HDISSIP(bi,bj,k,hDiv,vort3,tension,strain,KE,           CALL MOM_VI_HDISSIP( bi, bj, k,
349       I                       hFacZ,dStar,zStar,       I            hDiv, vort3, dStar, zStar, hFacZ,
350       I                       viscAh_Z,viscAh_D,viscA4_Z,viscA4_D,       I            viscAh_Z, viscAh_D, viscA4_Z, viscA4_D,
351       I                       harmonic,biharmonic,useVariableViscosity,       I            useHarmonicVisc, useBiharmonicVisc, useVariableVisc,
352       O                       guDiss,gvDiss,       O            guDiss, gvDiss,
353       &                       myThid)       I            myThid )
354         ENDIF         ENDIF
 C--   if (momViscosity) end of block.  
       ENDIF  
   
 C-    Return to standard hfacZ (min-4) and mask vort3 accordingly:  
 c     CALL MOM_VI_MASK_VORT3(bi,bj,k,hFacZ,r_hFacZ,vort3,myThid)  
355    
356  C---  Other dissipation terms in Zonal momentum equation  C---  Other dissipation terms in Zonal momentum equation
357    
358  C--   Vertical flux (fVer is at upper face of "u" cell)  C--   Vertical flux (fVer is at upper face of "u" cell)
   
359  C     Eddy component of vertical flux (interior component only) -> vrF  C     Eddy component of vertical flux (interior component only) -> vrF
360        IF (momViscosity.AND..NOT.implicitViscosity) THEN        IF ( .NOT.implicitViscosity ) THEN
361         CALL MOM_U_RVISCFLUX(bi,bj,k+1,uVel,KappaRU,vrF,myThid)         CALL MOM_U_RVISCFLUX(bi,bj,k+1,uVel,kappaRU,vrF,myThid)
   
362  C     Combine fluxes  C     Combine fluxes
363         DO j=jMin,jMax         DO j=jMin,jMax
364          DO i=iMin,iMax          DO i=iMin,iMax
365           fVerU(i,j,kDown) = ArDudrFac*vrF(i,j)           fVerUkp(i,j) = ArDudrFac*vrF(i,j)
366          ENDDO          ENDDO
367         ENDDO         ENDDO
   
368  C--   Tendency is minus divergence of the fluxes  C--   Tendency is minus divergence of the fluxes
369         DO j=2-Oly,sNy+Oly-1         DO j=jMin,jMax
370          DO i=2-Olx,sNx+Olx-1          DO i=iMin,iMax
371           guDiss(i,j) = guDiss(i,j)           guDiss(i,j) = guDiss(i,j)
372       &   -_recip_hFacW(i,j,k,bi,bj)*recip_drF(k)       &   -_recip_hFacW(i,j,k,bi,bj)*recip_drF(k)
373       &   *recip_rAw(i,j,bi,bj)       &   *recip_rAw(i,j,bi,bj)
374       &  *(       &   *( fVerUkp(i,j) - fVerUkm(i,j) )*rkSign
      &    fVerU(i,j,kDown) - fVerU(i,j,kUp)  
      &   )*rkSign  
375          ENDDO          ENDDO
376         ENDDO         ENDDO
377        ENDIF        ENDIF
378    
379  C-- No-slip and drag BCs appear as body forces in cell abutting topography  C-- No-slip and drag BCs appear as body forces in cell abutting topography
380        IF (momViscosity.AND.no_slip_sides) THEN        IF ( no_slip_sides ) THEN
381  C-     No-slip BCs impose a drag at walls...  C-     No-slip BCs impose a drag at walls...
382         CALL MOM_U_SIDEDRAG(         CALL MOM_U_SIDEDRAG( bi, bj, k,
383       I        bi,bj,k,       I          uFld, del2u, h0FacZ,
384       I        uFld, del2u, hFacZ,       I          viscAh_Z, viscA4_Z,
385       I        viscAh_Z,viscA4_Z,       I          useHarmonicVisc, useBiharmonicVisc, useVariableVisc,
386       I        harmonic,biharmonic,useVariableViscosity,       O          vF,
387       O        vF,       I          myThid )
      I        myThid)  
388         DO j=jMin,jMax         DO j=jMin,jMax
389          DO i=iMin,iMax          DO i=iMin,iMax
390           guDiss(i,j) = guDiss(i,j)+vF(i,j)           guDiss(i,j) = guDiss(i,j)+vF(i,j)
391          ENDDO          ENDDO
392         ENDDO         ENDDO
393        ENDIF        ENDIF
394    
395  C-    No-slip BCs impose a drag at bottom  C-    No-slip BCs impose a drag at bottom
396        IF (momViscosity.AND.bottomDragTerms) THEN        IF ( bottomDragTerms ) THEN
397         CALL MOM_U_BOTTOMDRAG(bi,bj,k,uFld,KE,KappaRU,vF,myThid)         CALL MOM_U_BOTTOMDRAG(bi,bj,k,uFld,KE,kappaRU,vF,myThid)
398         DO j=jMin,jMax         DO j=jMin,jMax
399          DO i=iMin,iMax          DO i=iMin,iMax
400           guDiss(i,j) = guDiss(i,j)+vF(i,j)           guDiss(i,j) = guDiss(i,j)+vF(i,j)
# Line 377  C-    No-slip BCs impose a drag at botto Line 402  C-    No-slip BCs impose a drag at botto
402         ENDDO         ENDDO
403        ENDIF        ENDIF
404  #ifdef ALLOW_SHELFICE  #ifdef ALLOW_SHELFICE
405        IF (useShelfIce.AND.momViscosity.AND.bottomDragTerms) THEN        IF ( useShelfIce.AND.bottomDragTerms ) THEN
406         CALL SHELFICE_U_DRAG(bi,bj,k,uFld,KE,KappaRU,vF,myThid)         CALL SHELFICE_U_DRAG(bi,bj,k,uFld,KE,kappaRU,vF,myThid)
407         DO j=jMin,jMax         DO j=jMin,jMax
408          DO i=iMin,iMax          DO i=iMin,iMax
409           guDiss(i,j) = guDiss(i,j) + vF(i,j)           guDiss(i,j) = guDiss(i,j) + vF(i,j)
# Line 387  C-    No-slip BCs impose a drag at botto Line 412  C-    No-slip BCs impose a drag at botto
412        ENDIF        ENDIF
413  #endif /* ALLOW_SHELFICE */  #endif /* ALLOW_SHELFICE */
414    
   
415  C---  Other dissipation terms in Meridional momentum equation  C---  Other dissipation terms in Meridional momentum equation
416    
417  C--   Vertical flux (fVer is at upper face of "v" cell)  C--   Vertical flux (fVer is at upper face of "v" cell)
   
418  C     Eddy component of vertical flux (interior component only) -> vrF  C     Eddy component of vertical flux (interior component only) -> vrF
419        IF (momViscosity.AND..NOT.implicitViscosity) THEN        IF ( .NOT.implicitViscosity ) THEN
420         CALL MOM_V_RVISCFLUX(bi,bj,k+1,vVel,KappaRV,vrF,myThid)         CALL MOM_V_RVISCFLUX(bi,bj,k+1,vVel,kappaRV,vrF,myThid)
   
421  C     Combine fluxes -> fVerV  C     Combine fluxes -> fVerV
422         DO j=jMin,jMax         DO j=jMin,jMax
423          DO i=iMin,iMax          DO i=iMin,iMax
424           fVerV(i,j,kDown) = ArDvdrFac*vrF(i,j)           fVerVkp(i,j) = ArDvdrFac*vrF(i,j)
425          ENDDO          ENDDO
426         ENDDO         ENDDO
   
427  C--   Tendency is minus divergence of the fluxes  C--   Tendency is minus divergence of the fluxes
428         DO j=jMin,jMax         DO j=jMin,jMax
429          DO i=iMin,iMax          DO i=iMin,iMax
430           gvDiss(i,j) = gvDiss(i,j)           gvDiss(i,j) = gvDiss(i,j)
431       &   -_recip_hFacS(i,j,k,bi,bj)*recip_drF(k)       &   -_recip_hFacS(i,j,k,bi,bj)*recip_drF(k)
432       &    *recip_rAs(i,j,bi,bj)       &   *recip_rAs(i,j,bi,bj)
433       &  *(       &   *( fVerVkp(i,j) - fVerVkm(i,j) )*rkSign
      &    fVerV(i,j,kDown) - fVerV(i,j,kUp)  
      &   )*rkSign  
434          ENDDO          ENDDO
435         ENDDO         ENDDO
436        ENDIF        ENDIF
437    
438  C-- No-slip and drag BCs appear as body forces in cell abutting topography  C-- No-slip and drag BCs appear as body forces in cell abutting topography
439        IF (momViscosity.AND.no_slip_sides) THEN        IF ( no_slip_sides ) THEN
440  C-     No-slip BCs impose a drag at walls...  C-     No-slip BCs impose a drag at walls...
441         CALL MOM_V_SIDEDRAG(         CALL MOM_V_SIDEDRAG( bi, bj, k,
442       I        bi,bj,k,       I          vFld, del2v, h0FacZ,
443       I        vFld, del2v, hFacZ,       I          viscAh_Z, viscA4_Z,
444       I        viscAh_Z,viscA4_Z,       I          useHarmonicVisc, useBiharmonicVisc, useVariableVisc,
445       I        harmonic,biharmonic,useVariableViscosity,       O          vF,
446       O        vF,       I          myThid )
      I        myThid)  
447         DO j=jMin,jMax         DO j=jMin,jMax
448          DO i=iMin,iMax          DO i=iMin,iMax
449           gvDiss(i,j) = gvDiss(i,j)+vF(i,j)           gvDiss(i,j) = gvDiss(i,j)+vF(i,j)
450          ENDDO          ENDDO
451         ENDDO         ENDDO
452        ENDIF        ENDIF
453    
454  C-    No-slip BCs impose a drag at bottom  C-    No-slip BCs impose a drag at bottom
455        IF (momViscosity.AND.bottomDragTerms) THEN        IF ( bottomDragTerms ) THEN
456         CALL MOM_V_BOTTOMDRAG(bi,bj,k,vFld,KE,KappaRV,vF,myThid)         CALL MOM_V_BOTTOMDRAG(bi,bj,k,vFld,KE,kappaRV,vF,myThid)
457         DO j=jMin,jMax         DO j=jMin,jMax
458          DO i=iMin,iMax          DO i=iMin,iMax
459           gvDiss(i,j) = gvDiss(i,j)+vF(i,j)           gvDiss(i,j) = gvDiss(i,j)+vF(i,j)
# Line 442  C-    No-slip BCs impose a drag at botto Line 461  C-    No-slip BCs impose a drag at botto
461         ENDDO         ENDDO
462        ENDIF        ENDIF
463  #ifdef ALLOW_SHELFICE  #ifdef ALLOW_SHELFICE
464        IF (useShelfIce.AND.momViscosity.AND.bottomDragTerms) THEN        IF  (useShelfIce.AND.bottomDragTerms ) THEN
465           CALL SHELFICE_V_DRAG(bi,bj,k,vFld,KE,KappaRU,vF,myThid)           CALL SHELFICE_V_DRAG(bi,bj,k,vFld,KE,kappaRV,vF,myThid)
466           DO j=jMin,jMax           DO j=jMin,jMax
467            DO i=iMin,iMax            DO i=iMin,iMax
468             gvDiss(i,j) = gvDiss(i,j) + vF(i,j)             gvDiss(i,j) = gvDiss(i,j) + vF(i,j)
# Line 452  C-    No-slip BCs impose a drag at botto Line 471  C-    No-slip BCs impose a drag at botto
471          ENDIF          ENDIF
472  #endif /* ALLOW_SHELFICE */  #endif /* ALLOW_SHELFICE */
473    
474    C--   if (momViscosity) end of block.
 C-    Vorticity diagnostics:  
       IF ( writeDiag ) THEN  
         IF (snapshot_mdsio) THEN  
           CALL WRITE_LOCAL_RL('Z3','I10',1,vort3, bi,bj,k,myIter,myThid)  
         ENDIF  
 #ifdef ALLOW_MNC  
         IF (useMNC .AND. snapshot_mnc) THEN  
           CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Z3',vort3,  
      &          offsets, myThid)  
         ENDIF  
 #endif /*  ALLOW_MNC  */  
       ENDIF  
 #ifdef ALLOW_DIAGNOSTICS  
       IF ( useDiagnostics ) THEN  
         CALL DIAGNOSTICS_FILL(vort3,  'momVort3',k,1,2,bi,bj,myThid)  
475        ENDIF        ENDIF
476  #endif /* ALLOW_DIAGNOSTICS */  
477    C-    Return to standard hfacZ (min-4) and mask vort3 accordingly:
478    c     CALL MOM_VI_MASK_VORT3(bi,bj,k,hFacZ,r_hFacZ,vort3,myThid)
479    
480  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
481    
482  C---  Prepare for Advection & Coriolis terms:  C---  Prepare for Advection & Coriolis terms:
483  C-    Mask relative vorticity and calculate absolute vorticity  C-    calculate absolute vorticity
       DO j=1-Oly,sNy+Oly  
        DO i=1-Olx,sNx+Olx  
          IF ( hFacZ(i,j).EQ.0. ) vort3(i,j) = 0.  
        ENDDO  
       ENDDO  
484        IF (useAbsVorticity)        IF (useAbsVorticity)
485       &  CALL MOM_CALC_ABSVORT3(bi,bj,k,vort3,omega3,myThid)       &  CALL MOM_CALC_ABSVORT3(bi,bj,k,vort3,omega3,myThid)
486    
# Line 536  C- jmc: change it to keep the Coriolis t Line 537  C- jmc: change it to keep the Coriolis t
537    
538        IF (momAdvection) THEN        IF (momAdvection) THEN
539  C--   Horizontal advection of relative (or absolute) vorticity  C--   Horizontal advection of relative (or absolute) vorticity
540         IF (highOrderVorticity.AND.useAbsVorticity) THEN         IF ( (highOrderVorticity.OR.upwindVorticity)
541         &     .AND.useAbsVorticity ) THEN
542          CALL MOM_VI_U_CORIOLIS_C4(bi,bj,k,vFld,omega3,r_hFacZ,          CALL MOM_VI_U_CORIOLIS_C4(bi,bj,k,vFld,omega3,r_hFacZ,
543       &                         uCf,myThid)       &                         uCf,myThid)
544         ELSEIF (highOrderVorticity) THEN         ELSEIF ( (highOrderVorticity.OR.upwindVorticity) ) THEN
545          CALL MOM_VI_U_CORIOLIS_C4(bi,bj,k,vFld,vort3, r_hFacZ,          CALL MOM_VI_U_CORIOLIS_C4(bi,bj,k,vFld,vort3, r_hFacZ,
546       &                         uCf,myThid)       &                         uCf,myThid)
547         ELSEIF (useAbsVorticity) THEN         ELSEIF ( useAbsVorticity ) THEN
548          CALL MOM_VI_U_CORIOLIS(bi,bj,K,vFld,omega3,hFacZ,r_hFacZ,          CALL MOM_VI_U_CORIOLIS(bi,bj,K,vFld,omega3,hFacZ,r_hFacZ,
549       &                         uCf,myThid)       &                         uCf,myThid)
550         ELSE         ELSE
# Line 554  C--   Horizontal advection of relative ( Line 556  C--   Horizontal advection of relative (
556           gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+uCf(i,j)           gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+uCf(i,j)
557          ENDDO          ENDDO
558         ENDDO         ENDDO
559         IF (highOrderVorticity.AND.useAbsVorticity) THEN         IF ( (highOrderVorticity.OR.upwindVorticity)
560         &     .AND.useAbsVorticity ) THEN
561          CALL MOM_VI_V_CORIOLIS_C4(bi,bj,K,uFld,omega3,r_hFacZ,          CALL MOM_VI_V_CORIOLIS_C4(bi,bj,K,uFld,omega3,r_hFacZ,
562       &                         vCf,myThid)       &                         vCf,myThid)
563         ELSEIF (highOrderVorticity) THEN         ELSEIF ( (highOrderVorticity.OR.upwindVorticity) ) THEN
564          CALL MOM_VI_V_CORIOLIS_C4(bi,bj,K,uFld,vort3, r_hFacZ,          CALL MOM_VI_V_CORIOLIS_C4(bi,bj,K,uFld,vort3, r_hFacZ,
565       &                         vCf,myThid)       &                         vCf,myThid)
566         ELSEIF (useAbsVorticity) THEN         ELSEIF ( useAbsVorticity ) THEN
567          CALL MOM_VI_V_CORIOLIS(bi,bj,K,uFld,omega3,hFacZ,r_hFacZ,          CALL MOM_VI_V_CORIOLIS(bi,bj,K,uFld,omega3,hFacZ,r_hFacZ,
568       &                         vCf,myThid)       &                         vCf,myThid)
569         ELSE         ELSE
# Line 656  C--   Bernoulli term Line 659  C--   Bernoulli term
659  C--   end if momAdvection  C--   end if momAdvection
660        ENDIF        ENDIF
661    
662  C--   3.D Coriolis term (horizontal momentum, Eastward component: -f'*w)  C--   3.D Coriolis term (horizontal momentum, Eastward component: -fprime*w)
663        IF ( use3dCoriolis ) THEN        IF ( use3dCoriolis ) THEN
664          CALL MOM_U_CORIOLIS_NH(bi,bj,k,wVel,uCf,myThid)          CALL MOM_U_CORIOLIS_NH(bi,bj,k,wVel,uCf,myThid)
665          DO j=jMin,jMax          DO j=jMin,jMax
# Line 700  C--   Set du/dt & dv/dt on boundaries to Line 703  C--   Set du/dt & dv/dt on boundaries to
703        ENDDO        ENDDO
704    
705  #ifdef ALLOW_DEBUG  #ifdef ALLOW_DEBUG
706        IF ( debugLevel .GE. debLevB        IF ( debugLevel .GE. debLevC
707       &   .AND. k.EQ.4 .AND. myIter.EQ.nIter0       &   .AND. k.EQ.4 .AND. myIter.EQ.nIter0
708       &   .AND. nPx.EQ.1 .AND. nPy.EQ.1       &   .AND. nPx.EQ.1 .AND. nPy.EQ.1
709       &   .AND. useCubedSphereExchange ) THEN       &   .AND. useCubedSphereExchange ) THEN
# Line 710  C--   Set du/dt & dv/dt on boundaries to Line 713  C--   Set du/dt & dv/dt on boundaries to
713  #endif /* ALLOW_DEBUG */  #endif /* ALLOW_DEBUG */
714    
715        IF ( writeDiag ) THEN        IF ( writeDiag ) THEN
716            IF (useBiharmonicVisc) THEN
717             CALL WRITE_LOCAL_RL( 'del2u', 'I10', 1, del2u,
718         &                        bi,bj,k, myIter, myThid )
719             CALL WRITE_LOCAL_RL( 'del2v', 'I10', 1, del2v,
720         &                        bi,bj,k, myIter, myThid )
721             CALL WRITE_LOCAL_RL( 'dStar', 'I10', 1, dStar,
722         &                        bi,bj,k, myIter, myThid )
723             CALL WRITE_LOCAL_RL( 'zStar', 'I10', 1, zStar,
724         &                        bi,bj,k, myIter, myThid )
725            ENDIF
726          IF (snapshot_mdsio) THEN          IF (snapshot_mdsio) THEN
727           CALL WRITE_LOCAL_RL('W3','I10',1,omega3, bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('W3','I10',1,omega3, bi,bj,k,myIter,myThid)
728             CALL WRITE_LOCAL_RL('Z3','I10',1,vort3BC,bi,bj,k,myIter,myThid)
729           CALL WRITE_LOCAL_RL('KE','I10',1,KE,     bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('KE','I10',1,KE,     bi,bj,k,myIter,myThid)
730           CALL WRITE_LOCAL_RL('D', 'I10',1,hDiv,   bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('D', 'I10',1,hDiv,   bi,bj,k,myIter,myThid)
731           CALL WRITE_LOCAL_RL('Dt','I10',1,tension,bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('Dt','I10',1,tension,bi,bj,k,myIter,myThid)
732             CALL WRITE_LOCAL_RL( 'Ds', 'I10', 1, strainBC,
733         &                        bi,bj,k, myIter, myThid )
734           CALL WRITE_LOCAL_RL('Du','I10',1,guDiss, bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('Du','I10',1,guDiss, bi,bj,k,myIter,myThid)
735           CALL WRITE_LOCAL_RL('Dv','I10',1,gvDiss, bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('Dv','I10',1,gvDiss, bi,bj,k,myIter,myThid)
736          ENDIF          ENDIF
# Line 722  C--   Set du/dt & dv/dt on boundaries to Line 738  C--   Set du/dt & dv/dt on boundaries to
738          IF (useMNC .AND. snapshot_mnc) THEN          IF (useMNC .AND. snapshot_mnc) THEN
739            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'W3',omega3,            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'W3',omega3,
740       &          offsets, myThid)       &          offsets, myThid)
741              CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Z3',vort3BC,
742         &          offsets, myThid)
743            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'KE',KE,            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'KE',KE,
744       &          offsets, myThid)       &          offsets, myThid)
745            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'D', hDiv,            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'D', hDiv,
746       &          offsets, myThid)       &          offsets, myThid)
747            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Dt',tension,            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Dt',tension,
748       &          offsets, myThid)       &          offsets, myThid)
749              CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Ds',strainBC,
750         &          offsets, myThid)
751            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Du',guDiss,            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Du',guDiss,
752       &          offsets, myThid)       &          offsets, myThid)
753            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Dv',gvDiss,            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Dv',gvDiss,
# Line 738  C--   Set du/dt & dv/dt on boundaries to Line 758  C--   Set du/dt & dv/dt on boundaries to
758    
759  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
760        IF ( useDiagnostics ) THEN        IF ( useDiagnostics ) THEN
761            CALL DIAGNOSTICS_FILL(vort3BC,'momVort3',k,1,2,bi,bj,myThid)
762          CALL DIAGNOSTICS_FILL(KE,     'momKE   ',k,1,2,bi,bj,myThid)          CALL DIAGNOSTICS_FILL(KE,     'momKE   ',k,1,2,bi,bj,myThid)
763         IF (momViscosity) THEN         IF (momViscosity) THEN
764          CALL DIAGNOSTICS_FILL(hDiv,   'momHDiv ',k,1,2,bi,bj,myThid)          CALL DIAGNOSTICS_FILL(hDiv,   'momHDiv ',k,1,2,bi,bj,myThid)
         CALL DIAGNOSTICS_FILL(tension,'Tension ',k,1,2,bi,bj,myThid)  
         CALL DIAGNOSTICS_FILL(guDiss, 'Um_Diss ',k,1,2,bi,bj,myThid)  
         CALL DIAGNOSTICS_FILL(gvDiss, 'Vm_Diss ',k,1,2,bi,bj,myThid)  
765         ENDIF         ENDIF
766          CALL DIAGNOSTICS_FILL(gU(1-Olx,1-Oly,k,bi,bj),         IF ( useVariableVisc .OR. useStrainTensionVisc ) THEN
767            CALL DIAGNOSTICS_FILL(tension, 'Tension ',k,1,2,bi,bj,myThid)
768            CALL DIAGNOSTICS_FILL(strainBC,'Strain  ',k,1,2,bi,bj,myThid)
769           ENDIF
770            CALL DIAGNOSTICS_FILL(gU(1-OLx,1-OLy,k,bi,bj),
771       &                                'Um_Advec',k,1,2,bi,bj,myThid)       &                                'Um_Advec',k,1,2,bi,bj,myThid)
772          CALL DIAGNOSTICS_FILL(gV(1-Olx,1-Oly,k,bi,bj),          CALL DIAGNOSTICS_FILL(gV(1-OLx,1-OLy,k,bi,bj),
773       &                                'Vm_Advec',k,1,2,bi,bj,myThid)       &                                'Vm_Advec',k,1,2,bi,bj,myThid)
774        ENDIF        ENDIF
775  #endif /* ALLOW_DIAGNOSTICS */  #endif /* ALLOW_DIAGNOSTICS */

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.75

  ViewVC Help
Powered by ViewVC 1.1.22