--- MITgcm/pkg/mom_vecinv/mom_vecinv.F 2003/10/31 20:35:32 1.10 +++ MITgcm/pkg/mom_vecinv/mom_vecinv.F 2004/09/20 21:54:55 1.22 @@ -1,14 +1,13 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_vecinv/mom_vecinv.F,v 1.10 2003/10/31 20:35:32 edhill Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_vecinv/mom_vecinv.F,v 1.22 2004/09/20 21:54:55 jmc Exp $ C $Name: $ -#include "PACKAGES_CONFIG.h" -#include "CPP_OPTIONS.h" +#include "MOM_VECINV_OPTIONS.h" SUBROUTINE MOM_VECINV( I bi,bj,iMin,iMax,jMin,jMax,k,kUp,kDown, I dPhiHydX,dPhiHydY,KappaRU,KappaRV, U fVerU, fVerV, - I myCurrentTime, myIter, myThid) + I myTime, myIter, myThid) C /==========================================================\ C | S/R MOM_VECINV | C | o Form the right hand-side of the momentum equation. | @@ -52,12 +51,12 @@ _RL fVerU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) _RL fVerV(1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) INTEGER kUp,kDown - _RL myCurrentTime + _RL myTime INTEGER myIter INTEGER myThid INTEGER bi,bj,iMin,iMax,jMin,jMax -#ifndef DISABLE_MOM_VECINV +#ifdef ALLOW_MOM_VECINV C == Functions == LOGICAL DIFFERENT_MULTIPLE @@ -118,6 +117,7 @@ _RL mtFacV _RL wVelBottomOverride 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) @@ -136,6 +136,8 @@ IF ( k .EQ. 1 ) rVelMaskOverride=freeSurfFac wVelBottomOverride=1. IF (k.EQ.Nr) wVelBottomOverride=0. + writeDiag = DIFFERENT_MULTIPLE(diagFreq, myTime, + & myTime-deltaTClock) C Initialise intermediate terms DO J=1-OLy,sNy+OLy @@ -230,27 +232,34 @@ 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_VI_CALC_KE(bi,bj,k,uFld,vFld,KE,myThid) + CALL MOM_CALC_KE(bi,bj,k,2,uFld,vFld,KE,myThid) - CALL MOM_VI_CALC_HDIV(bi,bj,k,uFld,vFld,hDiv,myThid) + CALL MOM_CALC_HDIV(bi,bj,k,2,uFld,vFld,hDiv,myThid) - CALL MOM_VI_CALC_RELVORT3(bi,bj,k,uFld,vFld,hFacZ,vort3,myThid) + CALL MOM_CALC_RELVORT3(bi,bj,k,uFld,vFld,hFacZ,vort3,myThid) -c CALL MOM_VI_CALC_ABSVORT3(bi,bj,k,vort3,omega3,myThid) + IF (useAbsVorticity) + & CALL MOM_CALC_ABSVORT3(bi,bj,k,vort3,omega3,myThid) IF (momViscosity) THEN C Calculate del^2 u and del^2 v for bi-harmonic term - IF (viscA4.NE.0.) THEN + IF (viscA4.NE.0. + & .OR. viscA4Grid.NE.0. + & .OR. viscC4leith.NE.0. + & ) THEN CALL MOM_VI_DEL2UV(bi,bj,k,hDiv,vort3,hFacZ, O del2u,del2v, & myThid) - CALL MOM_VI_CALC_HDIV(bi,bj,k,del2u,del2v,dStar,myThid) - CALL MOM_VI_CALC_RELVORT3( + CALL MOM_CALC_HDIV(bi,bj,k,2,del2u,del2v,dStar,myThid) + CALL MOM_CALC_RELVORT3( & bi,bj,k,del2u,del2v,hFacZ,zStar,myThid) ENDIF C Calculate dissipation terms for U and V equations C in terms of vorticity and divergence - IF (viscAh.NE.0. .OR. viscA4.NE.0.) THEN + IF (viscAh.NE.0. .OR. viscA4.NE.0. + & .OR. viscAhGrid.NE.0. .OR. viscA4Grid.NE.0. + & .OR. viscC2leith.NE.0. .OR. viscC4leith.NE.0. + & ) THEN CALL MOM_VI_HDISSIP(bi,bj,k,hDiv,vort3,hFacZ,dStar,zStar, O uDiss,vDiss, & myThid) @@ -393,8 +402,9 @@ c ENDIF C-- Horizontal Coriolis terms - IF (useCoriolis .AND. .NOT.useCDscheme) THEN - CALL MOM_VI_CORIOLIS(bi,bj,k,uFld,vFld,omega3,hFacZ,r_hFacZ, + IF (useCoriolis .AND. .NOT.useCDscheme + & .AND. .NOT. useAbsVorticity) THEN + CALL MOM_VI_CORIOLIS(bi,bj,k,uFld,vFld,hFacZ,r_hFacZ, & uCf,vCf,myThid) DO j=jMin,jMax DO i=iMin,iMax @@ -402,22 +412,34 @@ gV(i,j,k,bi,bj) = gV(i,j,k,bi,bj)+vCf(i,j) ENDDO ENDDO + IF ( writeDiag ) THEN + CALL WRITE_LOCAL_RL('fV','I10',1,uCf,bi,bj,k,myIter,myThid) + CALL WRITE_LOCAL_RL('fU','I10',1,vCf,bi,bj,k,myIter,myThid) + ENDIF ENDIF IF (momAdvection) THEN C-- Horizontal advection of relative vorticity -c CALL MOM_VI_U_CORIOLIS(bi,bj,K,vFld,omega3,r_hFacZ,uCf,myThid) - CALL MOM_VI_U_CORIOLIS(bi,bj,k,vFld,vort3,hFacZ,r_hFacZ, - & uCf,myThid) + IF (useAbsVorticity) THEN + CALL MOM_VI_U_CORIOLIS(bi,bj,K,vFld,omega3,hFacZ,r_hFacZ, + & uCf,myThid) + ELSE + CALL MOM_VI_U_CORIOLIS(bi,bj,k,vFld,vort3,hFacZ,r_hFacZ, + & uCf,myThid) + ENDIF c CALL MOM_VI_U_CORIOLIS_C4(bi,bj,K,vFld,vort3,r_hFacZ,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 -c CALL MOM_VI_V_CORIOLIS(bi,bj,K,uFld,omega3,r_hFacZ,vCf,myThid) - CALL MOM_VI_V_CORIOLIS(bi,bj,k,uFld,vort3,hFacZ,r_hFacZ, - & vCf,myThid) + IF (useAbsVorticity) THEN + CALL MOM_VI_V_CORIOLIS(bi,bj,K,uFld,omega3,hFacZ,r_hFacZ, + & vCf,myThid) + ELSE + CALL MOM_VI_V_CORIOLIS(bi,bj,k,uFld,vort3,hFacZ,r_hFacZ, + & vCf,myThid) + ENDIF c CALL MOM_VI_V_CORIOLIS_C4(bi,bj,K,uFld,vort3,r_hFacZ,vCf,myThid) DO j=jMin,jMax DO i=iMin,iMax @@ -425,28 +447,36 @@ ENDDO ENDDO + IF ( writeDiag ) THEN + CALL WRITE_LOCAL_RL('zV','I10',1,uCf,bi,bj,k,myIter,myThid) + CALL WRITE_LOCAL_RL('zU','I10',1,vCf,bi,bj,k,myIter,myThid) + ENDIF #ifdef ALLOW_TIMEAVE +#ifndef HRCUBE IF (taveFreq.GT.0.) THEN CALL TIMEAVE_CUMUL_1K1T(uZetatave,vCf,deltaTClock, & Nr, k, bi, bj, myThid) CALL TIMEAVE_CUMUL_1K1T(vZetatave,uCf,deltaTClock, & Nr, k, bi, bj, myThid) ENDIF -#endif +#endif /* ndef HRCUBE */ +#endif /* ALLOW_TIMEAVE */ C-- Vertical shear terms (-w*du/dr & -w*dv/dr) - CALL MOM_VI_U_VERTSHEAR(bi,bj,K,uVel,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_VI_V_VERTSHEAR(bi,bj,K,vVel,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) + IF ( .NOT. momImplVertAdv ) THEN + CALL MOM_VI_U_VERTSHEAR(bi,bj,K,uVel,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_VI_V_VERTSHEAR(bi,bj,K,vVel,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 - ENDDO + ENDIF C-- Bernoulli term CALL MOM_VI_U_GRAD_KE(bi,bj,K,KE,uCf,myThid) @@ -461,6 +491,11 @@ gV(i,j,k,bi,bj) = gV(i,j,k,bi,bj)+vCf(i,j) ENDDO ENDDO + IF ( writeDiag ) THEN + CALL WRITE_LOCAL_RL('KEx','I10',1,uCf,bi,bj,k,myIter,myThid) + CALL WRITE_LOCAL_RL('KEy','I10',1,vCf,bi,bj,k,myIter,myThid) + ENDIF + C-- end if momAdvection ENDIF @@ -472,24 +507,28 @@ ENDDO ENDDO +#ifdef ALLOW_DEBUG + IF ( debugLevel .GE. debLevB + & .AND. k.EQ.4 .AND. myIter.EQ.nIter0 + & .AND. nPx.EQ.1 .AND. nPy.EQ.1 + & .AND. useCubedSphereExchange ) THEN + CALL DEBUG_CS_CORNER_UV(uDiss,vDiss,k, + & standardMessageUnit,bi,bj,myThid) + ENDIF +#endif /* ALLOW_DEBUG */ - IF ( - & DIFFERENT_MULTIPLE(diagFreq,myCurrentTime, - & myCurrentTime-deltaTClock) - & ) THEN + IF ( writeDiag ) 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('fV','I10',1,uCf,bi,bj,k,myIter,myThid) - CALL WRITE_LOCAL_RL('fU','I10',1,vCf,bi,bj,k,myIter,myThid) CALL WRITE_LOCAL_RL('Du','I10',1,uDiss,bi,bj,k,myIter,myThid) CALL WRITE_LOCAL_RL('Dv','I10',1,vDiss,bi,bj,k,myIter,myThid) CALL WRITE_LOCAL_RL('Z3','I10',1,vort3,bi,bj,k,myIter,myThid) -c 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) 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) ENDIF -#endif /* DISABLE_MOM_VECINV */ +#endif /* ALLOW_MOM_VECINV */ RETURN END