--- MITgcm/model/src/dynamics.F 2003/11/04 18:40:57 1.104 +++ MITgcm/model/src/dynamics.F 2005/07/30 22:09:38 1.121 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.104 2003/11/04 18:40:57 edhill Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.121 2005/07/30 22:09:38 jmc Exp $ C $Name: $ #include "PACKAGES_CONFIG.h" @@ -77,9 +77,6 @@ #include "CD_CODE_VARS.h" #endif #include "GRID.h" -#ifdef ALLOW_PASSIVE_TRACER -#include "TR1.h" -#endif #ifdef ALLOW_AUTODIFF_TAMC # include "tamc.h" # include "tamc_keys.h" @@ -111,7 +108,6 @@ C | C |-- OBCS_APPLY_UV C | -C |-- CALL TIMEAVE_CUMUL_1T C |-- CALL DEBUG_STATS_RL C !INPUT/OUTPUT PARAMETERS: @@ -125,10 +121,10 @@ C !LOCAL VARIABLES: C == Local variables -C fVer[STUV] o fVer: Vertical flux term - note fVer -C is "pipelined" in the vertical -C so we need an fVer for each -C variable. +C fVer[UV] o fVer: Vertical flux term - note fVer +C is "pipelined" in the vertical +C so we need an fVer for each +C variable. C phiHydC :: hydrostatic potential anomaly at cell center C In z coords phiHyd is the hydrostatic potential C (=pressure/rho0) anomaly @@ -137,6 +133,8 @@ C dPhiHydX,Y :: Gradient (X & Y directions) of hydrostatic potential anom. C phiSurfX, :: gradient of Surface potential (Pressure/rho, ocean) C phiSurfY or geopotential (atmos) in X and Y direction +C guDissip :: dissipation tendency (all explicit terms), u component +C gvDissip :: dissipation tendency (all explicit terms), v component C iMin, iMax - Ranges and sub-block indices on which calculations C jMin, jMax are applied. C bi, bj @@ -151,6 +149,8 @@ _RL dPhiHydY(1-Olx:sNx+Olx,1-Oly:sNy+Oly) _RL phiSurfX(1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL phiSurfY(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL guDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL gvDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL KappaRU (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr) _RL KappaRV (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr) @@ -160,8 +160,10 @@ INTEGER i, j INTEGER k, km1, kp1, kup, kDown - LOGICAL DIFFERENT_MULTIPLE - EXTERNAL DIFFERENT_MULTIPLE +#ifdef ALLOW_DIAGNOSTICS + _RL tmpFac +#endif /* ALLOW_DIAGNOSTICS */ + C--- The algorithm... C @@ -259,10 +261,7 @@ #ifdef ALLOW_AUTODIFF_TAMC cph( c-- need some re-initialisation here to break dependencies -c-- totphihyd is assumed zero from ini_pressure, i.e. -c-- avoiding iterate pressure p = integral of (g*rho(p)*dz) cph) - totPhiHyd(i,j,k,bi,bj) = 0. _d 0 gu(i,j,k,bi,bj) = 0. _d 0 gv(i,j,k,bi,bj) = 0. _d 0 #endif @@ -281,6 +280,8 @@ dPhiHydY(i,j) = 0. _d 0 phiSurfX(i,j) = 0. _d 0 phiSurfY(i,j) = 0. _d 0 + guDissip(i,j) = 0. _d 0 + gvDissip(i,j) = 0. _d 0 ENDDO ENDDO @@ -348,10 +349,6 @@ c CADJ STORE totphihyd (:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gt (:,:,k,bi,bj) -CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gs (:,:,k,bi,bj) -CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte CADJ STORE theta (:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte CADJ STORE salt (:,:,k,bi,bj) @@ -360,43 +357,36 @@ C-- Integrate hydrostatic balance for phiHyd with BC of C phiHyd(z=0)=0 -C distinguishe between Stagger and Non Stagger time stepping - IF (staggerTimeStep) THEN - CALL CALC_PHI_HYD( - I bi,bj,iMin,iMax,jMin,jMax,k, - I gT, gS, - U phiHydF, - O phiHydC, dPhiHydX, dPhiHydY, - I myTime, myIter, myThid ) - ELSE - CALL CALC_PHI_HYD( + CALL CALC_PHI_HYD( I bi,bj,iMin,iMax,jMin,jMax,k, I theta, salt, U phiHydF, O phiHydC, dPhiHydX, dPhiHydY, I myTime, myIter, myThid ) - ENDIF C-- Calculate accelerations in the momentum equations (gU, gV, ...) C and step forward storing the result in gU, gV, etc... IF ( momStepping ) THEN -#ifndef DISABLE_MOM_FLUXFORM +#ifdef ALLOW_MOM_FLUXFORM IF (.NOT. vectorInvariantMomentum) CALL MOM_FLUXFORM( I bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown, - I dPhiHydX,dPhiHydY,KappaRU,KappaRV, + I KappaRU, KappaRV, U fVerU, fVerV, + O guDissip, gvDissip, I myTime, myIter, myThid) #endif -#ifndef DISABLE_MOM_VECINV +#ifdef ALLOW_MOM_VECINV IF (vectorInvariantMomentum) CALL MOM_VECINV( I bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown, - I dPhiHydX,dPhiHydY,KappaRU,KappaRV, + I KappaRU, KappaRV, U fVerU, fVerV, + O guDissip, gvDissip, I myTime, myIter, myThid) #endif CALL TIMESTEP( I bi,bj,iMin,iMax,jMin,jMax,k, I dPhiHydX,dPhiHydY, phiSurfX, phiSurfY, + I guDissip, gvDissip, I myTime, myIter, myThid) #ifdef ALLOW_OBCS @@ -412,15 +402,24 @@ C-- end of dynamics k loop (1:Nr) ENDDO -C-- Implicit viscosity - IF (implicitViscosity.AND.momStepping) THEN +C-- Implicit Vertical advection & viscosity +#ifdef INCLUDE_IMPLVERTADV_CODE + IF ( momImplVertAdv ) THEN + CALL MOM_U_IMPLICIT_R( kappaRU, + I bi, bj, myTime, myIter, myThid ) + CALL MOM_V_IMPLICIT_R( kappaRV, + I bi, bj, myTime, myIter, myThid ) + ELSEIF ( implicitViscosity ) THEN +#else /* INCLUDE_IMPLVERTADV_CODE */ + IF ( implicitViscosity ) THEN +#endif /* INCLUDE_IMPLVERTADV_CODE */ #ifdef ALLOW_AUTODIFF_TAMC CADJ STORE KappaRU(:,:,:) = comlev1_bibj , key=idynkey, byte=isbyte CADJ STORE gU(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I deltaTmom, KappaRU,recip_HFacW, + I 0, KappaRU,recip_HFacW, U gU, I myThid ) #ifdef ALLOW_AUTODIFF_TAMC @@ -429,26 +428,28 @@ #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I deltaTmom, KappaRV,recip_HFacS, + I 0, KappaRV,recip_HFacS, U gV, I myThid ) + ENDIF #ifdef ALLOW_OBCS C-- Apply open boundary conditions - IF (useOBCS) THEN + IF ( useOBCS .AND.(implicitViscosity.OR.momImplVertAdv) ) THEN DO K=1,Nr CALL OBCS_APPLY_UV( bi, bj, k, gU, gV, myThid ) ENDDO - END IF + ENDIF #endif /* ALLOW_OBCS */ #ifdef ALLOW_CD_CODE + IF (implicitViscosity.AND.useCDscheme) THEN #ifdef ALLOW_AUTODIFF_TAMC CADJ STORE vVelD(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I deltaTmom, KappaRU,recip_HFacW, + I 0, KappaRU,recip_HFacW, U vVelD, I myThid ) #ifdef ALLOW_AUTODIFF_TAMC @@ -456,16 +457,24 @@ #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I deltaTmom, KappaRV,recip_HFacS, + I 0, KappaRV,recip_HFacS, U uVelD, I myThid ) -#endif /* ALLOW_CD_CODE */ -C-- End If implicitViscosity.AND.momStepping ENDIF +#endif /* ALLOW_CD_CODE */ +C-- End implicit Vertical advection & viscosity ENDDO ENDDO +#ifdef ALLOW_OBCS + IF (useOBCS) THEN + CALL OBCS_PRESCRIBE_EXCHANGES(myThid) + ENDIF +#endif + +C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----| + Cml( C In order to compare the variance of phiHydLow of a p/z-coordinate C run with etaH of a z/p-coordinate run the drift of phiHydLow @@ -474,6 +483,22 @@ C & 'phiHydLow', myThid ) Cml) +#ifdef ALLOW_DIAGNOSTICS + IF ( usediagnostics ) THEN + + CALL DIAGNOSTICS_FILL(totPhihyd,'PHIHYD ',0,Nr,0,1,1,myThid) + CALL DIAGNOSTICS_FILL(phiHydLow,'PHIBOT ',0, 1,0,1,1,myThid) + + tmpFac = 1. _d 0 + CALL DIAGNOSTICS_SCALE_FILL(totPhihyd,tmpFac,2, + & 'PHIHYDSQ',0,Nr,0,1,1,myThid) + + CALL DIAGNOSTICS_SCALE_FILL(phiHydLow,tmpFac,2, + & 'PHIBOTSQ',0, 1,0,1,1,myThid) + + ENDIF +#endif /* ALLOW_DIAGNOSTICS */ + #ifdef ALLOW_DEBUG If ( debugLevel .GE. debLevB ) THEN CALL DEBUG_STATS_RL(1,EtaN,'EtaN (DYNAMICS)',myThid) @@ -482,14 +507,16 @@ CALL DEBUG_STATS_RL(Nr,wVel,'Wvel (DYNAMICS)',myThid) CALL DEBUG_STATS_RL(Nr,theta,'Theta (DYNAMICS)',myThid) CALL DEBUG_STATS_RL(Nr,salt,'Salt (DYNAMICS)',myThid) - CALL DEBUG_STATS_RL(Nr,Gu,'Gu (DYNAMICS)',myThid) - CALL DEBUG_STATS_RL(Nr,Gv,'Gv (DYNAMICS)',myThid) - CALL DEBUG_STATS_RL(Nr,Gt,'Gt (DYNAMICS)',myThid) - CALL DEBUG_STATS_RL(Nr,Gs,'Gs (DYNAMICS)',myThid) - CALL DEBUG_STATS_RL(Nr,GuNm1,'GuNm1 (DYNAMICS)',myThid) - CALL DEBUG_STATS_RL(Nr,GvNm1,'GvNm1 (DYNAMICS)',myThid) - CALL DEBUG_STATS_RL(Nr,GtNm1,'GtNm1 (DYNAMICS)',myThid) - CALL DEBUG_STATS_RL(Nr,GsNm1,'GsNm1 (DYNAMICS)',myThid) + CALL DEBUG_STATS_RL(Nr,gU,'Gu (DYNAMICS)',myThid) + CALL DEBUG_STATS_RL(Nr,gV,'Gv (DYNAMICS)',myThid) + CALL DEBUG_STATS_RL(Nr,gT,'Gt (DYNAMICS)',myThid) + CALL DEBUG_STATS_RL(Nr,gS,'Gs (DYNAMICS)',myThid) +#ifndef ALLOW_ADAMSBASHFORTH_3 + CALL DEBUG_STATS_RL(Nr,guNm1,'GuNm1 (DYNAMICS)',myThid) + CALL DEBUG_STATS_RL(Nr,gvNm1,'GvNm1 (DYNAMICS)',myThid) + CALL DEBUG_STATS_RL(Nr,gtNm1,'GtNm1 (DYNAMICS)',myThid) + CALL DEBUG_STATS_RL(Nr,gsNm1,'GsNm1 (DYNAMICS)',myThid) +#endif ENDIF #endif