--- MITgcm/model/src/dynamics.F 2003/03/07 23:10:20 1.83.4.5 +++ MITgcm/model/src/dynamics.F 2013/09/15 14:28:31 1.166 @@ -1,7 +1,13 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.83.4.5 2003/03/07 23:10:20 heimbach Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.166 2013/09/15 14:28:31 m_bates Exp $ C $Name: $ +#include "PACKAGES_CONFIG.h" #include "CPP_OPTIONS.h" +#ifdef ALLOW_OBCS +# include "OBCS_OPTIONS.h" +#endif + +#undef DYNAMICS_GUGV_EXCH_CHECK CBOP C !ROUTINE: DYNAMICS @@ -9,17 +15,17 @@ SUBROUTINE DYNAMICS(myTime, myIter, myThid) C !DESCRIPTION: \bv C *==========================================================* -C | SUBROUTINE DYNAMICS -C | o Controlling routine for the explicit part of the model -C | dynamics. +C | SUBROUTINE DYNAMICS +C | o Controlling routine for the explicit part of the model +C | dynamics. C *==========================================================* -C | This routine evaluates the "dynamics" terms for each -C | block of ocean in turn. Because the blocks of ocean have -C | overlap regions they are independent of one another. -C | If terms involving lateral integrals are needed in this -C | routine care will be needed. Similarly finite-difference -C | operations with stencils wider than the overlap region -C | require special consideration. +C | This routine evaluates the "dynamics" terms for each +C | block of ocean in turn. Because the blocks of ocean have +C | overlap regions they are independent of one another. +C | If terms involving lateral integrals are needed in this +C | routine care will be needed. Similarly finite-difference +C | operations with stencils wider than the overlap region +C | require special consideration. C | The algorithm... C | C | "Correction Step" @@ -29,6 +35,7 @@ C | with the free-surface evolution or the rigid-lid: C | U[n] = U* + dt x d/dx P C | V[n] = V* + dt x d/dy P +C | W[n] = W* + dt x d/dz P (NH mode) C | C | "Calculation of Gs" C | =================== @@ -71,10 +78,10 @@ #include "SIZE.h" #include "EEPARAMS.h" #include "PARAMS.h" -#include "DYNVARS.h" #include "GRID.h" -#ifdef ALLOW_PASSIVE_TRACER -#include "TR1.h" +#include "DYNVARS.h" +#ifdef ALLOW_CD_CODE +# include "CD_CODE_VARS.h" #endif #ifdef ALLOW_AUTODIFF_TAMC # include "tamc.h" @@ -84,47 +91,74 @@ # ifdef ALLOW_KPP # include "KPP.h" # endif +# ifdef ALLOW_PTRACERS +# include "PTRACERS_SIZE.h" +# include "PTRACERS_FIELDS.h" +# endif +# ifdef ALLOW_OBCS +# include "OBCS_PARAMS.h" +# include "OBCS_FIELDS.h" +# ifdef ALLOW_PTRACERS +# include "OBCS_PTRACERS.h" +# endif +# endif +# ifdef ALLOW_MOM_FLUXFORM +# include "MOM_FLUXFORM.h" +# endif #endif /* ALLOW_AUTODIFF_TAMC */ C !CALLING SEQUENCE: C DYNAMICS() C | +C |-- CALC_EP_FORCING +C | C |-- CALC_GRAD_PHI_SURF C | C |-- CALC_VISCOSITY C | -C |-- CALC_PHI_HYD +C |-- CALC_EDDY_STRESS C | -C |-- MOM_FLUXFORM +C |-- CALC_PHI_HYD C | -C |-- MOM_VECINV +C |-- MOM_FLUXFORM C | -C |-- TIMESTEP +C |-- MOM_VECINV C | -C |-- OBCS_APPLY_UV +C |-- TIMESTEP C | -C |-- IMPLDIFF +C |-- MOM_U_IMPLICIT_R +C |-- MOM_V_IMPLICIT_R +C | +C |-- IMPLDIFF C | C |-- OBCS_APPLY_UV C | -C |-- CALL TIMEAVE_CUMUL_1T -C |-- CALL DEBUG_STATS_RL +C |-- CALC_GW +C | +C |-- DIAGNOSTICS_FILL +C |-- DEBUG_STATS_RL C !INPUT/OUTPUT PARAMETERS: C == Routine arguments == -C myTime - Current time in simulation -C myIter - Current iteration number in simulation -C myThid - Thread number for this instance of the routine. +C myTime :: Current time in simulation +C myIter :: Current iteration number in simulation +C myThid :: Thread number for this instance of the routine. _RL myTime INTEGER myIter INTEGER myThid +C !FUNCTIONS: +#ifdef ALLOW_DIAGNOSTICS + LOGICAL DIAGNOSTICS_IS_ON + EXTERNAL DIAGNOSTICS_IS_ON +#endif + 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 @@ -133,32 +167,41 @@ 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 iMin, iMax - Ranges and sub-block indices on which calculations -C jMin, jMax are applied. -C bi, bj -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. +C guDissip :: dissipation tendency (all explicit terms), u component +C gvDissip :: dissipation tendency (all explicit terms), v component +C KappaRU :: vertical viscosity for velocity U-component +C KappaRV :: vertical viscosity for velocity V-component +C iMin, iMax :: Ranges and sub-block indices on which calculations +C jMin, jMax are applied. +C bi, bj :: tile indices +C k :: current level index +C km1, kp1 :: index of level above (k-1) and below (k+1) +C kUp, kDown :: Index for interface above and below. kUp and kDown are +C are switched with k to be the appropriate index into fVerU,V _RL fVerU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) _RL fVerV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) _RL phiHydF (1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL phiHydC (1-OLx:sNx+OLx,1-OLy:sNy+OLy) - _RL dPhiHydX(1-Olx:sNx+Olx,1-Oly:sNy+Oly) - _RL dPhiHydY(1-Olx:sNx+Olx,1-Oly:sNy+Oly) + _RL dPhiHydX(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _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 KappaRU (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr) - _RL KappaRV (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr) + _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) INTEGER iMin, iMax INTEGER jMin, jMax INTEGER bi, bj INTEGER i, j - INTEGER k, km1, kp1, kup, kDown + INTEGER k, km1, kp1, kUp, kDown + +#ifdef ALLOW_DIAGNOSTICS + LOGICAL dPhiHydDiagIsOn + _RL tmpFac +#endif /* ALLOW_DIAGNOSTICS */ - LOGICAL DIFFERENT_MULTIPLE - EXTERNAL DIFFERENT_MULTIPLE - C--- The algorithm... C C "Correction Step" @@ -204,25 +247,27 @@ C--- CEOP -C-- Set up work arrays with valid (i.e. not NaN) values -C These inital values do not alter the numerical results. They -C just ensure that all memory references are to valid floating -C point numbers. This prevents spurious hardware signals due to -C uninitialised but inert locations. - DO j=1-OLy,sNy+OLy - DO i=1-OLx,sNx+OLx - phiSurfX(i,j) = 0. _d 0 - phiSurfY(i,j) = 0. _d 0 - ENDDO - ENDDO +#ifdef ALLOW_DEBUG + IF (debugMode) CALL DEBUG_ENTER( 'DYNAMICS', myThid ) +#endif + +#ifdef ALLOW_DIAGNOSTICS + dPhiHydDiagIsOn = .FALSE. + IF ( useDiagnostics ) + & dPhiHydDiagIsOn = DIAGNOSTICS_IS_ON( 'Um_dPHdx', myThid ) + & .OR. DIAGNOSTICS_IS_ON( 'Vm_dPHdy', myThid ) +#endif -C-- Call to routine for calculation of -C Eliassen-Palm-flux-forced U-tendency, -C if desired: +C-- Call to routine for calculation of Eliassen-Palm-flux-forced +C U-tendency, if desired: #ifdef INCLUDE_EP_FORCING_CODE CALL CALC_EP_FORCING(myThid) #endif +#ifdef ALLOW_AUTODIFF_MONITOR_DIAG + CALL DUMMY_IN_DYNAMICS( myTime, myIter, myThid ) +#endif + #ifdef ALLOW_AUTODIFF_TAMC C-- HPF directive to help TAMC CHPF$ INDEPENDENT @@ -253,25 +298,53 @@ & + act4*max1*max2*max3 #endif /* ALLOW_AUTODIFF_TAMC */ -C-- Set up work arrays that need valid initial values +C-- Set up work arrays with valid (i.e. not NaN) values +C These initial values do not alter the numerical results. They +C just ensure that all memory references are to valid floating +C point numbers. This prevents spurious hardware signals due to +C uninitialised but inert locations. + +#ifdef ALLOW_AUTODIFF_TAMC DO k=1,Nr DO j=1-OLy,sNy+OLy DO i=1-OLx,sNx+OLx - KappaRU(i,j,k) = 0. _d 0 - KappaRV(i,j,k) = 0. _d 0 +cph( +c-- need some re-initialisation here to break dependencies +cph) + gU(i,j,k,bi,bj) = 0. _d 0 + gV(i,j,k,bi,bj) = 0. _d 0 ENDDO ENDDO ENDDO +#endif /* ALLOW_AUTODIFF_TAMC */ DO j=1-OLy,sNy+OLy DO i=1-OLx,sNx+OLx 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 - phiHydF (i,j) = 0. _d 0 - phiHydC (i,j) = 0. _d 0 + phiHydF (i,j) = 0. _d 0 + phiHydC (i,j) = 0. _d 0 +#ifndef INCLUDE_PHIHYD_CALCULATION_CODE dPhiHydX(i,j) = 0. _d 0 - dPhiHydY(i,j) = 0. _d 0 + dPhiHydY(i,j) = 0. _d 0 +#endif + phiSurfX(i,j) = 0. _d 0 + phiSurfY(i,j) = 0. _d 0 + guDissip(i,j) = 0. _d 0 + gvDissip(i,j) = 0. _d 0 +#ifdef ALLOW_AUTODIFF_TAMC + phiHydLow(i,j,bi,bj) = 0. _d 0 +# if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM) +# ifndef DISABLE_RSTAR_CODE +# ifndef ALLOW_AUTODIFF_OPENAD + dWtransC(i,j,bi,bj) = 0. _d 0 + dWtransU(i,j,bi,bj) = 0. _d 0 + dWtransV(i,j,bi,bj) = 0. _d 0 +# endif +# endif +# endif +#endif ENDDO ENDDO @@ -282,37 +355,74 @@ jMax = sNy+1 #ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE wvel (:,:,:,bi,bj) = -CADJ & comlev1_bibj, key = idynkey, byte = isbyte +CADJ STORE wVel (:,:,:,bi,bj) = +CADJ & comlev1_bibj, key=idynkey, byte=isbyte #endif /* ALLOW_AUTODIFF_TAMC */ -C-- Explicit part of the Surface Potentiel Gradient (add in TIMESTEP) +C-- Explicit part of the Surface Potential Gradient (add in TIMESTEP) C (note: this loop will be replaced by CALL CALC_GRAD_ETA) IF (implicSurfPress.NE.1.) THEN CALL CALC_GRAD_PHI_SURF( I bi,bj,iMin,iMax,jMin,jMax, I etaN, O phiSurfX,phiSurfY, - I myThid ) + I myThid ) ENDIF #ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE uvel (:,:,:,bi,bj) = comlev1_bibj, key=idynkey, byte=isbyte -CADJ STORE vvel (:,:,:,bi,bj) = comlev1_bibj, key=idynkey, byte=isbyte +CADJ STORE uVel (:,:,:,bi,bj) = comlev1_bibj, key=idynkey, byte=isbyte +CADJ STORE vVel (:,:,:,bi,bj) = comlev1_bibj, key=idynkey, byte=isbyte #ifdef ALLOW_KPP -CADJ STORE KPPviscAz (:,:,:,bi,bj) +CADJ STORE KPPviscAz (:,:,:,bi,bj) CADJ & = comlev1_bibj, key=idynkey, byte=isbyte #endif /* ALLOW_KPP */ #endif /* ALLOW_AUTODIFF_TAMC */ -#ifdef INCLUDE_CALC_DIFFUSIVITY_CALL -C-- Calculate the total vertical diffusivity - DO k=1,Nr - CALL CALC_VISCOSITY( - I bi,bj,iMin,iMax,jMin,jMax,k, - O KappaRU,KappaRV, - I myThid) - ENDDO +#if (defined INCLUDE_CALC_DIFFUSIVITY_CALL) && !(defined ALLOW_AUTODIFF) + IF ( .NOT.momViscosity ) THEN +#endif /* INCLUDE_CALC_DIFFUSIVITY_CALL and not ALLOW_AUTODIFF */ + DO k=1,Nr + DO j=1-OLy,sNy+OLy + DO i=1-OLx,sNx+OLx + KappaRU(i,j,k) = 0. _d 0 + KappaRV(i,j,k) = 0. _d 0 + ENDDO + ENDDO + ENDDO +#ifdef INCLUDE_CALC_DIFFUSIVITY_CALL +C-- Calculate the total vertical viscosity +#ifdef ALLOW_AUTODIFF + IF ( momViscosity ) THEN +#else + ELSE +#endif + CALL CALC_VISCOSITY( + I bi,bj, iMin,iMax,jMin,jMax, + O KappaRU, KappaRV, + I myThid ) + ENDIF +#endif /* INCLUDE_CALC_DIFFUSIVITY_CALL */ + +#ifdef ALLOW_AUTODIFF_TAMC +CADJ STORE KappaRU(:,:,:) +CADJ & = comlev1_bibj, key=idynkey, byte=isbyte +CADJ STORE KappaRV(:,:,:) +CADJ & = comlev1_bibj, key=idynkey, byte=isbyte +#endif /* ALLOW_AUTODIFF_TAMC */ + +#ifdef ALLOW_OBCS +C-- For Stevens boundary conditions velocities need to be extrapolated +C (copied) to a narrow strip outside the domain + IF ( useOBCS ) THEN + CALL OBCS_COPY_UV_N( + U uVel(1-OLx,1-OLy,1,bi,bj), + U vVel(1-OLx,1-OLy,1,bi,bj), + I Nr, bi, bj, myThid ) + ENDIF +#endif /* ALLOW_OBCS */ + +#ifdef ALLOW_EDDYPSI + CALL CALC_EDDY_STRESS(bi,bj,myThid) #endif C-- Start of dynamics loop @@ -327,16 +437,75 @@ kup = 1+MOD(k+1,2) kDown= 1+MOD(k,2) -#ifdef ALLOW_AUTODIFF_TAMC +#ifdef ALLOW_AUTODIFF_TAMC kkey = (idynkey-1)*Nr + k -CADJ STORE totphihyd (:,:,k,bi,bj) +c +CADJ STORE totPhiHyd (:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE phiHydLow (:,:,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) +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 +# ifdef NONLIN_FRSURF +cph-test +CADJ STORE phiHydC (:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE phiHydF (:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE guDissip (:,:) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE gvDissip (:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE fVerU (:,:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE fVerV (:,:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE gU(:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE gV(:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +# ifndef ALLOW_ADAMSBASHFORTH_3 +CADJ STORE guNm1(:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE gvNm1(:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +# else +CADJ STORE guNm(:,:,k,bi,bj,1) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE guNm(:,:,k,bi,bj,2) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE gvNm(:,:,k,bi,bj,1) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE gvNm(:,:,k,bi,bj,2) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +# endif +# ifdef ALLOW_CD_CODE +CADJ STORE uNM1(:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE vNM1(:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE uVelD(:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE vVelD(:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +# endif +# endif +# ifdef ALLOW_DEPTH_CONTROL +CADJ STORE fVerU (:,:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE fVerV (:,:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +# endif #endif /* ALLOW_AUTODIFF_TAMC */ -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 +C-- Integrate hydrostatic balance for phiHyd with BC of phiHyd(z=0)=0 + IF ( implicitIntGravWave ) THEN CALL CALC_PHI_HYD( I bi,bj,iMin,iMax,jMin,jMax,k, I gT, gS, @@ -351,88 +520,120 @@ O phiHydC, dPhiHydX, dPhiHydY, I myTime, myIter, myThid ) ENDIF +#ifdef ALLOW_DIAGNOSTICS + IF ( dPhiHydDiagIsOn ) THEN + tmpFac = -1. _d 0 + CALL DIAGNOSTICS_SCALE_FILL( dPhiHydX, tmpFac, 1, + & 'Um_dPHdx', k, 1, 2, bi, bj, myThid ) + CALL DIAGNOSTICS_SCALE_FILL( dPhiHydY, tmpFac, 1, + & 'Vm_dPHdy', k, 1, 2, bi, bj, myThid ) + ENDIF +#endif /* ALLOW_DIAGNOSTICS */ C-- Calculate accelerations in the momentum equations (gU, gV, ...) -C and step forward storing the result in gUnm1, gVnm1, etc... +C and step forward storing the result in gU, gV, etc... IF ( momStepping ) THEN -#ifndef DISABLE_MOM_FLUXFORM - IF (.NOT. vectorInvariantMomentum) CALL MOM_FLUXFORM( - I bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown, - I dPhiHydX,dPhiHydY,KappaRU,KappaRV, - U fVerU, fVerV, +#ifdef ALLOW_AUTODIFF_TAMC +# ifdef NONLIN_FRSURF +# if (defined ALLOW_MOM_FLUXFORM) && !(defined DISABLE_RSTAR_CODE) +CADJ STORE dWtransC(:,:,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE dWtransU(:,:,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE dWtransV(:,:,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +# endif +CADJ STORE fVerU(:,:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE fVerV(:,:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +# endif /* NONLIN_FRSURF */ +#endif /* ALLOW_AUTODIFF_TAMC */ + IF (.NOT. vectorInvariantMomentum) THEN +#ifdef ALLOW_MOM_FLUXFORM + CALL MOM_FLUXFORM( + I bi,bj,k,iMin,iMax,jMin,jMax, + I KappaRU, KappaRV, + U fVerU(1-OLx,1-OLy,kUp), fVerV(1-OLx,1-OLy,kUp), + O fVerU(1-OLx,1-OLy,kDown), fVerV(1-OLx,1-OLy,kDown), + O guDissip, gvDissip, I myTime, myIter, myThid) #endif -#ifndef DISABLE_MOM_VECINV - IF (vectorInvariantMomentum) CALL MOM_VECINV( - I bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown, - I dPhiHydX,dPhiHydY,KappaRU,KappaRV, - U fVerU, fVerV, + ELSE +#ifdef ALLOW_MOM_VECINV + CALL MOM_VECINV( + I bi,bj,k,iMin,iMax,jMin,jMax, + I KappaRU, KappaRV, + I fVerU(1-OLx,1-OLy,kUp), fVerV(1-OLx,1-OLy,kUp), + O fVerU(1-OLx,1-OLy,kDown), fVerV(1-OLx,1-OLy,kDown), + O guDissip, gvDissip, I myTime, myIter, myThid) #endif + ENDIF + CALL TIMESTEP( I bi,bj,iMin,iMax,jMin,jMax,k, I dPhiHydX,dPhiHydY, phiSurfX, phiSurfY, - I myIter, myThid) - -#ifdef ALLOW_OBCS -C-- Apply open boundary conditions - IF (useOBCS) THEN - CALL OBCS_APPLY_UV( bi, bj, k, gUnm1, gVnm1, myThid ) - END IF -#endif /* ALLOW_OBCS */ + I guDissip, gvDissip, + I myTime, myIter, myThid) -#ifdef ALLOW_AUTODIFF_TAMC -#ifdef INCLUDE_CD_CODE - ELSE - DO j=1-OLy,sNy+OLy - DO i=1-OLx,sNx+OLx - guCD(i,j,k,bi,bj) = 0.0 - gvCD(i,j,k,bi,bj) = 0.0 - END DO - END DO -#endif /* INCLUDE_CD_CODE */ -#endif /* ALLOW_AUTODIFF_TAMC */ ENDIF - C-- end of dynamics k loop (1:Nr) ENDDO -C-- Implicit viscosity - IF (implicitViscosity.AND.momStepping) THEN +C-- Implicit Vertical advection & viscosity +#if (defined (INCLUDE_IMPLVERTADV_CODE) && \ + defined (ALLOW_MOM_COMMON) && !(defined ALLOW_AUTODIFF_TAMC)) + 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 gUNm1(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte +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, - U gUNm1, + I -1, KappaRU, recip_hFacW(1-OLx,1-OLy,1,bi,bj), + U gU, I myThid ) #ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE gVNm1(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte +CADJ STORE KappaRV(:,:,:) = comlev1_bibj , key=idynkey, byte=isbyte +CADJ STORE gV(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I deltaTmom, KappaRV,recip_HFacS, - U gVNm1, + I -2, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj), + U gV, I myThid ) + ENDIF -#ifdef ALLOW_OBCS +#ifdef ALLOW_OBCS C-- Apply open boundary conditions - IF (useOBCS) THEN - DO K=1,Nr - CALL OBCS_APPLY_UV( bi, bj, k, gUnm1, gVnm1, myThid ) - ENDDO - END IF -#endif /* ALLOW_OBCS */ + IF ( useOBCS ) THEN +C-- but first save intermediate velocities to be used in the +C next time step for the Stevens boundary conditions + CALL OBCS_SAVE_UV_N( + I bi, bj, iMin, iMax, jMin, jMax, 0, + I gU, gV, myThid ) + CALL OBCS_APPLY_UV( bi, bj, 0, gU, gV, myThid ) + ENDIF +#endif /* ALLOW_OBCS */ -#ifdef INCLUDE_CD_CODE +#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(1-OLx,1-OLy,1,bi,bj), U vVelD, I myThid ) #ifdef ALLOW_AUTODIFF_TAMC @@ -440,42 +641,101 @@ #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I deltaTmom, KappaRV,recip_HFacS, + I 0, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj), U uVelD, I myThid ) -#endif /* INCLUDE_CD_CODE */ -C-- End If implicitViscosity.AND.momStepping ENDIF - +#endif /* ALLOW_CD_CODE */ +C-- End implicit Vertical advection & viscosity + +C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----| + +#ifdef ALLOW_NONHYDROSTATIC +C-- Step forward W field in N-H algorithm + IF ( nonHydrostatic ) THEN +#ifdef ALLOW_DEBUG + IF (debugMode) CALL DEBUG_CALL('CALC_GW', myThid ) +#endif + CALL TIMER_START('CALC_GW [DYNAMICS]',myThid) + CALL CALC_GW( + I bi,bj, KappaRU, KappaRV, + I myTime, myIter, myThid ) + ENDIF + IF ( nonHydrostatic.OR.implicitIntGravWave ) + & CALL TIMESTEP_WVEL( bi,bj, myTime, myIter, myThid ) + IF ( nonHydrostatic ) + & CALL TIMER_STOP ('CALC_GW [DYNAMICS]',myThid) +#endif + +C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----| + +C- end of bi,bj loops ENDDO ENDDO +#ifdef ALLOW_OBCS + IF (useOBCS) THEN + CALL OBCS_EXCHANGES( myThid ) + ENDIF +#endif + 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 C has to be removed by something like the following subroutine: -C CALL REMOVE_MEAN_RL( 1, phiHydLow, maskH, maskH, rA, drF, -C & 'phiHydLow', myThid ) +C CALL REMOVE_MEAN_RL( 1, phiHydLow, maskInC, maskInC, rA, drF, +C & 'phiHydLow', myTime, myThid ) Cml) -#ifndef DISABLE_DEBUGMODE - If (debugMode) THEN +#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. debLevD ) THEN CALL DEBUG_STATS_RL(1,EtaN,'EtaN (DYNAMICS)',myThid) CALL DEBUG_STATS_RL(Nr,uVel,'Uvel (DYNAMICS)',myThid) CALL DEBUG_STATS_RL(Nr,vVel,'Vvel (DYNAMICS)',myThid) 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 +#ifdef DYNAMICS_GUGV_EXCH_CHECK +C- jmc: For safety checking only: This Exchange here should not change +C the solution. If solution changes, it means something is wrong, +C but it does not mean that it is less wrong with this exchange. + IF ( debugLevel .GE. debLevE ) THEN + CALL EXCH_UV_XYZ_RL(gU,gV,.TRUE.,myThid) + ENDIF +#endif + +#ifdef ALLOW_DEBUG + IF (debugMode) CALL DEBUG_LEAVE( 'DYNAMICS', myThid ) +#endif + RETURN END