/[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.53 by edhill, Thu Sep 29 12:19:52 2005 UTC revision 1.54 by jmc, Wed Oct 12 01:52:09 2005 UTC
# Line 47  C     gvDiss :: dissipation tendency (al Line 47  C     gvDiss :: dissipation tendency (al
47  C     bi, bj, iMin, iMax, jMin, jMax - Range of points for which calculation  C     bi, bj, iMin, iMax, jMin, jMax - Range of points for which calculation
48  C                                      results will be set.  C                                      results will be set.
49  C     kUp, kDown                     - Index for upper and lower layers.  C     kUp, kDown                     - Index for upper and lower layers.
50  C     myThid - Instance number for this innvocation of CALC_MOM_RHS  C     myThid :: my Thread Id number
51        _RL KappaRU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)        _RL KappaRU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
52        _RL KappaRV(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)        _RL KappaRV(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
53        _RL fVerU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)        _RL fVerU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)
# Line 68  C     == Functions == Line 68  C     == Functions ==
68    
69  C     == Local variables ==  C     == Local variables ==
70        _RL      vF (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL      vF (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
71        _RL      vrF (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL      vrF(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
72        _RL      uCf (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL      uCf(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
73        _RL      vCf (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL      vCf(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
74  c     _RL      mT (1-OLx:sNx+OLx,1-OLy:sNy+OLy)  c     _RL      mT (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
75        _RL del2u(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RS hFacZ   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
76        _RL del2v(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RS r_hFacZ (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
77        _RL tension(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL uFld    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
78        _RL strain(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL vFld    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
79        _RS hFacZ(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL del2u   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
80        _RS r_hFacZ(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL del2v   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
81        _RL uFld(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL dStar   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
82        _RL vFld(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL zStar   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
83        _RL dStar(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL tension (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
84        _RL zStar(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL strain  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
85  C     I,J,K - Loop counters        _RL KE      (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
86          _RL omega3  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
87          _RL vort3   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
88          _RL hDiv    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
89          _RL viscAh_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
90          _RL viscAh_D(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
91          _RL viscA4_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
92          _RL viscA4_D(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
93    C     i,j,k  :: Loop counters
94        INTEGER i,j,k        INTEGER i,j,k
95  C     xxxFac - On-off tracer parameters used for switching terms off.  C     xxxFac - On-off tracer parameters used for switching terms off.
96        _RL  ArDudrFac        _RL  ArDudrFac
97  c     _RL  mtFacU  c     _RL  mtFacU
98        _RL  ArDvdrFac        _RL  ArDvdrFac
99  c     _RL  mtFacV  c     _RL  mtFacV
100          _RL  sideMaskFac
101        LOGICAL bottomDragTerms        LOGICAL bottomDragTerms
102        LOGICAL writeDiag        LOGICAL writeDiag
       _RL KE(1-OLx:sNx+OLx,1-OLy:sNy+OLy)  
       _RL omega3(1-OLx:sNx+OLx,1-OLy:sNy+OLy)  
       _RL vort3(1-OLx:sNx+OLx,1-OLy:sNy+OLy)  
       _RL hDiv(1-OLx:sNx+OLx,1-OLy:sNy+OLy)  
       _RL viscAh_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)  
       _RL viscAh_D(1-OLx:sNx+OLx,1-OLy:sNy+OLy)  
       _RL viscA4_Z(1-OLx:sNx+OLx,1-OLy:sNy+OLy)  
       _RL viscA4_D(1-OLx:sNx+OLx,1-OLy:sNy+OLy)  
103        LOGICAL harmonic,biharmonic,useVariableViscosity        LOGICAL harmonic,biharmonic,useVariableViscosity
104    
105  #ifdef ALLOW_MNC  #ifdef ALLOW_MNC
# Line 154  c       mT(i,j)    = 0. Line 155  c       mT(i,j)    = 0.
155          gvDiss(i,j)= 0.          gvDiss(i,j)= 0.
156          vort3(i,j) = 0.          vort3(i,j) = 0.
157          omega3(i,j)= 0.          omega3(i,j)= 0.
158          ke(i,j)    = 0.          KE(i,j)    = 0.
159          viscAh_Z(i,j) = 0.          viscAh_Z(i,j) = 0.
160          viscAh_D(i,j) = 0.          viscAh_D(i,j) = 0.
161          viscA4_Z(i,j) = 0.          viscA4_Z(i,j) = 0.
# Line 175  C     o V momentum equation Line 176  C     o V momentum equation
176        ArDvdrFac    = vfFacMom*1.        ArDvdrFac    = vfFacMom*1.
177  c     mTFacV       = mtFacMom*1.  c     mTFacV       = mtFacMom*1.
178    
179    C note: using standard stencil (no mask) results in under-estimating
180    C       vorticity at a no-slip boundary by a factor of 2 = sideDragFactor
181          IF ( no_slip_sides ) THEN
182            sideMaskFac = sideDragFactor
183          ELSE
184            sideMaskFac = 0. _d 0
185          ENDIF
186    
187        IF (     no_slip_bottom        IF (     no_slip_bottom
188       &    .OR. bottomDragQuadratic.NE.0.       &    .OR. bottomDragQuadratic.NE.0.
189       &    .OR. bottomDragLinear.NE.0.) THEN       &    .OR. bottomDragLinear.NE.0.) THEN
# Line 200  c     CALL MOM_VI_HFACZ_DISS(bi,bj,k,hFa Line 209  c     CALL MOM_VI_HFACZ_DISS(bi,bj,k,hFa
209    
210        CALL MOM_CALC_KE(bi,bj,k,selectKEscheme,uFld,vFld,KE,myThid)        CALL MOM_CALC_KE(bi,bj,k,selectKEscheme,uFld,vFld,KE,myThid)
211    
       CALL MOM_CALC_HDIV(bi,bj,k,2,uFld,vFld,hDiv,myThid)  
   
212        CALL MOM_CALC_RELVORT3(bi,bj,k,uFld,vFld,hFacZ,vort3,myThid)        CALL MOM_CALC_RELVORT3(bi,bj,k,uFld,vFld,hFacZ,vort3,myThid)
213    
       IF (useAbsVorticity)  
      & CALL MOM_CALC_ABSVORT3(bi,bj,k,vort3,omega3,myThid)  
   
214        IF (momViscosity) THEN        IF (momViscosity) THEN
215  C      Calculate Viscosities  C--    For viscous term, compute horizontal divergence, tension & strain
216    C      and mask relative vorticity (free-slip case):
217    
218           CALL MOM_CALC_HDIV(bi,bj,k,2,uFld,vFld,hDiv,myThid)
219    
220         CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld,tension,myThid)         CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld,tension,myThid)
221    
222         CALL MOM_CALC_STRAIN(bi,bj,k,uFld,vFld,hFacZ,strain,myThid)         CALL MOM_CALC_STRAIN(bi,bj,k,uFld,vFld,hFacZ,strain,myThid)
223    
224    C-     account for no-slip / free-slip BC:
225           DO j=1-Oly,sNy+Oly
226            DO i=1-Olx,sNx+Olx
227              IF ( hFacZ(i,j).EQ.0. ) THEN
228                vort3(i,j)  = sideMaskFac*vort3(i,j)
229                strain(i,j) = sideMaskFac*strain(i,j)
230              ENDIF
231            ENDDO
232           ENDDO
233    
234    C--    Calculate Viscosities
235         CALL MOM_CALC_VISC(         CALL MOM_CALC_VISC(
236       I        bi,bj,k,       I        bi,bj,k,
237       O        viscAh_Z,viscAh_D,viscA4_Z,viscA4_D,       O        viscAh_Z,viscAh_D,viscA4_Z,viscA4_D,
# Line 230  C      Calculate del^2 u and del^2 v for Line 249  C      Calculate del^2 u and del^2 v for
249       &                          del2u,del2v,hFacZ,zStar,myThid)       &                          del2u,del2v,hFacZ,zStar,myThid)
250         ENDIF         ENDIF
251    
252  C      Calculate dissipation terms for U and V equations  C-    Strain diagnostics:
253           IF ( writeDiag ) THEN
254            IF (snapshot_mdsio) THEN
255              CALL WRITE_LOCAL_RL('Ds','I10',1,strain,bi,bj,k,myIter,myThid)
256            ENDIF
257    #ifdef ALLOW_MNC
258            IF (useMNC .AND. snapshot_mnc) THEN
259              CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Ds',strain,
260         &          offsets, myThid)
261            ENDIF
262    #endif /*  ALLOW_MNC  */
263           ENDIF
264    #ifdef ALLOW_DIAGNOSTICS
265           IF ( useDiagnostics ) THEN
266            CALL DIAGNOSTICS_FILL(strain, 'Strain  ',k,1,2,bi,bj,myThid)
267           ENDIF
268    #endif /* ALLOW_DIAGNOSTICS */
269    
270    C---   Calculate dissipation terms for U and V equations
271    
272  C      in terms of tension and strain  C      in terms of tension and strain
273         IF (useStrainTensionVisc) THEN         IF (useStrainTensionVisc) THEN
274    C        mask strain as if free-slip since side-drag is computed separately
275             DO j=1-Oly,sNy+Oly
276              DO i=1-Olx,sNx+Olx
277                IF ( hFacZ(i,j).EQ.0. ) strain(i,j) = 0. _d 0
278              ENDDO
279             ENDDO
280           CALL MOM_HDISSIP(bi,bj,k,hDiv,vort3,tension,strain,KE,           CALL MOM_HDISSIP(bi,bj,k,hDiv,vort3,tension,strain,KE,
281       I                    hFacZ,       I                    hFacZ,
282       I                    viscAh_Z,viscAh_D,viscA4_Z,viscA4_D,       I                    viscAh_Z,viscAh_D,viscA4_Z,viscA4_D,
# Line 249  C      in terms of vorticity and diverge Line 292  C      in terms of vorticity and diverge
292       O                       guDiss,gvDiss,       O                       guDiss,gvDiss,
293       &                       myThid)               &                       myThid)        
294         ENDIF         ENDIF
295    C--   if (momViscosity) end of block.
296        ENDIF        ENDIF
297    
298  C-    Return to standard hfacZ (min-4) and mask vort3 accordingly:  C-    Return to standard hfacZ (min-4) and mask vort3 accordingly:
299  c     CALL MOM_VI_MASK_VORT3(bi,bj,k,hFacZ,r_hFacZ,vort3,myThid)  c     CALL MOM_VI_MASK_VORT3(bi,bj,k,hFacZ,r_hFacZ,vort3,myThid)
300    
301  C---- Zonal momentum equation starts here  C---  Other dissipation terms in Zonal momentum equation
302    
303  C--   Vertical flux (fVer is at upper face of "u" cell)  C--   Vertical flux (fVer is at upper face of "u" cell)
304    
# Line 298  C-     No-slip BCs impose a drag at wall Line 342  C-     No-slip BCs impose a drag at wall
342          ENDDO          ENDDO
343         ENDDO         ENDDO
344        ENDIF        ENDIF
   
345  C-    No-slip BCs impose a drag at bottom  C-    No-slip BCs impose a drag at bottom
346        IF (momViscosity.AND.bottomDragTerms) THEN        IF (momViscosity.AND.bottomDragTerms) THEN
347         CALL MOM_U_BOTTOMDRAG(bi,bj,k,uFld,KE,KappaRU,vF,myThid)         CALL MOM_U_BOTTOMDRAG(bi,bj,k,uFld,KE,KappaRU,vF,myThid)
# Line 309  C-    No-slip BCs impose a drag at botto Line 352  C-    No-slip BCs impose a drag at botto
352         ENDDO         ENDDO
353        ENDIF        ENDIF
354    
355  C--   Metric terms for curvilinear grid systems  C---  Other dissipation terms in Meridional momentum equation
 c     IF (usingSphericalPolarMTerms) THEN  
 C      o Spherical polar grid metric terms  
 c      CALL MOM_U_METRIC_NH(bi,bj,k,uFld,wVel,mT,myThid)  
 c      DO j=jMin,jMax  
 c       DO i=iMin,iMax  
 c        gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+mTFacU*mT(i,j)  
 c       ENDDO  
 c      ENDDO  
 c     ENDIF  
   
 C---- Meridional momentum equation starts here  
356    
357  C--   Vertical flux (fVer is at upper face of "v" cell)  C--   Vertical flux (fVer is at upper face of "v" cell)
358    
# Line 374  C-    No-slip BCs impose a drag at botto Line 406  C-    No-slip BCs impose a drag at botto
406         ENDDO         ENDDO
407        ENDIF        ENDIF
408    
409  C--   Metric terms for curvilinear grid systems  C-    Vorticity diagnostics:
410  c     IF (usingSphericalPolarMTerms) THEN        IF ( writeDiag ) THEN
411  C      o Spherical polar grid metric terms          IF (snapshot_mdsio) THEN
412  c      CALL MOM_V_METRIC_NH(bi,bj,k,vFld,wVel,mT,myThid)            CALL WRITE_LOCAL_RL('Z3','I10',1,vort3, bi,bj,k,myIter,myThid)
413  c      DO j=jMin,jMax          ENDIF
414  c       DO i=iMin,iMax  #ifdef ALLOW_MNC
415  c        gV(i,j,k,bi,bj) = gV(i,j,k,bi,bj)+mTFacV*mT(i,j)          IF (useMNC .AND. snapshot_mnc) THEN
416  c       ENDDO            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Z3',vort3,
417  c      ENDDO       &          offsets, myThid)
418  c     ENDIF          ENDIF
419    #endif /*  ALLOW_MNC  */
420          ENDIF
421    #ifdef ALLOW_DIAGNOSTICS
422          IF ( useDiagnostics ) THEN
423            CALL DIAGNOSTICS_FILL(vort3,  'momVort3',k,1,2,bi,bj,myThid)
424          ENDIF
425    #endif /* ALLOW_DIAGNOSTICS */
426    
427    C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
428    
429    C---  Prepare for Advection & Coriolis terms:
430    C-    Mask relative vorticity and calculate absolute vorticity
431          DO j=1-Oly,sNy+Oly
432           DO i=1-Olx,sNx+Olx
433             IF ( hFacZ(i,j).EQ.0. ) vort3(i,j) = 0.
434           ENDDO
435          ENDDO
436          IF (useAbsVorticity)
437         &  CALL MOM_CALC_ABSVORT3(bi,bj,k,vort3,omega3,myThid)
438    
439  C--   Horizontal Coriolis terms  C--   Horizontal Coriolis terms
440  c     IF (useCoriolis .AND. .NOT.useCDscheme  c     IF (useCoriolis .AND. .NOT.useCDscheme
# Line 553  C--   Bernoulli term Line 604  C--   Bernoulli term
604       &          offsets, myThid)       &          offsets, myThid)
605             CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj, 'KEy', vCf,             CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj, 'KEy', vCf,
606       &          offsets, myThid)       &          offsets, myThid)
607          ENDIF           ENDIF
608  #endif /*  ALLOW_MNC  */  #endif /*  ALLOW_MNC  */
609         ENDIF         ENDIF
610    
611  C--   end if momAdvection  C--   end if momAdvection
612        ENDIF        ENDIF
613    
614    C--   Metric terms for curvilinear grid systems
615    c     IF (usingSphericalPolarMTerms) THEN
616    C      o Spherical polar grid metric terms
617    c      CALL MOM_U_METRIC_NH(bi,bj,k,uFld,wVel,mT,myThid)
618    c      DO j=jMin,jMax
619    c       DO i=iMin,iMax
620    c        gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+mTFacU*mT(i,j)
621    c       ENDDO
622    c      ENDDO
623    c      CALL MOM_V_METRIC_NH(bi,bj,k,vFld,wVel,mT,myThid)
624    c      DO j=jMin,jMax
625    c       DO i=iMin,iMax
626    c        gV(i,j,k,bi,bj) = gV(i,j,k,bi,bj)+mTFacV*mT(i,j)
627    c       ENDDO
628    c      ENDDO
629    c     ENDIF
630    
631  C--   Set du/dt & dv/dt on boundaries to zero  C--   Set du/dt & dv/dt on boundaries to zero
632        DO j=jMin,jMax        DO j=jMin,jMax
633         DO i=iMin,iMax         DO i=iMin,iMax
# Line 580  C--   Set du/dt & dv/dt on boundaries to Line 648  C--   Set du/dt & dv/dt on boundaries to
648    
649        IF ( writeDiag ) THEN        IF ( writeDiag ) THEN
650          IF (snapshot_mdsio) THEN          IF (snapshot_mdsio) THEN
651            CALL WRITE_LOCAL_RL('Ds','I10',1,strain,bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('W3','I10',1,omega3, bi,bj,k,myIter,myThid)
652            CALL WRITE_LOCAL_RL('Dt','I10',1,tension,bi,bj,k,myIter,           CALL WRITE_LOCAL_RL('KE','I10',1,KE,     bi,bj,k,myIter,myThid)
653       &         myThid)           CALL WRITE_LOCAL_RL('D', 'I10',1,hDiv,   bi,bj,k,myIter,myThid)
654            CALL WRITE_LOCAL_RL('Du','I10',1,guDiss,bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('Dt','I10',1,tension,bi,bj,k,myIter,myThid)
655            CALL WRITE_LOCAL_RL('Dv','I10',1,gvDiss,bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('Du','I10',1,guDiss, bi,bj,k,myIter,myThid)
656            CALL WRITE_LOCAL_RL('Z3','I10',1,vort3,bi,bj,k,myIter,myThid)           CALL WRITE_LOCAL_RL('Dv','I10',1,gvDiss, bi,bj,k,myIter,myThid)
           CALL WRITE_LOCAL_RL('W3','I10',1,omega3,bi,bj,k,myIter,myThid)  
           CALL WRITE_LOCAL_RL('KE','I10',1,KE,bi,bj,k,myIter,myThid)  
           CALL WRITE_LOCAL_RL('D','I10',1,hDiv,bi,bj,k,myIter,myThid)  
657          ENDIF          ENDIF
658  #ifdef ALLOW_MNC  #ifdef ALLOW_MNC
659          IF (useMNC .AND. snapshot_mnc) THEN          IF (useMNC .AND. snapshot_mnc) THEN
660            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Ds',strain,            CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'W3',omega3,
661         &          offsets, myThid)
662              CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'KE',KE,
663         &          offsets, myThid)
664              CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'D', hDiv,
665       &          offsets, myThid)       &          offsets, myThid)
666            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,
667       &          offsets, myThid)       &          offsets, myThid)
# Line 600  C--   Set du/dt & dv/dt on boundaries to Line 669  C--   Set du/dt & dv/dt on boundaries to
669       &          offsets, myThid)       &          offsets, myThid)
670            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,
671       &          offsets, myThid)       &          offsets, myThid)
           CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Z3',vort3,  
      &          offsets, myThid)  
           CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'W3',omega3,  
      &          offsets, myThid)  
           CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'KE',KE,  
      &          offsets, myThid)  
           CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'D', hDiv,  
      &          offsets, myThid)  
672          ENDIF          ENDIF
673  #endif /*  ALLOW_MNC  */  #endif /*  ALLOW_MNC  */
674        ENDIF        ENDIF
675    
676  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
677        IF ( useDiagnostics ) THEN        IF ( useDiagnostics ) THEN
678          CALL DIAGNOSTICS_FILL(KE,    'momKE   ',k,1,2,bi,bj,myThid)          CALL DIAGNOSTICS_FILL(KE,     'momKE   ',k,1,2,bi,bj,myThid)
         CALL DIAGNOSTICS_FILL(hDiv,  'momHDiv ',k,1,2,bi,bj,myThid)  
         CALL DIAGNOSTICS_FILL(vort3, 'momVort3',k,1,2,bi,bj,myThid)  
         CALL DIAGNOSTICS_FILL(gU(1-Olx,1-Oly,k,bi,bj),  
      &                               'Um_Advec',k,1,2,bi,bj,myThid)  
         CALL DIAGNOSTICS_FILL(gV(1-Olx,1-Oly,k,bi,bj),  
      &                               'Vm_Advec',k,1,2,bi,bj,myThid)  
679         IF (momViscosity) THEN         IF (momViscosity) THEN
680          CALL DIAGNOSTICS_FILL(strain,'Strain  ',k,1,2,bi,bj,myThid)          CALL DIAGNOSTICS_FILL(hDiv,   'momHDiv ',k,1,2,bi,bj,myThid)
681          CALL DIAGNOSTICS_FILL(tension,'Tension ',k,1,2,bi,bj,myThid)          CALL DIAGNOSTICS_FILL(tension,'Tension ',k,1,2,bi,bj,myThid)
682          CALL DIAGNOSTICS_FILL(guDiss,'Um_Diss ',k,1,2,bi,bj,myThid)          CALL DIAGNOSTICS_FILL(guDiss, 'Um_Diss ',k,1,2,bi,bj,myThid)
683          CALL DIAGNOSTICS_FILL(gvDiss,'Vm_Diss ',k,1,2,bi,bj,myThid)          CALL DIAGNOSTICS_FILL(gvDiss, 'Vm_Diss ',k,1,2,bi,bj,myThid)
684         ENDIF         ENDIF
685            CALL DIAGNOSTICS_FILL(gU(1-Olx,1-Oly,k,bi,bj),
686         &                                'Um_Advec',k,1,2,bi,bj,myThid)
687            CALL DIAGNOSTICS_FILL(gV(1-Olx,1-Oly,k,bi,bj),
688         &                                'Vm_Advec',k,1,2,bi,bj,myThid)
689        ENDIF        ENDIF
690  #endif /* ALLOW_DIAGNOSTICS */  #endif /* ALLOW_DIAGNOSTICS */
691    

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.54

  ViewVC Help
Powered by ViewVC 1.1.22