--- MITgcm/pkg/mom_vecinv/mom_vecinv.F 2003/10/31 20:35:32 1.10 +++ MITgcm/pkg/mom_vecinv/mom_vecinv.F 2004/01/25 00:31:52 1.13 @@ -1,4 +1,4 @@ -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.13 2004/01/25 00:31:52 dimitri Exp $ C $Name: $ #include "PACKAGES_CONFIG.h" @@ -57,7 +57,7 @@ INTEGER myThid INTEGER bi,bj,iMin,iMax,jMin,jMax -#ifndef DISABLE_MOM_VECINV +#ifdef ALLOW_MOM_VECINV C == Functions == LOGICAL DIFFERENT_MULTIPLE @@ -426,27 +426,31 @@ ENDDO #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 /* ALLOW_TIMEAVE */ +#endif /* ndef HRCUBE */ 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) + 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 - 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 + ENDIF C-- Bernoulli term CALL MOM_VI_U_GRAD_KE(bi,bj,K,KE,uCf,myThid) @@ -489,7 +493,7 @@ CALL WRITE_LOCAL_RL('D','I10',1,hdiv,bi,bj,k,myIter,myThid) ENDIF -#endif /* DISABLE_MOM_VECINV */ +#endif /* ALLOW_MOM_VECINV */ RETURN END