--- MITgcm/model/src/dynamics.F 1998/07/01 19:57:22 1.24 +++ MITgcm/model/src/dynamics.F 1999/08/26 17:47:37 1.45 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.24 1998/07/01 19:57:22 adcroft Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.45 1999/08/26 17:47:37 adcroft Exp $ #include "CPP_OPTIONS.h" @@ -20,6 +20,7 @@ C | C*P* comments indicating place holders for which code is | C | presently being developed. | C \==========================================================/ + IMPLICIT NONE C == Global variables === #include "SIZE.h" @@ -27,6 +28,10 @@ #include "CG2D.h" #include "PARAMS.h" #include "DYNVARS.h" +#include "GRID.h" +#ifdef ALLOW_KPP +#include "KPPMIX.h" +#endif C == Routine arguments == C myTime - Current time in simulation @@ -38,12 +43,13 @@ C == Local variables C xA, yA - Per block temporaries holding face areas -C uTrans, vTrans, wTrans - Per block temporaries holding flow transport -C wVel o uTrans: Zonal transport +C uTrans, vTrans, rTrans - Per block temporaries holding flow +C transport +C rVel o uTrans: Zonal transport C o vTrans: Meridional transport -C o wTrans: Vertical transport -C o wVel: Vertical velocity at upper and lower -C cell faces. +C o rTrans: Vertical transport +C o rVel: Vertical velocity at upper and +C lower cell faces. C maskC,maskUp o maskC: land/water mask for tracer cells C o maskUp: land/water mask for W points C aTerm, xTerm, cTerm - Work arrays for holding separate terms in @@ -59,44 +65,69 @@ C is "pipelined" in the vertical C so we need an fVer for each C variable. -C iMin, iMax - Ranges and sub-block indices on which calculations -C jMin, jMax are applied. +C rhoK, rhoKM1 - Density at current level, level above and level +C below. +C rhoKP1 +C buoyK, buoyKM1 - Buoyancy at current level and level above. +C phiHyd - Hydrostatic part of the potential phiHydi. +C In z coords phiHydiHyd is the hydrostatic +C pressure anomaly +C In p coords phiHydiHyd is the geopotential +C surface height +C anomaly. +C etaSurfX, - Holds surface elevation gradient in X and Y. +C etaSurfY +C K13, K23, K33 - Non-zero elements of small-angle approximation +C diffusion tensor. +C KapGM - Spatially varying Visbeck et. al mixing coeff. +C KappaRT, - Total diffusion in vertical for T and S. +C KappaRS (background + spatially varying, isopycnal term). +C iMin, iMax - Ranges and sub-block indices on which calculations +C jMin, jMax are applied. C bi, bj -C k, kUp, kDown, kM1 - Index for layer above and below. kUp and kDown -C are switched with layer to be the appropriate index -C into fVerTerm - _RS xA (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RS yA (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL uTrans(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL vTrans(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL wTrans(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL wVel (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) - _RS maskC (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RS maskUp(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL aTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL xTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL cTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL mTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL pTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL fZon (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL fMer (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL fVerT (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) - _RL fVerS (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) - _RL fVerU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) - _RL fVerV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) - _RL pH (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz) - _RL rhokm1(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL rhokp1(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL rhok (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL rhotmp(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL pSurfX(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL pSurfY(1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL K13 (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz) - _RL K23 (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz) - _RL K33 (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nz) - _RL KapGM (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL KappaZT(1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nz) - _RL KappaZS(1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nz) +C k, kUp, - Index for layer above and below. kUp and kDown +C kDown, kM1 are switched with layer to be the appropriate +C index into fVerTerm. + _RS xA (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RS yA (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL uTrans (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL vTrans (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL rTrans (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL rVel (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) + _RS maskC (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RS maskUp (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL aTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL xTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL cTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL mTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL pTerm (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL fZon (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL fMer (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL fVerT (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) + _RL fVerS (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) + _RL fVerU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) + _RL fVerV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) + _RL phiHyd (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) + _RL rhokm1 (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL rhokp1 (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL rhok (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL buoyKM1 (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL buoyK (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL rhotmp (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL etaSurfX(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL etaSurfY(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL K13 (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) + _RL K23 (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) + _RL K33 (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) + _RL KapGM (1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL KappaRT (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr) + _RL KappaRS (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr) + _RL KappaRU (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr) + _RL KappaRV (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr) + +#ifdef INCLUDE_CONVECT_CALL + _RL ConvectCount (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) +#endif INTEGER iMin, iMax INTEGER jMin, jMax @@ -118,14 +149,15 @@ C "Calculation of Gs" C =================== C This is where all the accelerations and tendencies (ie. -C physics, parameterizations etc...) are calculated -C w = sum_z ( div. u[n] ) +C phiHydysics, parameterizations etc...) are calculated +C rVel = sum_r ( div. u[n] ) C rho = rho ( theta[n], salt[n] ) +C b = b(rho, theta) C K31 = K31 ( rho ) -C Gu[n] = Gu( u[n], v[n], w, rho, Ph, ... ) -C Gv[n] = Gv( u[n], v[n], w, rho, Ph, ... ) -C Gt[n] = Gt( theta[n], u[n], v[n], w, K31, ... ) -C Gs[n] = Gs( salt[n], u[n], v[n], w, K31, ... ) +C Gu[n] = Gu( u[n], v[n], rVel, b, ... ) +C Gv[n] = Gv( u[n], v[n], rVel, b, ... ) +C Gt[n] = Gt( theta[n], u[n], v[n], rVel, K31, ... ) +C Gs[n] = Gs( salt[n], u[n], v[n], rVel, K31, ... ) C C "Time-stepping" or "Prediction" C ================================ @@ -167,43 +199,59 @@ pTerm(i,j) = 0. _d 0 fZon(i,j) = 0. _d 0 fMer(i,j) = 0. _d 0 - DO K=1,nZ - pH (i,j,k) = 0. _d 0 - K13(i,j,k) = 0. _d 0 - K23(i,j,k) = 0. _d 0 - K33(i,j,k) = 0. _d 0 - KappaZT(i,j,k) = 0. _d 0 + DO K=1,Nr + phiHyd (i,j,k) = 0. _d 0 + K13(i,j,k) = 0. _d 0 + K23(i,j,k) = 0. _d 0 + K33(i,j,k) = 0. _d 0 + KappaRU(i,j,k) = 0. _d 0 + KappaRV(i,j,k) = 0. _d 0 ENDDO - rhokm1(i,j) = 0. _d 0 - rhok (i,j) = 0. _d 0 - rhokp1(i,j) = 0. _d 0 - rhotmp(i,j) = 0. _d 0 - maskC (i,j) = 0. _d 0 + rhoKM1 (i,j) = 0. _d 0 + rhok (i,j) = 0. _d 0 + rhoKP1 (i,j) = 0. _d 0 + rhoTMP (i,j) = 0. _d 0 + buoyKM1(i,j) = 0. _d 0 + buoyK (i,j) = 0. _d 0 + maskC (i,j) = 0. _d 0 ENDDO ENDDO + DO bj=myByLo(myThid),myByHi(myThid) DO bi=myBxLo(myThid),myBxHi(myThid) C-- Set up work arrays that need valid initial values DO j=1-OLy,sNy+OLy DO i=1-OLx,sNx+OLx - wTrans(i,j) = 0. _d 0 - wVel (i,j,1) = 0. _d 0 - wVel (i,j,2) = 0. _d 0 - fVerT(i,j,1) = 0. _d 0 - fVerT(i,j,2) = 0. _d 0 - fVerS(i,j,1) = 0. _d 0 - fVerS(i,j,2) = 0. _d 0 - fVerU(i,j,1) = 0. _d 0 - fVerU(i,j,2) = 0. _d 0 - fVerV(i,j,1) = 0. _d 0 - fVerV(i,j,2) = 0. _d 0 - pH(i,j,1) = 0. _d 0 - K13(i,j,1) = 0. _d 0 - K23(i,j,1) = 0. _d 0 - K33(i,j,1) = 0. _d 0 - KapGM(i,j) = GMkbackground + rTrans(i,j) = 0. _d 0 + rVel (i,j,1) = 0. _d 0 + rVel (i,j,2) = 0. _d 0 + fVerT (i,j,1) = 0. _d 0 + fVerT (i,j,2) = 0. _d 0 + fVerS (i,j,1) = 0. _d 0 + fVerS (i,j,2) = 0. _d 0 + fVerU (i,j,1) = 0. _d 0 + fVerU (i,j,2) = 0. _d 0 + fVerV (i,j,1) = 0. _d 0 + fVerV (i,j,2) = 0. _d 0 + phiHyd(i,j,1) = 0. _d 0 + K13 (i,j,1) = 0. _d 0 + K23 (i,j,1) = 0. _d 0 + K33 (i,j,1) = 0. _d 0 + KapGM (i,j) = GMkbackground + ENDDO + ENDDO + + DO k=1,Nr + DO j=1-OLy,sNy+OLy + DO i=1-OLx,sNx+OLx +#ifdef INCLUDE_CONVECT_CALL + ConvectCount(i,j,k) = 0. +#endif + KappaRT(i,j,k) = 0. _d 0 + KappaRS(i,j,k) = 0. _d 0 + ENDDO ENDDO ENDDO @@ -212,113 +260,186 @@ jMin = 1-OLy+1 jMax = sNy+OLy + K = 1 - BOTTOM_LAYER = K .EQ. Nz + BOTTOM_LAYER = K .EQ. Nr +#ifdef DO_PIPELINED_CORRECTION_STEP C-- Calculate gradient of surface pressure - CALL GRAD_PSURF( + CALL CALC_GRAD_ETA_SURF( I bi,bj,iMin,iMax,jMin,jMax, - O pSurfX,pSurfY, + O etaSurfX,etaSurfY, I myThid) - C-- Update fields in top level according to tendency terms CALL CORRECTION_STEP( - I bi,bj,iMin,iMax,jMin,jMax,K,pSurfX,pSurfY,myTime,myThid) - + I bi,bj,iMin,iMax,jMin,jMax,K, + I etaSurfX,etaSurfY,myTime,myThid) +#ifdef ALLOW_OBCS + IF (openBoundaries) CALL APPLY_OBCS1( bi, bj, K, myThid ) +#endif IF ( .NOT. BOTTOM_LAYER ) THEN C-- Update fields in layer below according to tendency terms CALL CORRECTION_STEP( - I bi,bj,iMin,iMax,jMin,jMax,K+1,pSurfX,pSurfY,myTime,myThid) + I bi,bj,iMin,iMax,jMin,jMax,K+1, + I etaSurfX,etaSurfY,myTime,myThid) +#ifdef ALLOW_OBCS + IF (openBoundaries) CALL APPLY_OBCS1( bi, bj, K+1, myThid ) +#endif ENDIF - +#endif C-- Density of 1st level (below W(1)) reference to level 1 +#ifdef INCLUDE_FIND_RHO_CALL CALL FIND_RHO( I bi, bj, iMin, iMax, jMin, jMax, K, K, eosType, O rhoKm1, I myThid ) +#endif - IF ( .NOT. BOTTOM_LAYER ) THEN + IF ( (.NOT. BOTTOM_LAYER) +#ifdef ALLOW_KPP + & .AND. (.NOT.usingKPPmixing) ! CONVECT not needed with KPP mixing +#endif + & ) THEN C-- Check static stability with layer below -C and mix as needed. +C-- and mix as needed. +#ifdef INCLUDE_FIND_RHO_CALL CALL FIND_RHO( I bi, bj, iMin, iMax, jMin, jMax, K+1, K, eosType, O rhoKp1, I myThid ) +#endif +#ifdef INCLUDE_CONVECT_CALL CALL CONVECT( I bi,bj,iMin,iMax,jMin,jMax,K+1,rhoKm1,rhoKp1, + U ConvectCount, + I myTime,myIter,myThid) +#endif +C-- Implicit Vertical Diffusion for Convection + IF (ivdc_kappa.NE.0.) CALL CALC_IVDC( + I bi,bj,iMin,iMax,jMin,jMax,K+1,rhoKm1,rhoKp1, + U ConvectCount, KappaRT, KappaRS, I myTime,myIter,myThid) C-- Recompute density after mixing +#ifdef INCLUDE_FIND_RHO_CALL CALL FIND_RHO( I bi, bj, iMin, iMax, jMin, jMax, K, K, eosType, O rhoKm1, I myThid ) +#endif ENDIF - -C-- Integrate hydrostatic balance for pH with BC of pH(z=0)=0 - CALL CALC_PH( - I bi,bj,iMin,iMax,jMin,jMax,K,rhoKm1,rhoKm1, - U pH, +C-- Calculate buoyancy + CALL CALC_BUOYANCY( + I bi,bj,iMin,iMax,jMin,jMax,K,rhoKm1, + O buoyKm1, + I myThid ) +C-- Integrate hydrostatic balance for phiHyd with BC of +C-- phiHyd(z=0)=0 + CALL CALC_PHI_HYD( + I bi,bj,iMin,iMax,jMin,jMax,K,buoyKm1,buoyKm1, + U phiHyd, I myThid ) - DO K=2,Nz - - BOTTOM_LAYER = K .EQ. Nz - + DO K=2,Nr + BOTTOM_LAYER = K .EQ. Nr +#ifdef DO_PIPELINED_CORRECTION_STEP IF ( .NOT. BOTTOM_LAYER ) THEN C-- Update fields in layer below according to tendency terms CALL CORRECTION_STEP( - I bi,bj,iMin,iMax,jMin,jMax,K+1,pSurfX,pSurfY,myTime,myThid) + I bi,bj,iMin,iMax,jMin,jMax,K+1, + I etaSurfX,etaSurfY,myTime,myThid) +#ifdef ALLOW_OBCS + IF (openBoundaries) CALL APPLY_OBCS1( bi, bj, K+1, myThid ) +#endif ENDIF -C-- Update fields in layer below according to tendency terms -C CALL CORRECTION_STEP( -C I bi,bj,iMin,iMax,jMin,jMax,K,pSurfX,pSurfY,myTime,myThid) - +#endif C-- Density of K level (below W(K)) reference to K level +#ifdef INCLUDE_FIND_RHO_CALL CALL FIND_RHO( I bi, bj, iMin, iMax, jMin, jMax, K, K, eosType, O rhoK, I myThid ) - IF ( .NOT. BOTTOM_LAYER ) THEN -C-- Check static stability with layer below -C and mix as needed. -C-- Density of K+1 level (below W(K+1)) reference to K level +#endif + IF ( (.NOT. BOTTOM_LAYER) +#ifdef ALLOW_KPP + & .AND. (.NOT.usingKPPmixing) ! CONVECT not needed with KPP mixing +#endif + & ) THEN +C-- Check static stability with layer below and mix as needed. +C-- Density of K+1 level (below W(K+1)) reference to K level. +#ifdef INCLUDE_FIND_RHO_CALL CALL FIND_RHO( I bi, bj, iMin, iMax, jMin, jMax, K+1, K, eosType, O rhoKp1, I myThid ) +#endif +#ifdef INCLUDE_CONVECT_CALL CALL CONVECT( I bi,bj,iMin,iMax,jMin,jMax,K+1,rhoK,rhoKp1, + U ConvectCount, I myTime,myIter,myThid) +#endif +C-- Implicit Vertical Diffusion for Convection + IF (ivdc_kappa.NE.0.) CALL CALC_IVDC( + I bi,bj,iMin,iMax,jMin,jMax,K+1,rhoKm1,rhoKp1, + U ConvectCount, KappaRT, KappaRS, + I myTime,myIter,myThid) C-- Recompute density after mixing +#ifdef INCLUDE_FIND_RHO_CALL CALL FIND_RHO( I bi, bj, iMin, iMax, jMin, jMax, K, K, eosType, O rhoK, I myThid ) +#endif ENDIF -C-- Integrate hydrostatic balance for pH with BC of pH(z=0)=0 - CALL CALC_PH( - I bi,bj,iMin,iMax,jMin,jMax,K,rhoKm1,rhoK, - U pH, +C-- Calculate buoyancy + CALL CALC_BUOYANCY( + I bi,bj,iMin,iMax,jMin,jMax,K,rhoK, + O buoyK, I myThid ) +C-- Integrate hydrostatic balance for phiHyd with BC of +C-- phiHyd(z=0)=0 + CALL CALC_PHI_HYD( + I bi,bj,iMin,iMax,jMin,jMax,K,buoyKm1,buoyK, + U phiHyd, + I myThid ) C-- Calculate iso-neutral slopes for the GM/Redi parameterisation +#ifdef INCLUDE_FIND_RHO_CALL CALL FIND_RHO( - I bi, bj, iMin, iMax, jMin, jMax, K-1, K, eosType, - O rhoTmp, - I myThid ) + I bi, bj, iMin, iMax, jMin, jMax, K-1, K, eosType, + O rhoTmp, + I myThid ) +#endif +#ifdef INCLUDE_CALC_ISOSLOPES_CALL CALL CALC_ISOSLOPES( - I bi, bj, iMin, iMax, jMin, jMax, K, - I rhoKm1, rhoK, rhotmp, - O K13, K23, K33, KapGM, - I myThid ) + I bi, bj, iMin, iMax, jMin, jMax, K, + I rhoKm1, rhoK, rhotmp, + O K13, K23, K33, KapGM, + I myThid ) +#endif DO J=jMin,jMax DO I=iMin,iMax - rhoKm1(I,J)=rhoK(I,J) +#ifdef INCLUDE_FIND_RHO_CALL + rhoKm1 (I,J) = rhoK(I,J) +#endif + buoyKm1(I,J) = buoyK(I,J) ENDDO ENDDO - ENDDO ! K - DO K = Nz, 1, -1 +#ifdef ALLOW_KPP +C-- Compute KPP mixing coefficients + IF (usingKPPmixing) THEN + CALL TIMER_START('KVMIX (FIND KPP COEFFICIENTS) [DYNAMICS]' + I , myThid) + CALL KVMIX( + I bi, bj, myTime, myThid ) + CALL TIMER_STOP ('KVMIX (FIND KPP COEFFICIENTS) [DYNAMICS]' + I , myThid) + ENDIF +#endif + + DO K = Nr, 1, -1 + kM1 =max(1,k-1) ! Points to level above k (=k-1) kUp =1+MOD(k+1,2) ! Cycles through 1,2 to point to layer above kDown=1+MOD(k,2) ! Cycles through 2,1 to point to current layer @@ -330,74 +451,113 @@ C-- Get temporary terms used by tendency routines CALL CALC_COMMON_FACTORS ( I bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown, - O xA,yA,uTrans,vTrans,wTrans,wVel,maskC,maskUp, + O xA,yA,uTrans,vTrans,rTrans,rVel,maskC,maskUp, I myThid) - +#ifdef INCLUDE_CALC_DIFFUSIVITY_CALL C-- Calculate the total vertical diffusivity CALL CALC_DIFFUSIVITY( I bi,bj,iMin,iMax,jMin,jMax,K, I maskC,maskUp,KapGM,K33, - O KappaZT,KappaZS, + O KappaRT,KappaRS,KappaRU,KappaRV, I myThid) - +#endif C-- Calculate accelerations in the momentum equations IF ( momStepping ) THEN CALL CALC_MOM_RHS( I bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown, - I xA,yA,uTrans,vTrans,wTrans,wVel,maskC, - I pH, + I xA,yA,uTrans,vTrans,rTrans,rVel,maskC, + I phiHyd,KappaRU,KappaRV, U aTerm,xTerm,cTerm,mTerm,pTerm, U fZon, fMer, fVerU, fVerV, - I myThid) + I myTime, myThid) ENDIF - C-- Calculate active tracer tendencies IF ( tempStepping ) THEN CALL CALC_GT( I bi,bj,iMin,iMax,jMin,jMax, k,kM1,kUp,kDown, - I xA,yA,uTrans,vTrans,wTrans,maskUp,maskC, - I K13,K23,KappaZT,KapGM, + I xA,yA,uTrans,vTrans,rTrans,maskUp,maskC, + I K13,K23,KappaRT,KapGM, U aTerm,xTerm,fZon,fMer,fVerT, - I myThid) + I myTime, myThid) ENDIF IF ( saltStepping ) THEN CALL CALC_GS( I bi,bj,iMin,iMax,jMin,jMax, k,kM1,kUp,kDown, - I xA,yA,uTrans,vTrans,wTrans,maskUp,maskC, - I K13,K23,KappaZS,KapGM, + I xA,yA,uTrans,vTrans,rTrans,maskUp,maskC, + I K13,K23,KappaRS,KapGM, U aTerm,xTerm,fZon,fMer,fVerS, - I myThid) + I myTime, myThid) ENDIF - C-- Prediction step (step forward all model variables) CALL TIMESTEP( I bi,bj,iMin,iMax,jMin,jMax,K, I myThid) - +#ifdef ALLOW_OBCS +C-- Apply open boundary conditions + IF (openBoundaries) CALL APPLY_OBCS2( bi, bj, K, myThid ) +#endif +C-- Freeze water + IF (allowFreezing) + & CALL FREEZE( bi, bj, iMin, iMax, jMin, jMax, K, myThid ) C-- Diagnose barotropic divergence of predicted fields - CALL DIV_G( + CALL CALC_DIV_GHAT( I bi,bj,iMin,iMax,jMin,jMax,K, I xA,yA, I myThid) C-- Cumulative diagnostic calculations (ie. time-averaging) -#ifdef ALLOW_DIAGNOSTICS +#ifdef INCLUDE_DIAGNOSTICS_INTERFACE_CODE IF (taveFreq.GT.0.) THEN CALL DO_TIME_AVERAGES( I myTime, myIter, bi, bj, K, kUp, kDown, - I K13, K23, wVel, + I K13, K23, rVel, KapGM, ConvectCount, I myThid ) ENDIF #endif + ENDDO ! K C-- Implicit diffusion IF (implicitDiffusion) THEN - CALL IMPLDIFF( bi, bj, iMin, iMax, jMin, jMax, - I KappaZT,KappaZS, - I myThid ) - ENDIF + IF (tempStepping) CALL IMPLDIFF( + I bi, bj, iMin, iMax, jMin, jMax, + I deltaTtracer, KappaRT,recip_HFacC, + U gTNm1, + I myThid ) + IF (saltStepping) CALL IMPLDIFF( + I bi, bj, iMin, iMax, jMin, jMax, + I deltaTtracer, KappaRS,recip_HFacC, + U gSNm1, + I myThid ) + ENDIF ! implicitDiffusion +C-- Implicit viscosity + IF (implicitViscosity) THEN + IF (momStepping) THEN + CALL IMPLDIFF( + I bi, bj, iMin, iMax, jMin, jMax, + I deltaTmom, KappaRU,recip_HFacW, + U gUNm1, + I myThid ) + CALL IMPLDIFF( + I bi, bj, iMin, iMax, jMin, jMax, + I deltaTmom, KappaRV,recip_HFacS, + U gVNm1, + I myThid ) +#ifdef INCLUDE_CD_CODE + CALL IMPLDIFF( + I bi, bj, iMin, iMax, jMin, jMax, + I deltaTmom, KappaRU,recip_HFacW, + U vVelD, + I myThid ) + CALL IMPLDIFF( + I bi, bj, iMin, iMax, jMin, jMax, + I deltaTmom, KappaRV,recip_HFacS, + U uVelD, + I myThid ) +#endif + ENDIF ! momStepping + ENDIF ! implicitViscosity ENDDO ENDDO @@ -408,12 +568,12 @@ C & maxval(uVel(1:sNx,1:sNy,1,:,:),mask=uVel(1:sNx,1:sNy,1,:,:).NE.0.) C write(0,*) 'dynamics: V ',minval(vVel(1:sNx,1:sNy,1,:,:),mask=vVel(1:sNx,1:sNy,1,:,:).NE.0.), C & maxval(vVel(1:sNx,1:sNy,1,:,:),mask=vVel(1:sNx,1:sNy,1,:,:).NE.0.) -C write(0,*) 'dynamics: wVel(1) ', -C & minval(wVel(1:sNx,1:sNy,1),mask=wVel(1:sNx,1:sNy,1).NE.0.), -C & maxval(wVel(1:sNx,1:sNy,1),mask=wVel(1:sNx,1:sNy,1).NE.0.) -C write(0,*) 'dynamics: wVel(2) ', -C & minval(wVel(1:sNx,1:sNy,2),mask=wVel(1:sNx,1:sNy,2).NE.0.), -C & maxval(wVel(1:sNx,1:sNy,2),mask=wVel(1:sNx,1:sNy,2).NE.0.) +C write(0,*) 'dynamics: rVel(1) ', +C & minval(rVel(1:sNx,1:sNy,1),mask=rVel(1:sNx,1:sNy,1).NE.0.), +C & maxval(rVel(1:sNx,1:sNy,1),mask=rVel(1:sNx,1:sNy,1).NE.0.) +C write(0,*) 'dynamics: rVel(2) ', +C & minval(rVel(1:sNx,1:sNy,2),mask=rVel(1:sNx,1:sNy,2).NE.0.), +C & maxval(rVel(1:sNx,1:sNy,2),mask=rVel(1:sNx,1:sNy,2).NE.0.) cblk write(0,*) 'dynamics: K13',minval(K13(1:sNx,1:sNy,:)), cblk & maxval(K13(1:sNx,1:sNy,:)) cblk write(0,*) 'dynamics: K23',minval(K23(1:sNx,1:sNy,:)), @@ -428,8 +588,19 @@ C & maxval(gS(1:sNx,1:sNy,:,:,:)) C write(0,*) 'dynamics: S ',minval(salt(1:sNx,1:sNy,:,:,:)), C & maxval(salt(1:sNx,1:sNy,:,:,:)) -C write(0,*) 'dynamics: pH ',minval(pH/(Gravity*Rhonil),mask=ph.NE.0.), -C & maxval(pH/(Gravity*Rhonil)) +C write(0,*) 'dynamics: phiHyd ',minval(phiHyd/(Gravity*Rhonil),mask=phiHyd.NE.0.), +C & maxval(phiHyd/(Gravity*Rhonil)) +C CALL PLOT_FIELD_XYZRL( gU, ' GU exiting dyanmics ' , +C &Nr, 1, myThid ) +C CALL PLOT_FIELD_XYZRL( gV, ' GV exiting dyanmics ' , +C &Nr, 1, myThid ) +C CALL PLOT_FIELD_XYZRL( gS, ' GS exiting dyanmics ' , +C &Nr, 1, myThid ) +C CALL PLOT_FIELD_XYZRL( gT, ' GT exiting dyanmics ' , +C &Nr, 1, myThid ) +C CALL PLOT_FIELD_XYZRL( phiHyd, ' phiHyd exiting dyanmics ' , +C &Nr, 1, myThid ) + RETURN END