--- MITgcm/pkg/mom_common/mom_calc_visc.F 2005/09/26 15:27:11 1.13 +++ MITgcm/pkg/mom_common/mom_calc_visc.F 2006/07/07 18:52:10 1.23 @@ -1,3 +1,5 @@ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_common/mom_calc_visc.F,v 1.23 2006/07/07 18:52:10 baylor Exp $ +C $Name: $ #include "MOM_COMMON_OPTIONS.h" @@ -15,15 +17,15 @@ C harmonic viscosity= C viscAh (or viscAhD on div pts and viscAhZ on zeta pts) C +0.25*L**2*viscAhGrid/deltaT -C +sqrt(viscC2leith**2*grad(Vort3)**2 -C +viscC2leithD**2*grad(hDiv)**2)*L**3 +C +sqrt((viscC2leith/pi)**6*grad(Vort3)**2 +C +(viscC2leithD/pi)**6*grad(hDiv)**2)*L**3 C +(viscC2smag/pi)**2*L**2*sqrt(Tension**2+Strain**2) C C biharmonic viscosity= C viscA4 (or viscA4D on div pts and viscA4Z on zeta pts) C +0.25*0.125*L**4*viscA4Grid/deltaT (approx) -C +0.125*L**5*sqrt(viscC4leith**2*grad(Vort3)**2 -C +viscC4leithD**2*grad(hDiv)**2) +C +0.125*L**5*sqrt((viscC4leith/pi)**6*grad(Vort3)**2 +C +(viscC4leithD/pi)**6*grad(hDiv)**2) C +0.125*L**4*(viscC4smag/pi)**2*sqrt(Tension**2+Strain**2) C C Note that often 0.125*L**2 is the scale between harmonic and @@ -49,10 +51,10 @@ C biharmonic viscosity>viscA4gridmax*L**4/32/deltaT (approx) C C RECOMMENDED VALUES -C viscC2Leith=? -C viscC2LeithD=? -C viscC4Leith=? -C viscC4LeithD=? +C viscC2Leith=1-3 +C viscC2LeithD=1-3 +C viscC4Leith=1-3 +C viscC4LeithD=1.5-3 C viscC2smag=2.2-4 (Griffies and Hallberg,2000) C 0.2-0.9 (Smagorinsky,1993) C viscC4smag=2.2-4 (Griffies and Hallberg,2000) @@ -70,10 +72,9 @@ #include "GRID.h" #include "EEPARAMS.h" #include "PARAMS.h" -#ifdef ALLOW_EXCH2 -#include "W2_EXCH2_TOPOLOGY.h" -#include "W2_EXCH2_PARAMS.h" -#endif /* ALLOW_EXCH2 */ +#ifdef ALLOW_NONHYDROSTATIC +#include "NH_VARS.h" +#endif C == Routine arguments == INTEGER bi,bj,k @@ -92,11 +93,18 @@ C == Local variables == INTEGER I,J + INTEGER kp1 _RL smag2fac, smag4fac + _RL leith2fac, leith4fac + _RL leithD2fac, leithD4fac _RL viscAhRe_max, viscA4Re_max - _RL Alin,grdVrt,grdDiv + _RL Alin,grdVrt,grdDiv, keZpt _RL recip_dt,L2,L3,L4,L5,L2rdt,L4rdt _RL Uscl,U4scl + _RL divDx(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL divDy(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL vrtDx(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL vrtDy(1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL viscAh_ZMax(1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL viscAh_DMax(1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL viscA4_ZMax(1-OLx:sNx+OLx,1-OLy:sNy+OLy) @@ -118,43 +126,6 @@ _RL viscA4_ZSmg(1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL viscA4_DSmg(1-OLx:sNx+OLx,1-OLy:sNy+OLy) LOGICAL calcLeith,calcSmag - LOGICAL northWestCorner, northEastCorner, - & southWestCorner, southEastCorner -#ifdef ALLOW_EXCH2 - INTEGER myTile -#endif /* ALLOW_EXCH2 */ - -C Special stuff for Cubed Sphere - southWestCorner = .FALSE. - southEastCorner = .FALSE. - northWestCorner = .FALSE. - northEastCorner = .FALSE. - IF (useCubedSphereExchange) THEN -#ifdef ALLOW_EXCH2 - myTile = W2_myTileList(bi) - IF ( exch2_isWedge(myTile) .EQ. 1 .AND. - & exch2_isSedge(myTile) .EQ. 1 ) THEN - southWestCorner = .TRUE. - ENDIF - IF ( exch2_isEedge(myTile) .EQ. 1 .AND. - & exch2_isSedge(myTile) .EQ. 1 ) THEN - southEastCorner = .TRUE. - ENDIF - IF ( exch2_isEedge(myTile) .EQ. 1 .AND. - & exch2_isNedge(myTile) .EQ. 1 ) THEN - northEastCorner = .TRUE. - ENDIF - IF ( exch2_isWedge(myTile) .EQ. 1 .AND. - & exch2_isNedge(myTile) .EQ. 1 ) THEN - northWestCorner = .TRUE. - ENDIF -#else - southWestCorner = .TRUE. - southEastCorner = .TRUE. - northWestCorner = .TRUE. - northEastCorner = .TRUE. -#endif /* ALLOW_EXCH2 */ - ENDIF useVariableViscosity= & (viscAhGrid.NE.0.) @@ -220,8 +191,119 @@ smag4fac=0. _d 0 ENDIF + IF (calcleith) THEN + IF (useFullLeith) THEN + leith2fac =(viscC2leith /pi)**6 + leithD2fac=(viscC2leithD/pi)**6 + leith4fac =0.015625 _d 0*(viscC4leith /pi)**6 + leithD4fac=0.015625 _d 0*(viscC4leithD/pi)**6 + ELSE + leith2fac =(viscC2leith /pi)**3 + leithD2fac=(viscC2leithD/pi)**3 + leith4fac =0.125 _d 0*(viscC4leith /pi)**3 + leithD4fac=0.125 _d 0*(viscC4leithD/pi)**3 + ENDIF + ELSE + leith2fac=0. _d 0 + leith4fac=0. _d 0 + leithD2fac=0. _d 0 + leithD4fac=0. _d 0 + ENDIF + +#ifdef ALLOW_AUTODIFF_TAMC + IF ( calcLeith .OR. calcSmag ) THEN + STOP 'calcLeith or calcSmag not implemented for ADJOINT' + ENDIF + DO j=1-Oly,sNy+Oly + DO i=1-Olx,sNx+Olx + viscAh_D(i,j)=viscAhD + viscAh_Z(i,j)=viscAhZ + viscA4_D(i,j)=viscA4D + viscA4_Z(i,j)=viscA4Z +c + visca4_zsmg(i,j) = 0. _d 0 + viscah_zsmg(i,j) = 0. _d 0 +c + viscAh_Dlth(i,j) = 0. _d 0 + viscA4_Dlth(i,j) = 0. _d 0 + viscAh_DlthD(i,j)= 0. _d 0 + viscA4_DlthD(i,j)= 0. _d 0 +c + viscAh_DSmg(i,j) = 0. _d 0 + viscA4_DSmg(i,j) = 0. _d 0 +c + viscAh_ZLth(i,j) = 0. _d 0 + viscA4_ZLth(i,j) = 0. _d 0 + viscAh_ZLthD(i,j)= 0. _d 0 + viscA4_ZLthD(i,j)= 0. _d 0 + ENDDO + ENDDO +#endif + + + C - Viscosity IF (useVariableViscosity) THEN + +C- Initialise to zero gradient of vorticity & divergence: + DO j=1-Oly,sNy+Oly + DO i=1-Olx,sNx+Olx + divDx(i,j) = 0. + divDy(i,j) = 0. + vrtDx(i,j) = 0. + vrtDy(i,j) = 0. + ENDDO + ENDDO + + IF (calcleith) THEN +C horizontal gradient of horizontal divergence: + +C- gradient in x direction: +#ifndef ALLOW_AUTODIFF_TAMC + IF (useCubedSphereExchange) THEN +C to compute d/dx(hDiv), fill corners with appropriate values: + CALL FILL_CS_CORNER_TR_RL( .TRUE., hDiv, bi,bj, myThid ) + ENDIF +#endif + DO j=2-Oly,sNy+Oly-1 + DO i=2-Olx,sNx+Olx-1 + divDx(i,j) = (hDiv(i,j)-hDiv(i-1,j))*recip_DXC(i,j,bi,bj) + ENDDO + ENDDO + +C- gradient in y direction: +#ifndef ALLOW_AUTODIFF_TAMC + IF (useCubedSphereExchange) THEN +C to compute d/dy(hDiv), fill corners with appropriate values: + CALL FILL_CS_CORNER_TR_RL(.FALSE., hDiv, bi,bj, myThid ) + ENDIF +#endif + DO j=2-Oly,sNy+Oly-1 + DO i=2-Olx,sNx+Olx-1 + divDy(i,j) = (hDiv(i,j)-hDiv(i,j-1))*recip_DYC(i,j,bi,bj) + ENDDO + ENDDO + +C horizontal gradient of vertical vorticity: +C- gradient in x direction: + DO j=2-Oly,sNy+Oly + DO i=2-Olx,sNx+Olx-1 + vrtDx(i,j) = (vort3(i+1,j)-vort3(i,j)) + & *recip_DXG(i,j,bi,bj) + & *maskS(i,j,k,bi,bj) + ENDDO + ENDDO +C- gradient in y direction: + DO j=2-Oly,sNy+Oly-1 + DO i=2-Olx,sNx+Olx + vrtDy(i,j) = (vort3(i,j+1)-vort3(i,j)) + & *recip_DYG(i,j,bi,bj) + & *maskW(i,j,k,bi,bj) + ENDDO + ENDDO + + ENDIF + DO j=2-Oly,sNy+Oly-1 DO i=2-Olx,sNx+Olx-1 CCCCCCCCCCCCCCC Divergence Point CalculationsCCCCCCCCCCCCCCCCCCCC @@ -248,63 +330,56 @@ ENDIF C Velocity Reynolds Scale - Uscl=sqrt(KE(i,j)*L2)*viscAhRe_max - U4scl=sqrt(KE(i,j))*L3*viscA4Re_max + IF ( viscAhRe_max.GT.0. .AND. KE(i,j).GT.0. ) THEN + Uscl=sqrt(KE(i,j)*L2)*viscAhRe_max + ELSE + Uscl=0. + ENDIF + IF ( viscA4Re_max.GT.0. .AND. KE(i,j).GT.0. ) THEN + U4scl=sqrt(KE(i,j))*L3*viscA4Re_max + ELSE + U4scl=0. + ENDIF +#ifndef ALLOW_AUTODIFF_TAMC IF (useFullLeith.and.calcleith) THEN C This is the vector magnitude of the vorticity gradient squared - grdVrt=0.25 _d 0*( - & ((vort3(i+1,j)-vort3(i,j))*recip_DXG(i,j,bi,bj))**2 - & +((vort3(i,j+1)-vort3(i,j))*recip_DYG(i,j,bi,bj))**2 - & +((vort3(i+1,j+1)-vort3(i,j+1)) - & *recip_DXG(i,j+1,bi,bj))**2 - & +((vort3(i+1,j+1)-vort3(i+1,j)) - & *recip_DYG(i+1,j,bi,bj))**2) + grdVrt=0.25 _d 0*( (vrtDx(i,j+1)*vrtDx(i,j+1) + & + vrtDx(i,j)*vrtDx(i,j) ) + & + (vrtDy(i+1,j)*vrtDy(i+1,j) + & + vrtDy(i,j)*vrtDy(i,j) ) ) C This is the vector magnitude of grad (div.v) squared C Using it in Leith serves to damp instabilities in w. - grdDiv=0.25 _d 0*( - & ((hDiv(i+1,j)-hDiv(i,j))*recip_DXC(i+1,j,bi,bj))**2 - & +((hDiv(i,j+1)-hDiv(i,j))*recip_DYC(i,j+1,bi,bj))**2 - & +((hDiv(i,j)-hDiv(i-1,j))*recip_DXC(i,j,bi,bj))**2 - & +((hDiv(i,j)-hDiv(i,j-1))*recip_DYC(i,j,bi,bj))**2) + grdDiv=0.25 _d 0*( (divDx(i+1,j)*divDx(i+1,j) + & + divDx(i,j)*divDx(i,j) ) + & + (divDy(i,j+1)*divDy(i,j+1) + & + divDy(i,j)*divDy(i,j) ) ) viscAh_DLth(i,j)= - & sqrt(viscC2leith**2*grdVrt+viscC2leithD**2*grdDiv)*L3 - viscA4_DLth(i,j)=0.125 _d 0* - & sqrt(viscC4leith**2*grdVrt+viscC4leithD**2*grdDiv)*L5 + & sqrt(leith2fac*grdVrt+leithD2fac*grdDiv)*L3 + viscA4_DLth(i,j)= + & sqrt(leith4fac*grdVrt+leithD4fac*grdDiv)*L5 viscAh_DLthd(i,j)= - & sqrt(viscC2leithD**2*grdDiv)*L3 - viscA4_DLthd(i,j)=0.125 _d 0* - & sqrt(viscC4leithD**2*grdDiv)*L5 + & sqrt(leithD2fac*grdDiv)*L3 + viscA4_DLthd(i,j)= + & sqrt(leithD4fac*grdDiv)*L5 ELSEIF (calcleith) THEN C but this approximation will work on cube c (and differs by as much as 4X) - grdVrt=abs((vort3(i+1,j)-vort3(i,j))*recip_DXG(i,j,bi,bj)) - grdVrt=max(grdVrt, - & abs((vort3(i,j+1)-vort3(i,j))*recip_DYG(i,j,bi,bj))) - grdVrt=max(grdVrt, - & abs((vort3(i+1,j+1)-vort3(i,j+1))*recip_DXG(i,j+1,bi,bj))) - grdVrt=max(grdVrt, - & abs((vort3(i+1,j+1)-vort3(i+1,j))*recip_DYG(i+1,j,bi,bj))) - - grdDiv=abs((hDiv(i+1,j)-hDiv(i,j))*recip_DXC(i+1,j,bi,bj)) - grdDiv=max(grdDiv, - & abs((hDiv(i,j+1)-hDiv(i,j))*recip_DYC(i,j+1,bi,bj))) - grdDiv=max(grdDiv, - & abs((hDiv(i,j)-hDiv(i-1,j))*recip_DXC(i,j,bi,bj))) - grdDiv=max(grdDiv, - & abs((hDiv(i,j)-hDiv(i,j-1))*recip_DYC(i,j,bi,bj))) + grdVrt=max( abs(vrtDx(i,j+1)), abs(vrtDx(i,j)) ) + grdVrt=max( grdVrt, abs(vrtDy(i+1,j)) ) + grdVrt=max( grdVrt, abs(vrtDy(i,j)) ) c This approximation is good to the same order as above... - viscAh_Dlth(i,j)= - & (viscC2leith*grdVrt+(viscC2leithD*grdDiv))*L3 - viscA4_Dlth(i,j)=0.125 _d 0* - & (viscC4leith*grdVrt+(viscC4leithD*grdDiv))*L5 - viscAh_DlthD(i,j)= - & ((viscC2leithD*grdDiv))*L3 - viscA4_DlthD(i,j)=0.125 _d 0* - & ((viscC4leithD*grdDiv))*L5 + grdDiv=max( abs(divDx(i+1,j)), abs(divDx(i,j)) ) + grdDiv=max( grdDiv, abs(divDy(i,j+1)) ) + grdDiv=max( grdDiv, abs(divDy(i,j)) ) + + viscAh_Dlth(i,j)=(leith2fac*grdVrt+(leithD2fac*grdDiv))*L3 + viscA4_Dlth(i,j)=(leith4fac*grdVrt+(leithD4fac*grdDiv))*L5 + viscAh_DlthD(i,j)=((leithD2fac*grdDiv))*L3 + viscA4_DlthD(i,j)=((leithD4fac*grdDiv))*L5 ELSE viscAh_Dlth(i,j)=0. _d 0 viscA4_Dlth(i,j)=0. _d 0 @@ -323,6 +398,7 @@ viscAh_DSmg(i,j)=0. _d 0 viscA4_DSmg(i,j)=0. _d 0 ENDIF +#endif /* ALLOW_AUTODIFF_TAMC */ C Harmonic on Div.u points Alin=viscAhD+viscAhGrid*L2rdt @@ -340,6 +416,27 @@ viscA4_DMax(i,j)=min(viscA4GridMax*L4rdt,viscA4Max) viscA4_D(i,j)=min(viscA4_DMax(i,j),viscA4_D(i,j)) +#ifdef ALLOW_NONHYDROSTATIC +C /* Pass Viscosities to calc_gw, if constant, not necessary */ + + kp1 = MIN(k+1,Nr) + + if (k .eq. 1) then + viscAh_W(i,j,kp1,bi,bj)=0.5*viscAh_D(i,j) + viscA4_W(i,j,kp1,bi,bj)=0.5*viscA4_D(i,j) + + viscAh_W(i,j,k,bi,bj)=viscAh_D(i,j) /* These values dont get used */ + viscA4_W(i,j,k,bi,bj)=viscA4_D(i,j) + else +C Note that previous call of this function has already added half. + viscAh_W(i,j,kp1,bi,bj)=0.5*viscAh_D(i,j) + viscA4_W(i,j,kp1,bi,bj)=0.5*viscA4_D(i,j) + + viscAh_W(i,j,k,bi,bj)=viscAh_W(i,j,k,bi,bj)+0.5*viscAh_D(i,j) + viscA4_W(i,j,k,bi,bj)=viscA4_W(i,j,k,bi,bj)+0.5*viscA4_D(i,j) + endif +#endif /* ALLOW_NONHYDROSTATIC */ + CCCCCCCCCCCCC Vorticity Point CalculationsCCCCCCCCCCCCCCCCCC C These are (powers of) length scales IF (useAreaViscLength) THEN @@ -354,67 +451,66 @@ L2rdt=0.25 _d 0*recip_dt*L2 IF (useAreaViscLength) THEN - L4rdt=0.125 _d 0*recip_dt*RaZ(i,j,bi,bj)**2 + L4rdt=0.125 _d 0*recip_dt*rAz(i,j,bi,bj)**2 ELSE L4rdt=recip_dt/ & ( 6. _d 0*(recip_DXV(I,J,bi,bj)**4+recip_DYU(I,J,bi,bj)**4) & +8. _d 0*((recip_DXV(I,J,bi,bj)*recip_DYU(I,J,bi,bj))**2)) ENDIF -C Velocity Reynolds Scale - Uscl=sqrt(0.25 _d 0*(KE(i,j)+KE(i,j+1)+KE(i+1,j)+KE(i+1,j+1)) - & *L2)*viscAhRe_max - U4scl=sqrt(0.25 _d 0*(KE(i,j)+KE(i,j+1)+KE(i+1,j)+KE(i+1,j+1))) - & *L3*viscA4Re_max +C Velocity Reynolds Scale (Pb here at CS-grid corners !) + IF ( viscAhRe_max.GT.0. .OR. viscA4Re_max.GT.0. ) THEN + keZpt=0.25 _d 0*( (KE(i,j)+KE(i-1,j-1)) + & +(KE(i-1,j)+KE(i,j-1)) ) + IF ( keZpt.GT.0. ) THEN + Uscl = sqrt(keZpt*L2)*viscAhRe_max + U4scl= sqrt(keZpt)*L3*viscA4Re_max + ELSE + Uscl =0. + U4scl=0. + ENDIF + ELSE + Uscl =0. + U4scl=0. + ENDIF +#ifndef ALLOW_AUTODIFF_TAMC C This is the vector magnitude of the vorticity gradient squared IF (useFullLeith.and.calcleith) THEN - grdVrt=0.25 _d 0*( - & ((vort3(i+1,j)-vort3(i,j))*recip_DXG(i,j,bi,bj))**2 - & +((vort3(i,j+1)-vort3(i,j))*recip_DYG(i,j,bi,bj))**2 - & +((vort3(i-1,j)-vort3(i,j))*recip_DXG(i-1,j,bi,bj))**2 - & +((vort3(i,j-1)-vort3(i,j))*recip_DYG(i,j-1,bi,bj))**2) + grdVrt=0.25 _d 0*( (vrtDx(i-1,j)*vrtDx(i-1,j) + & + vrtDx(i,j)*vrtDx(i,j) ) + & + (vrtDy(i,j-1)*vrtDy(i,j-1) + & + vrtDy(i,j)*vrtDy(i,j) ) ) C This is the vector magnitude of grad(div.v) squared - grdDiv=0.25 _d 0*( - & ((hDiv(i,j)-hDiv(i-1,j))*recip_DXC(i,j,bi,bj))**2 - & +((hDiv(i,j)-hDiv(i,j-1))*recip_DYC(i,j,bi,bj))**2 - & +((hDiv(i,j-1)-hDiv(i-1,j-1))*recip_DXC(i,j-1,bi,bj))**2 - & +((hDiv(i-1,j)-hDiv(i-1,j-1))*recip_DYC(i-1,j,bi,bj))**2) + grdDiv=0.25 _d 0*( (divDx(i,j-1)*divDx(i,j-1) + & + divDx(i,j)*divDx(i,j) ) + & + (divDy(i-1,j)*divDy(i-1,j) + & + divDy(i,j)*divDy(i,j) ) ) viscAh_ZLth(i,j)= - & sqrt(viscC2leith**2*grdVrt+viscC2leithD**2*grdDiv)*L3 - viscA4_ZLth(i,j)=0.125 _d 0* - & sqrt(viscC4leith**2*grdVrt+viscC4leithD**2*grdDiv)*L5 + & sqrt(leith2fac*grdVrt+leithD2fac*grdDiv)*L3 + viscA4_ZLth(i,j)= + & sqrt(leith4fac*grdVrt+leithD4fac*grdDiv)*L5 viscAh_ZLthD(i,j)= - & sqrt(viscC2leithD**2*grdDiv)*L3 - viscA4_ZLthD(i,j)=0.125 _d 0* - & sqrt(viscC4leithD**2*grdDiv)*L5 + & sqrt(leithD2fac*grdDiv)*L3 + viscA4_ZLthD(i,j)= + & sqrt(leithD4fac*grdDiv)*L5 ELSEIF (calcleith) THEN C but this approximation will work on cube (and differs by 4X) - grdVrt=abs((vort3(i+1,j)-vort3(i,j))*recip_DXG(i,j,bi,bj)) - grdVrt=max(grdVrt, - & abs((vort3(i,j+1)-vort3(i,j))*recip_DYG(i,j,bi,bj))) - grdVrt=max(grdVrt, - & abs((vort3(i-1,j)-vort3(i,j))*recip_DXG(i-1,j,bi,bj))) - grdVrt=max(grdVrt, - & abs((vort3(i,j-1)-vort3(i,j))*recip_DYG(i,j-1,bi,bj))) - - grdDiv=abs((hDiv(i,j)-hDiv(i-1,j))*recip_DXC(i,j,bi,bj)) - grdDiv=max(grdDiv, - & abs((hDiv(i,j)-hDiv(i,j-1))*recip_DYC(i,j,bi,bj))) - grdDiv=max(grdDiv, - & abs((hDiv(i,j-1)-hDiv(i-1,j-1))*recip_DXC(i,j-1,bi,bj))) - grdDiv=max(grdDiv, - & abs((hDiv(i-1,j)-hDiv(i-1,j-1))*recip_DYC(i-1,j,bi,bj))) - - viscAh_ZLth(i,j)=(viscC2leith*grdVrt - & +(viscC2leithD*grdDiv))*L3 - viscA4_ZLth(i,j)=0.125 _d 0*(viscC4leith*grdVrt - & +(viscC4leithD*grdDiv))*L5 - viscAh_ZLthD(i,j)=((viscC2leithD*grdDiv))*L3 - viscA4_ZLthD(i,j)=0.125 _d 0*((viscC4leithD*grdDiv))*L5 + grdVrt=max( abs(vrtDx(i-1,j)), abs(vrtDx(i,j)) ) + grdVrt=max( grdVrt, abs(vrtDy(i,j-1)) ) + grdVrt=max( grdVrt, abs(vrtDy(i,j)) ) + + grdDiv=max( abs(divDx(i,j)), abs(divDx(i,j-1)) ) + grdDiv=max( grdDiv, abs(divDy(i,j)) ) + grdDiv=max( grdDiv, abs(divDy(i-1,j)) ) + + viscAh_ZLth(i,j)=(leith2fac*grdVrt+(leithD2fac*grdDiv))*L3 + viscA4_ZLth(i,j)=(leith4fac*grdVrt+(leithD4fac*grdDiv))*L5 + viscAh_ZLthD(i,j)=(leithD2fac*grdDiv)*L3 + viscA4_ZLthD(i,j)=(leithD4fac*grdDiv)*L5 ELSE viscAh_ZLth(i,j)=0. _d 0 viscA4_ZLth(i,j)=0. _d 0 @@ -430,6 +526,7 @@ viscA4_ZSmg(i,j)=smag4fac*L2*viscAh_ZSmg(i,j) viscAh_ZSmg(i,j)=smag2fac*viscAh_ZSmg(i,j) ENDIF +#endif /* ALLOW_AUTODIFF_TAMC */ C Harmonic on Zeta points Alin=viscAhZ+viscAhGrid*L2rdt @@ -465,6 +562,10 @@ CALL DIAGNOSTICS_FILL(viscA4_D,'VISCA4D ',k,1,2,bi,bj,myThid) CALL DIAGNOSTICS_FILL(viscAh_Z,'VISCAHZ ',k,1,2,bi,bj,myThid) CALL DIAGNOSTICS_FILL(viscA4_Z,'VISCA4Z ',k,1,2,bi,bj,myThid) +#ifdef ALLOW_NONHYDROSTATIC + CALL DIAGNOSTICS_FILL(viscAh_W,'VISCAHW ',k,1,2,bi,bj,myThid) + CALL DIAGNOSTICS_FILL(viscA4_W,'VISCA4W ',k,1,2,bi,bj,myThid) +#endif CALL DIAGNOSTICS_FILL(viscAh_DMax,'VAHDMAX ',k,1,2,bi,bj,myThid) CALL DIAGNOSTICS_FILL(viscA4_DMax,'VA4DMAX ',k,1,2,bi,bj,myThid)