--- MITgcm/model/src/dynamics.F 1998/06/01 22:27:14 1.12 +++ MITgcm/model/src/dynamics.F 1998/06/23 02:35:59 1.22 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.12 1998/06/01 22:27:14 adcroft Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.22 1998/06/23 02:35:59 adcroft Exp $ #include "CPP_EEOPTIONS.h" @@ -39,9 +39,11 @@ C == Local variables C xA, yA - Per block temporaries holding face areas C uTrans, vTrans, wTrans - Per block temporaries holding flow transport -C o uTrans: Zonal transport +C wVel 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 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 @@ -68,6 +70,7 @@ _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) @@ -84,6 +87,7 @@ _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) @@ -92,12 +96,14 @@ _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) INTEGER iMin, iMax INTEGER jMin, jMax INTEGER bi, bj INTEGER i, j INTEGER k, kM1, kUp, kDown + LOGICAL BOTTOM_LAYER C--- The algorithm... C @@ -169,8 +175,10 @@ KappaZT(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 ENDDO ENDDO @@ -181,6 +189,8 @@ 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 @@ -193,7 +203,7 @@ K13(i,j,1) = 0. _d 0 K23(i,j,1) = 0. _d 0 K33(i,j,1) = 0. _d 0 - KapGM(i,j) = 0. _d 0 + KapGM(i,j) = GMkbackground ENDDO ENDDO @@ -202,6 +212,9 @@ jMin = 1-OLy+1 jMax = sNy+OLy + K = 1 + BOTTOM_LAYER = K .EQ. Nz + C-- Calculate gradient of surface pressure CALL GRAD_PSURF( I bi,bj,iMin,iMax,jMin,jMax, @@ -210,83 +223,100 @@ C-- Update fields in top level according to tendency terms CALL CORRECTION_STEP( - I bi,bj,iMin,iMax,jMin,jMax,1,pSurfX,pSurfY,myThid) + I bi,bj,iMin,iMax,jMin,jMax,K,pSurfX,pSurfY,myTime,myThid) + + 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) + ENDIF C-- Density of 1st level (below W(1)) reference to level 1 CALL FIND_RHO( - I bi, bj, iMin, iMax, jMin, jMax, 1, 1, eosType, + I bi, bj, iMin, iMax, jMin, jMax, K, K, eosType, O rhoKm1, I myThid ) -C-- Integrate hydrostatic balance for pH with BC of pH(z=0)=0 - CALL CALC_PH( - I bi,bj,iMin,iMax,jMin,jMax,1,rhoKm1,rhoKm1, - U pH, + + IF ( .NOT. BOTTOM_LAYER ) THEN +C-- Check static stability with layer below +C and mix as needed. + CALL FIND_RHO( + I bi, bj, iMin, iMax, jMin, jMax, K+1, K, eosType, + O rhoKp1, I myThid ) - DO J=1-Oly,sNy+Oly - DO I=1-Olx,sNx+Olx - rhoKp1(I,J)=rhoKm1(I,J) - ENDDO - ENDDO + CALL CONVECT( + I bi,bj,iMin,iMax,jMin,jMax,K+1,rhoKm1,rhoKp1, + I myTime,myIter,myThid) +C-- Recompute density after mixing + CALL FIND_RHO( + I bi, bj, iMin, iMax, jMin, jMax, K, K, eosType, + O rhoKm1, + I myThid ) + ENDIF - DO K=2,Nz -C-- Update fields in Kth level according to tendency terms - CALL CORRECTION_STEP( - I bi,bj,iMin,iMax,jMin,jMax,K,pSurfX,pSurfY,myThid) -C-- Density of K-1 level (above W(K)) reference to K-1 level -copt CALL FIND_RHO( -copt I bi, bj, iMin, iMax, jMin, jMax, K-1, K-1, eosType, -copt O rhoKm1, -copt I myThid ) -C rhoKm1=rhoKp1 - DO J=1-Oly,sNy+Oly - DO I=1-Olx,sNx+Olx - rhoKm1(I,J)=rhoKp1(I,J) - ENDDO - ENDDO -C-- Density of K level (below W(K)) reference to K level - CALL FIND_RHO( - I bi, bj, iMin, iMax, jMin, jMax, K, K, eosType, - O rhoKp1, - I myThid ) -C-- Density of K-1 level (above W(K)) reference to K level - CALL FIND_RHO( - I bi, bj, iMin, iMax, jMin, jMax, K-1, K, eosType, - O rhotmp, - I myThid ) -C-- Calculate iso-neutral slopes for the GM/Redi parameterisation - CALL CALC_ISOSLOPES( - I bi, bj, iMin, iMax, jMin, jMax, K, - I rhoKm1, rhoKp1, rhotmp, - O K13, K23, K33, KapGM, - I myThid ) -C-- Calculate static stability and mix where convectively unstable - CALL CONVECT( - I bi,bj,iMin,iMax,jMin,jMax,K,rhoKm1,rhoKp1, - I myTime,myIter,myThid) -C-- Density of K-1 level (above W(K)) reference to K-1 level - CALL FIND_RHO( - I bi, bj, iMin, iMax, jMin, jMax, K-1, K-1, eosType, - O rhoKm1, - I myThid ) -C-- Density of K level (below W(K)) referenced to K level - CALL FIND_RHO( - I bi, bj, iMin, iMax, jMin, jMax, K, K, eosType, - O rhoKp1, - I myThid ) 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,rhoKp1, + I bi,bj,iMin,iMax,jMin,jMax,K,rhoKm1,rhoKm1, U pH, I myThid ) - ENDDO ! K + DO K=2,Nz -C-- Initial boundary condition on barotropic divergence integral - DO j=1-OLy,sNy+OLy - DO i=1-OLx,sNx+OLx - cg2d_b(i,j,bi,bj) = 0. _d 0 + BOTTOM_LAYER = K .EQ. Nz + + 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) + 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) + +C-- Density of K level (below W(K)) reference to K level + 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 + CALL FIND_RHO( + I bi, bj, iMin, iMax, jMin, jMax, K+1, K, eosType, + O rhoKp1, + I myThid ) + CALL CONVECT( + I bi,bj,iMin,iMax,jMin,jMax,K+1,rhoK,rhoKp1, + I myTime,myIter,myThid) +C-- Recompute density after mixing + CALL FIND_RHO( + I bi, bj, iMin, iMax, jMin, jMax, K, K, eosType, + O rhoK, + I myThid ) + 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, + I myThid ) +C-- Calculate iso-neutral slopes for the GM/Redi parameterisation + CALL FIND_RHO( + I bi, bj, iMin, iMax, jMin, jMax, K-1, K, eosType, + O rhoTmp, + I myThid ) + CALL CALC_ISOSLOPES( + I bi, bj, iMin, iMax, jMin, jMax, K, + I rhoKm1, rhoK, rhotmp, + O K13, K23, K33, KapGM, + I myThid ) + DO J=jMin,jMax + DO I=iMin,iMax + rhoKm1(I,J)=rhoK(I,J) + ENDDO ENDDO - ENDDO + + ENDDO ! K DO K = Nz, 1, -1 kM1 =max(1,k-1) ! Points to level above k (=k-1) @@ -300,22 +330,21 @@ 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,maskC,maskUp, + O xA,yA,uTrans,vTrans,wTrans,wVel,maskC,maskUp, I myThid) C-- Calculate the total vertical diffusivity CALL CALC_DIFFUSIVITY( I bi,bj,iMin,iMax,jMin,jMax,K, I maskC,maskUp,KapGM,K33, - O KappaZT, + O KappaZT,KappaZS, I myThid) - 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,maskC, + I xA,yA,uTrans,vTrans,wTrans,wVel,maskC, I pH, U aTerm,xTerm,cTerm,mTerm,pTerm, U fZon, fMer, fVerU, fVerV, @@ -326,17 +355,19 @@ IF ( tempStepping ) THEN CALL CALC_GT( I bi,bj,iMin,iMax,jMin,jMax, k,kM1,kUp,kDown, - I xA,yA,uTrans,vTrans,wTrans,maskUp, + I xA,yA,uTrans,vTrans,wTrans,maskUp,maskC, I K13,K23,KappaZT,KapGM, U aTerm,xTerm,fZon,fMer,fVerT, I myThid) ENDIF -Cdbg CALL CALC_GS( -Cdbg I bi,bj,iMin,iMax,jMin,jMax, k,kM1,kUp,kDown, -Cdbg I xA,yA,uTrans,vTrans,wTrans,maskUp, -Cdbg I K13,K23,K33,KapGM, -Cdbg U aTerm,xTerm,fZon,fMer,fVerS, -Cdbg I myThid) + 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, + U aTerm,xTerm,fZon,fMer,fVerS, + I myThid) + ENDIF C-- Prediction step (step forward all model variables) CALL TIMESTEP( @@ -354,30 +385,41 @@ C-- Implicit diffusion IF (implicitDiffusion) THEN CALL IMPLDIFF( bi, bj, iMin, iMax, jMin, jMax, - I KappaZT, + I KappaZT,KappaZS, I myThid ) ENDIF ENDDO ENDDO - write(0,*) 'dynamics: pS',minval(cg2d_x),maxval(cg2d_x) - write(0,*) 'dynamics: U',minval(uVel(1:sNx,1:sNy,:,:,:)), - & maxval(uVel(1:sNx,1:sNy,:,:,:)) - write(0,*) 'dynamics: V',minval(vVel(1:sNx,1:sNy,:,:,:)), - & maxval(vVel(1:sNx,1:sNy,:,:,:)) - write(0,*) 'dynamics: K13',minval(K13(1:sNx,1:sNy,:)), - & maxval(K13(1:sNx,1:sNy,:)) - write(0,*) 'dynamics: K23',minval(K23(1:sNx,1:sNy,:)), - & maxval(K23(1:sNx,1:sNy,:)) - write(0,*) 'dynamics: K33',minval(K33(1:sNx,1:sNy,:)), - & maxval(K33(1:sNx,1:sNy,:)) - write(0,*) 'dynamics: gT',minval(gT(1:sNx,1:sNy,:,:,:)), - & maxval(gT(1:sNx,1:sNy,:,:,:)) - write(0,*) 'dynamics: T',minval(Theta(1:sNx,1:sNy,:,:,:)), - & maxval(Theta(1:sNx,1:sNy,:,:,:)) - write(0,*) 'dynamics: pH',minval(pH/(Gravity*Rhonil)), - & maxval(pH/(Gravity*Rhonil)) +C write(0,*) 'dynamics: pS ',minval(cg2d_x(1:sNx,1:sNy,:,:)), +C & maxval(cg2d_x(1:sNx,1:sNy,:,:)) +C write(0,*) 'dynamics: U ',minval(uVel(1:sNx,1:sNy,1,:,:),mask=uVel(1:sNx,1:sNy,1,:,:).NE.0.), +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.) +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,:)), +cblk & maxval(K23(1:sNx,1:sNy,:)) +cblk write(0,*) 'dynamics: K33',minval(K33(1:sNx,1:sNy,:)), +cblk & maxval(K33(1:sNx,1:sNy,:)) +C write(0,*) 'dynamics: gT ',minval(gT(1:sNx,1:sNy,:,:,:)), +C & maxval(gT(1:sNx,1:sNy,:,:,:)) +C write(0,*) 'dynamics: T ',minval(Theta(1:sNx,1:sNy,:,:,:)), +C & maxval(Theta(1:sNx,1:sNy,:,:,:)) +C write(0,*) 'dynamics: gS ',minval(gS(1:sNx,1:sNy,:,:,:)), +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)) RETURN END