--- MITgcm/pkg/mom_vecinv/mom_vecinv.F 2005/09/27 13:38:42 1.51 +++ MITgcm/pkg/mom_vecinv/mom_vecinv.F 2006/03/30 19:51:31 1.57 @@ -1,9 +1,9 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_vecinv/mom_vecinv.F,v 1.51 2005/09/27 13:38:42 baylor Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_vecinv/mom_vecinv.F,v 1.57 2006/03/30 19:51:31 jmc Exp $ C $Name: $ #include "MOM_VECINV_OPTIONS.h" - SUBROUTINE MOM_VECINV( + SUBROUTINE MOM_VECINV( I bi,bj,iMin,iMax,jMin,jMax,k,kUp,kDown, I KappaRU, KappaRV, U fVerU, fVerV, @@ -47,7 +47,7 @@ C bi, bj, iMin, iMax, jMin, jMax - Range of points for which calculation C results will be set. C kUp, kDown - Index for upper and lower layers. -C myThid - Instance number for this innvocation of CALC_MOM_RHS +C myThid :: my Thread Id number _RL KappaRU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) _RL KappaRV(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) _RL fVerU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) @@ -68,41 +68,40 @@ C == Local variables == _RL vF (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL vrF (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL uCf (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL vCf (1-OLx:sNx+OLx,1-OLy:sNy+OLy) -c _RL mT (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL del2u(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL del2v(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL tension(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL strain(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RS hFacZ(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RS r_hFacZ(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL uFld(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL vFld(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL dStar(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL zStar(1-OLx:sNx+OLx,1-OLy:sNy+OLy) -C I,J,K - Loop counters + _RL vrF(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL uCf(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL vCf(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RS hFacZ (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RS r_hFacZ (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL uFld (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL vFld (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL del2u (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL del2v (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL dStar (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL zStar (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL tension (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL strain (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _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) +C i,j,k :: Loop counters INTEGER i,j,k C xxxFac - On-off tracer parameters used for switching terms off. _RL ArDudrFac -c _RL mtFacU _RL ArDvdrFac -c _RL mtFacV + _RL sideMaskFac LOGICAL bottomDragTerms 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) LOGICAL harmonic,biharmonic,useVariableViscosity #ifdef ALLOW_MNC INTEGER offsets(9) + CHARACTER*(1) pf #endif #ifdef ALLOW_AUTODIFF_TAMC @@ -118,6 +117,11 @@ #ifdef ALLOW_MNC IF (useMNC .AND. snapshot_mnc .AND. writeDiag) THEN + IF ( writeBinaryPrec .EQ. precFloat64 ) THEN + pf(1:1) = 'D' + ELSE + pf(1:1) = 'R' + ENDIF IF ((bi .EQ. 1).AND.(bj .EQ. 1).AND.(k .EQ. 1)) THEN CALL MNC_CW_SET_UDIM('mom_vi', -1, myThid) CALL MNC_CW_RL_W_S('D','mom_vi',0,0,'T',myTime,myThid) @@ -139,7 +143,6 @@ vrF(i,j) = 0. uCf(i,j) = 0. vCf(i,j) = 0. -c mT(i,j) = 0. del2u(i,j) = 0. del2v(i,j) = 0. dStar(i,j) = 0. @@ -148,7 +151,7 @@ gvDiss(i,j)= 0. vort3(i,j) = 0. omega3(i,j)= 0. - ke(i,j) = 0. + KE(i,j) = 0. viscAh_Z(i,j) = 0. viscAh_D(i,j) = 0. viscA4_Z(i,j) = 0. @@ -157,6 +160,7 @@ #ifdef ALLOW_AUTODIFF_TAMC strain(i,j) = 0. _d 0 tension(i,j) = 0. _d 0 + hFacZ(i,j) = 0. _d 0 #endif ENDDO ENDDO @@ -164,10 +168,16 @@ C-- Term by term tracer parmeters C o U momentum equation ArDudrFac = vfFacMom*1. -c mTFacU = mtFacMom*1. C o V momentum equation ArDvdrFac = vfFacMom*1. -c mTFacV = mtFacMom*1. + +C note: using standard stencil (no mask) results in under-estimating +C vorticity at a no-slip boundary by a factor of 2 = sideDragFactor + IF ( no_slip_sides ) THEN + sideMaskFac = sideDragFactor + ELSE + sideMaskFac = 0. _d 0 + ENDIF IF ( no_slip_bottom & .OR. bottomDragQuadratic.NE.0. @@ -192,22 +202,32 @@ C use the same maskZ (and hFacZ) => needs 2 call(s) c CALL MOM_VI_HFACZ_DISS(bi,bj,k,hFacZ,r_hFacZ,myThid) - CALL MOM_CALC_KE(bi,bj,k,0,uFld,vFld,KE,myThid) - - CALL MOM_CALC_HDIV(bi,bj,k,2,uFld,vFld,hDiv,myThid) + CALL MOM_CALC_KE(bi,bj,k,selectKEscheme,uFld,vFld,KE,myThid) CALL MOM_CALC_RELVORT3(bi,bj,k,uFld,vFld,hFacZ,vort3,myThid) - CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld,tension,myThid) + IF (momViscosity) THEN +C-- For viscous term, compute horizontal divergence, tension & strain +C and mask relative vorticity (free-slip case): - CALL MOM_CALC_STRAIN(bi,bj,k,uFld,vFld,hFacZ,strain,myThid) + CALL MOM_CALC_HDIV(bi,bj,k,2,uFld,vFld,hDiv,myThid) - IF (useAbsVorticity) - & CALL MOM_CALC_ABSVORT3(bi,bj,k,vort3,omega3,myThid) + CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld,tension,myThid) - IF (momViscosity) THEN -C Calculate Viscosities - CALL MOM_CALC_VISC( + CALL MOM_CALC_STRAIN(bi,bj,k,uFld,vFld,hFacZ,strain,myThid) + +C- account for no-slip / free-slip BC: + DO j=1-Oly,sNy+Oly + DO i=1-Olx,sNx+Olx + IF ( hFacZ(i,j).EQ.0. ) THEN + vort3(i,j) = sideMaskFac*vort3(i,j) + strain(i,j) = sideMaskFac*strain(i,j) + ENDIF + ENDDO + ENDDO + +C-- Calculate Viscosities + CALL MOM_CALC_VISC( I bi,bj,k, O viscAh_Z,viscAh_D,viscA4_Z,viscA4_D, O harmonic,biharmonic,useVariableViscosity, @@ -224,10 +244,34 @@ & del2u,del2v,hFacZ,zStar,myThid) ENDIF -C Calculate dissipation terms for U and V equations +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 */ + +C--- Calculate dissipation terms for U and V equations C in terms of tension and strain IF (useStrainTensionVisc) THEN +C mask strain as if free-slip since side-drag is computed separately + DO j=1-Oly,sNy+Oly + DO i=1-Olx,sNx+Olx + IF ( hFacZ(i,j).EQ.0. ) strain(i,j) = 0. _d 0 + ENDDO + ENDDO CALL MOM_HDISSIP(bi,bj,k,hDiv,vort3,tension,strain,KE, I hFacZ, I viscAh_Z,viscAh_D,viscA4_Z,viscA4_D, @@ -241,14 +285,15 @@ I viscAh_Z,viscAh_D,viscA4_Z,viscA4_D, I harmonic,biharmonic,useVariableViscosity, O guDiss,gvDiss, - & myThid) + & myThid) 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) -C---- Zonal momentum equation starts here +C--- Other dissipation terms in Zonal momentum equation C-- Vertical flux (fVer is at upper face of "u" cell) @@ -276,7 +321,7 @@ ENDDO ENDIF -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 IF (momViscosity.AND.no_slip_sides) THEN C- No-slip BCs impose a drag at walls... CALL MOM_U_SIDEDRAG( @@ -292,7 +337,6 @@ ENDDO ENDDO ENDIF - C- No-slip BCs impose a drag at bottom IF (momViscosity.AND.bottomDragTerms) THEN CALL MOM_U_BOTTOMDRAG(bi,bj,k,uFld,KE,KappaRU,vF,myThid) @@ -302,19 +346,19 @@ ENDDO ENDDO ENDIF +#ifdef ALLOW_SHELFICE + IF (useShelfIce.AND.momViscosity.AND.bottomDragTerms) THEN + CALL SHELFICE_U_DRAG(bi,bj,k,uFld,KE,KappaRU,vF,myThid) + DO j=jMin,jMax + DO i=iMin,iMax + guDiss(i,j) = guDiss(i,j) + vF(i,j) + ENDDO + ENDDO + ENDIF +#endif /* ALLOW_SHELFICE */ -C-- Metric terms for curvilinear grid systems -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 +C--- Other dissipation terms in Meridional momentum equation C-- Vertical flux (fVer is at upper face of "v" cell) @@ -342,7 +386,7 @@ ENDDO ENDIF -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 IF (momViscosity.AND.no_slip_sides) THEN C- No-slip BCs impose a drag at walls... CALL MOM_V_SIDEDRAG( @@ -367,17 +411,47 @@ ENDDO ENDDO ENDIF +#ifdef ALLOW_SHELFICE + IF (useShelfIce.AND.momViscosity.AND.bottomDragTerms) THEN + CALL SHELFICE_V_DRAG(bi,bj,k,vFld,KE,KappaRU,vF,myThid) + DO j=jMin,jMax + DO i=iMin,iMax + gvDiss(i,j) = gvDiss(i,j) + vF(i,j) + ENDDO + ENDDO + ENDIF +#endif /* ALLOW_SHELFICE */ -C-- Metric terms for curvilinear grid systems -c IF (usingSphericalPolarMTerms) THEN -C o Spherical polar grid metric terms -c CALL MOM_V_METRIC_NH(bi,bj,k,vFld,wVel,mT,myThid) -c DO j=jMin,jMax -c DO i=iMin,iMax -c gV(i,j,k,bi,bj) = gV(i,j,k,bi,bj)+mTFacV*mT(i,j) -c ENDDO -c ENDDO -c ENDIF + +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) + ENDIF +#endif /* ALLOW_DIAGNOSTICS */ + +C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----| + +C--- Prepare for Advection & Coriolis terms: +C- Mask relative vorticity and 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 + IF (useAbsVorticity) + & CALL MOM_CALC_ABSVORT3(bi,bj,k,vort3,omega3,myThid) C-- Horizontal Coriolis terms c IF (useCoriolis .AND. .NOT.useCDscheme @@ -401,7 +475,6 @@ gV(i,j,k,bi,bj) = vCf(i,j) ENDDO ENDDO - IF ( writeDiag ) THEN IF (snapshot_mdsio) THEN CALL WRITE_LOCAL_RL('fV','I10',1,uCf,bi,bj,k,myIter,myThid) @@ -409,9 +482,9 @@ ENDIF #ifdef ALLOW_MNC IF (useMNC .AND. snapshot_mnc) THEN - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj, 'fV', uCf, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj, 'fV', uCf, & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj, 'fU', vCf, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj, 'fU', vCf, & offsets, myThid) ENDIF #endif /* ALLOW_MNC */ @@ -422,7 +495,6 @@ CALL DIAGNOSTICS_FILL(vCf,'Vm_Cori ',k,1,2,bi,bj,myThid) ENDIF #endif /* ALLOW_DIAGNOSTICS */ - ELSE DO j=jMin,jMax DO i=iMin,iMax @@ -478,9 +550,9 @@ ENDIF #ifdef ALLOW_MNC IF (useMNC .AND. snapshot_mnc) THEN - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj, 'zV', uCf, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj, 'zV', uCf, & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj, 'zU', vCf, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj, 'zU', vCf, & offsets, myThid) ENDIF #endif /* ALLOW_MNC */ @@ -543,17 +615,52 @@ ENDIF #ifdef ALLOW_MNC IF (useMNC .AND. snapshot_mnc) THEN - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj, 'KEx', uCf, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj, 'KEx', uCf, & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj, 'KEy', vCf, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj, 'KEy', vCf, & offsets, myThid) - ENDIF + ENDIF #endif /* ALLOW_MNC */ ENDIF C-- end if momAdvection ENDIF +C-- 3.D Coriolis term (horizontal momentum, Eastward component: -f'*w) + IF ( nonHydrostatic.OR.quasiHydrostatic ) THEN + CALL MOM_U_CORIOLIS_NH(bi,bj,k,wVel,uCf,myThid) + DO j=jMin,jMax + DO i=iMin,iMax + gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+uCf(i,j) + ENDDO + ENDDO + IF ( usingCurvilinearGrid ) THEN +C- presently, non zero angleSinC array only supported with Curvilinear-Grid + CALL MOM_V_CORIOLIS_NH(bi,bj,k,wVel,vCf,myThid) + DO j=jMin,jMax + DO i=iMin,iMax + gV(i,j,k,bi,bj) = gV(i,j,k,bi,bj)+vCf(i,j) + ENDDO + ENDDO + ENDIF + ENDIF + +C-- Non-Hydrostatic (spherical) metric terms + IF ( useNHMTerms ) THEN + CALL MOM_U_METRIC_NH(bi,bj,k,uFld,wVel,uCf,myThid) + DO j=jMin,jMax + DO i=iMin,iMax + gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+uCf(i,j) + ENDDO + ENDDO + CALL MOM_V_METRIC_NH(bi,bj,k,vFld,wVel,vCf,myThid) + DO j=jMin,jMax + DO i=iMin,iMax + gV(i,j,k,bi,bj) = gV(i,j,k,bi,bj)+vCf(i,j) + ENDDO + ENDDO + ENDIF + C-- Set du/dt & dv/dt on boundaries to zero DO j=jMin,jMax DO i=iMin,iMax @@ -574,33 +681,26 @@ IF ( writeDiag ) THEN IF (snapshot_mdsio) THEN - CALL WRITE_LOCAL_RL('Ds','I10',1,strain,bi,bj,k,myIter,myThid) - CALL WRITE_LOCAL_RL('Dt','I10',1,tension,bi,bj,k,myIter, - & myThid) - CALL WRITE_LOCAL_RL('Du','I10',1,guDiss,bi,bj,k,myIter,myThid) - CALL WRITE_LOCAL_RL('Dv','I10',1,gvDiss,bi,bj,k,myIter,myThid) - CALL WRITE_LOCAL_RL('Z3','I10',1,vort3,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) + 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) + CALL WRITE_LOCAL_RL('Dt','I10',1,tension,bi,bj,k,myIter,myThid) + CALL WRITE_LOCAL_RL('Du','I10',1,guDiss, bi,bj,k,myIter,myThid) + CALL WRITE_LOCAL_RL('Dv','I10',1,gvDiss, bi,bj,k,myIter,myThid) ENDIF #ifdef ALLOW_MNC IF (useMNC .AND. snapshot_mnc) THEN - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj,'Ds',strain, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'W3',omega3, & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj,'Dt',tension, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'KE',KE, & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj,'Du',guDiss, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'D', hDiv, & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj,'Dv',gvDiss, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Dt',tension, & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj,'Z3',vort3, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Du',guDiss, & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj,'W3',omega3, - & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj,'KE',KE, - & offsets, myThid) - CALL MNC_CW_RL_W_OFFSET('D','mom_vi',bi,bj,'D', hDiv, + CALL MNC_CW_RL_W_OFFSET(pf,'mom_vi',bi,bj,'Dv',gvDiss, & offsets, myThid) ENDIF #endif /* ALLOW_MNC */ @@ -608,19 +708,17 @@ #ifdef ALLOW_DIAGNOSTICS IF ( useDiagnostics ) THEN - 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(strain,'Strain ',k,1,2,bi,bj,myThid) + CALL DIAGNOSTICS_FILL(KE, 'momKE ',k,1,2,bi,bj,myThid) + IF (momViscosity) THEN + 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) + ENDIF CALL DIAGNOSTICS_FILL(gU(1-Olx,1-Oly,k,bi,bj), - & 'Um_Advec',k,1,2,bi,bj,myThid) + & '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) - IF (momViscosity) THEN - CALL DIAGNOSTICS_FILL(guDiss,'Um_Diss ',k,1,2,bi,bj,myThid) - CALL DIAGNOSTICS_FILL(gvDiss,'Vm_Diss ',k,1,2,bi,bj,myThid) - ENDIF + & 'Vm_Advec',k,1,2,bi,bj,myThid) ENDIF #endif /* ALLOW_DIAGNOSTICS */