/[MITgcm]/MITgcm/model/src/dynamics.F

Diff of /MITgcm/model/src/dynamics.F

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.54.2.7 by adcroft,
Tue Jan  9 21:26:07 2001 UTC
+revision 1.172 by jmc,
Thu Aug 14 16:52:40 2014 UTC
 Line 1
  C $Header$
+ C $Name$
+ #include "PACKAGES_CONFIG.h"
  #include "CPP_OPTIONS.h"
+ #ifdef ALLOW_AUTODIFF
+ # include "AUTODIFF_OPTIONS.h"
+ #endif
+ #ifdef ALLOW_MOM_COMMON
+ # include "MOM_COMMON_OPTIONS.h"
+ #endif
+ #ifdef ALLOW_OBCS
+ # include "OBCS_OPTIONS.h"
+ #endif
+ #undef DYNAMICS_GUGV_EXCH_CHECK
+ CBOP
+ C     !ROUTINE: DYNAMICS
+ C     !INTERFACE:
        SUBROUTINE DYNAMICS(myTime, myIter, myThid)
- C     /==========================================================\
+ C     !DESCRIPTION: \bv
- C     | SUBROUTINE DYNAMICS                                      |
+ C     *==========================================================*
- C     | o Controlling routine for the explicit part of the model |
+ C     | SUBROUTINE DYNAMICS
- C     |   dynamics.                                              |
+ C     | o Controlling routine for the explicit part of the model
- C     |==========================================================|
+ C     |   dynamics.
- C     | This routine evaluates the "dynamics" terms for each     |
+ C     *==========================================================*
- C     | block of ocean in turn. Because the blocks of ocean have |
+ C     | This routine evaluates the "dynamics" terms for each
- C     | overlap regions they are independent of one another.     |
+ C     | block of ocean in turn. Because the blocks of ocean have
- C     | If terms involving lateral integrals are needed in this  |
+ C     | overlap regions they are independent of one another.
- C     | routine care will be needed. Similarly finite-difference |
+ C     | If terms involving lateral integrals are needed in this
- C     | operations with stencils wider than the overlap region   |
+ C     | routine care will be needed. Similarly finite-difference
- C     | require special consideration.                           |
+ C     | operations with stencils wider than the overlap region
- C     | Notes                                                    |
+ C     | require special consideration.
- C     | =====                                                    |
+ C     | The algorithm...
- C     | C*P* comments indicating place holders for which code is |
+ C     |
- C     |      presently being developed.                          |
+ C     | "Correction Step"
- C     \==========================================================/
+ C     | =================
+ C     | Here we update the horizontal velocities with the surface
+ C     | pressure such that the resulting flow is either consistent
+ 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     | ===================
+ C     | This is where all the accelerations and tendencies (ie.
+ C     | physics, parameterizations etc...) are calculated
+ C     |   rho = rho ( theta[n], salt[n] )
+ C     |   b   = b(rho, theta)
+ C     |   K31 = K31 ( rho )
+ C     |   Gu[n] = Gu( u[n], v[n], wVel, b, ... )
+ C     |   Gv[n] = Gv( u[n], v[n], wVel, b, ... )
+ C     |   Gt[n] = Gt( theta[n], u[n], v[n], wVel, K31, ... )
+ C     |   Gs[n] = Gs( salt[n], u[n], v[n], wVel, K31, ... )
+ C     |
+ C     | "Time-stepping" or "Prediction"
+ C     | ================================
+ C     | The models variables are stepped forward with the appropriate
+ C     | time-stepping scheme (currently we use Adams-Bashforth II)
+ C     | - For momentum, the result is always *only* a "prediction"
+ C     | in that the flow may be divergent and will be "corrected"
+ C     | later with a surface pressure gradient.
+ C     | - Normally for tracers the result is the new field at time
+ C     | level [n+1} *BUT* in the case of implicit diffusion the result
+ C     | is also *only* a prediction.
+ C     | - We denote "predictors" with an asterisk (*).
+ C     |   U* = U[n] + dt x ( 3/2 Gu[n] - 1/2 Gu[n-1] )
+ C     |   V* = V[n] + dt x ( 3/2 Gv[n] - 1/2 Gv[n-1] )
+ C     |   theta[n+1] = theta[n] + dt x ( 3/2 Gt[n] - 1/2 atG[n-1] )
+ C     |   salt[n+1] = salt[n] + dt x ( 3/2 Gt[n] - 1/2 atG[n-1] )
+ C     | With implicit diffusion:
+ C     |   theta* = theta[n] + dt x ( 3/2 Gt[n] - 1/2 atG[n-1] )
+ C     |   salt* = salt[n] + dt x ( 3/2 Gt[n] - 1/2 atG[n-1] )
+ C     |   (1 + dt * K * d_zz) theta[n] = theta*
+ C     |   (1 + dt * K * d_zz) salt[n] = salt*
+ C     |
+ C     *==========================================================*
+ C     \ev
+ C     !USES:
        IMPLICIT NONE
  C     == Global variables ===
  #include "SIZE.h"
  #include "EEPARAMS.h"
- #include "CG2D.h"
  #include "PARAMS.h"
- #include "DYNVARS.h"
  #include "GRID.h"
+ #include "DYNVARS.h"
- #ifdef ALLOW_AUTODIFF_TAMC
+ #ifdef ALLOW_MOM_COMMON
+ # include "MOM_VISC.h"
+ #endif
+ #ifdef ALLOW_CD_CODE
+ # include "CD_CODE_VARS.h"
+ #endif
+ #ifdef ALLOW_AUTODIFF
  # include "tamc.h"
  # include "tamc_keys.h"
- #endif /* ALLOW_AUTODIFF_TAMC */
+ # include "FFIELDS.h"
+ # include "EOS.h"
- #ifdef ALLOW_KPP
+ # ifdef ALLOW_KPP
- # include "KPP.h"
+ #  include "KPP.h"
- #endif
+ # 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 */
+ C     !CALLING SEQUENCE:
+ C     DYNAMICS()
+ C      |
+ C      |-- CALC_EP_FORCING
+ C      |
+ C      |-- CALC_GRAD_PHI_SURF
+ C      |
+ C      |-- CALC_VISCOSITY
+ C      |
+ C      |-- MOM_CALC_3D_STRAIN
+ C      |
+ C      |-- CALC_EDDY_STRESS
+ C      |
+ C      |-- CALC_PHI_HYD
+ C      |
+ C      |-- MOM_FLUXFORM
+ C      |
+ C      |-- MOM_VECINV
+ C      |
+ C      |-- MOM_CALC_SMAG_3D
+ C      |-- MOM_UV_SMAG_3D
+ C      |
+ C      |-- TIMESTEP
+ C      |
+ C      |-- MOM_U_IMPLICIT_R
+ C      |-- MOM_V_IMPLICIT_R
+ C      |
+ C      |-- IMPLDIFF
+ C      |
+ C      |-- OBCS_APPLY_UV
+ C      |
+ 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     myTime :: Current time in simulation
- C     myIter - Current iteration number in simulation
+ C     myIter :: Current iteration number in simulation
- C     myThid - Thread number for this instance of the routine.
+ 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     xA, yA                 - Per block temporaries holding face areas
+ C     fVer[UV]               o fVer: Vertical flux term - note fVer
- C     uTrans, vTrans, rTrans - Per block temporaries holding flow
+ C                                    is "pipelined" in the vertical
- C                              transport
+ C                                    so we need an fVer for each
- C     rVel                     o uTrans: Zonal transport
+ C                                    variable.
- C                              o vTrans: Meridional transport
+ C     phiHydC    :: hydrostatic potential anomaly at cell center
- C                              o rTrans: Vertical transport
+ C                   In z coords phiHyd is the hydrostatic potential
- C                              o rVel:   Vertical velocity at upper and
+ C                      (=pressure/rho0) anomaly
- C                                        lower cell faces.
+ C                   In p coords phiHyd is the geopotential height anomaly.
- C     maskC,maskUp             o maskC: land/water mask for tracer cells
+ C     phiHydF    :: hydrostatic potential anomaly at middle between 2 centers
- C                              o maskUp: land/water mask for W points
+ C     dPhiHydX,Y :: Gradient (X & Y directions) of hydrostatic potential anom.
- C     fVer[STUV]               o fVer: Vertical flux term - note fVer
+ C     phiSurfX,  ::  gradient of Surface potential (Pressure/rho, ocean)
- C                                      is "pipelined" in the vertical
+ C     phiSurfY             or geopotential (atmos) in X and Y direction
- C                                      so we need an fVer for each
+ C     guDissip   :: dissipation tendency (all explicit terms), u component
- C                                      variable.
+ C     gvDissip   :: dissipation tendency (all explicit terms), v component
- C     rhoK, rhoKM1   - Density at current level, level above and level
+ C     KappaRU    :: vertical viscosity for velocity U-component
- C                      below.
+ C     KappaRV    :: vertical viscosity for velocity V-component
- C     rhoKP1
+ C     iMin, iMax :: Ranges and sub-block indices on which calculations
- C     buoyK, buoyKM1 - Buoyancy at current level and level above.
+ C     jMin, jMax    are applied.
- C     phiHyd         - Hydrostatic part of the potential phiHydi.
+ C     bi, bj     :: tile indices
- C                      In z coords phiHydiHyd is the hydrostatic
+ C     k          :: current level index
- C                      pressure anomaly
+ C     km1, kp1   :: index of level above (k-1) and below (k+1)
- C                      In p coords phiHydiHyd is the geopotential
+ C     kUp, kDown :: Index for interface above and below. kUp and kDown are
- C                      surface height
+ C                   are switched with k to be the appropriate index into fVerU,V
- C                      anomaly.
- C     etaSurfX,      - Holds surface elevation gradient in X and Y.
- C     etaSurfY
- 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,        - 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 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 phiHydF (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL rhokm1  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+       _RL phiHydC (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL rhokp1  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+       _RL dPhiHydX(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL rhok    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+       _RL dPhiHydY(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL buoyKM1 (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+       _RL phiSurfX(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL buoyK   (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+       _RL phiSurfY(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL rhotmp  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+       _RL guDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL KappaRT (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr)
+       _RL gvDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL KappaRS (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr)
+       _RL KappaRU (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)
-       _RL KappaRV (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr)
+ #ifdef ALLOW_SMAG_3D
-       _RL sigmaX  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
+ C     str11       :: strain component Vxx @ grid-cell center
-       _RL sigmaY  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
+ C     str22       :: strain component Vyy @ grid-cell center
-       _RL sigmaR  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
+ C     str33       :: strain component Vzz @ grid-cell center
+ C     str12       :: strain component Vxy @ grid-cell corner
- C This is currently also used by IVDC and Diagnostics
+ C     str13       :: strain component Vxz @ above uVel
- C #ifdef INCLUDE_CONVECT_CALL
+ C     str23       :: strain component Vyz @ above vVel
-       _RL ConvectCount (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
+ C     viscAh3d_00 :: Smagorinsky viscosity @ grid-cell center
- C #endif
+ C     viscAh3d_12 :: Smagorinsky viscosity @ grid-cell corner
+ C     viscAh3d_13 :: Smagorinsky viscosity @ above uVel
+ C     viscAh3d_23 :: Smagorinsky viscosity @ above vVel
+ C     addDissU    :: zonal momentum tendency from 3-D Smag. viscosity
+ C     addDissV    :: merid momentum tendency from 3-D Smag. viscosity
+       _RL str11(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
+       _RL str22(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
+       _RL str33(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
+       _RL str12(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
+       _RL str13(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
+       _RL str23(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
+       _RL viscAh3d_00(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
+       _RL viscAh3d_12(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
+       _RL viscAh3d_13(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
+       _RL viscAh3d_23(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
+       _RL addDissU(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+       _RL addDissV(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+ #elif ( defined ALLOW_NONHYDROSTATIC )
+       _RL str13(1), str23(1), str33(1)
+       _RL viscAh3d_00(1), viscAh3d_13(1), viscAh3d_23(1)
+ #endif
-       INTEGER iMin, iMax
-       INTEGER jMin, jMax
        INTEGER bi, bj
        INTEGER i, j
-       INTEGER k, km1, kup, kDown
+       INTEGER k, km1, kp1, kUp, kDown
+       INTEGER iMin, iMax
- #ifdef ALLOW_AUTODIFF_TAMC
+       INTEGER jMin, jMax
-       INTEGER    isbyte
+       PARAMETER( iMin = 0 , iMax = sNx+1 )
-       PARAMETER( isbyte = 4 )
+       PARAMETER( jMin = 0 , jMax = sNy+1 )
-       INTEGER act1, act2, act3, act4
+ #ifdef ALLOW_DIAGNOSTICS
-       INTEGER max1, max2, max3
+       LOGICAL dPhiHydDiagIsOn
-       INTEGER iikey, kkey
+       _RL tmpFac
-       INTEGER maximpl
+ #endif /* ALLOW_DIAGNOSTICS */
- #endif /* ALLOW_AUTODIFF_TAMC */
  C---    The algorithm...
  C
-Line 144 
 C       "Calculation of Gs"
+Line 261 
 C       "Calculation of Gs"
  C       ===================
  C       This is where all the accelerations and tendencies (ie.
  C       physics, 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], rVel, b, ... )
+ C         Gu[n] = Gu( u[n], v[n], wVel, b, ... )
- C         Gv[n] = Gv( u[n], v[n], rVel, b, ... )
+ C         Gv[n] = Gv( u[n], v[n], wVel, b, ... )
- C         Gt[n] = Gt( theta[n], u[n], v[n], rVel, K31, ... )
+ C         Gt[n] = Gt( theta[n], u[n], v[n], wVel, K31, ... )
- C         Gs[n] = Gs( salt[n], u[n], v[n], rVel, K31, ... )
+ C         Gs[n] = Gs( salt[n], u[n], v[n], wVel, K31, ... )
  C
  C       "Time-stepping" or "Prediction"
  C       ================================
-Line 174 
 C         salt* = salt[n] + dt x ( 3/2 G
+Line 290 
 C         salt* = salt[n] + dt x ( 3/2 G
  C         (1 + dt * K * d_zz) theta[n] = theta*
  C         (1 + dt * K * d_zz) salt[n] = salt*
  C---
+ CEOP
- #ifdef ALLOW_AUTODIFF_TAMC
+ #ifdef ALLOW_DEBUG
- C--   dummy statement to end declaration part
+       IF (debugMode) CALL DEBUG_ENTER( 'DYNAMICS', myThid )
-       ikey = 1
+ #endif
- #endif /* ALLOW_AUTODIFF_TAMC */
- C--   Set up work arrays with valid (i.e. not NaN) values
+ #ifdef ALLOW_DIAGNOSTICS
- C     These inital values do not alter the numerical results. They
+       dPhiHydDiagIsOn = .FALSE.
- C     just ensure that all memory references are to valid floating
+       IF ( useDiagnostics )
- C     point numbers. This prevents spurious hardware signals due to
+      &  dPhiHydDiagIsOn = DIAGNOSTICS_IS_ON( 'Um_dPHdx', myThid )
- C     uninitialised but inert locations.
+      &               .OR. DIAGNOSTICS_IS_ON( 'Vm_dPHdy', myThid )
-       DO j=1-OLy,sNy+OLy
+ #endif
-        DO i=1-OLx,sNx+OLx
-         xA(i,j)      = 0. _d 0
+ C-- Call to routine for calculation of Eliassen-Palm-flux-forced
-         yA(i,j)      = 0. _d 0
+ C    U-tendency, if desired:
-         uTrans(i,j)  = 0. _d 0
+ #ifdef INCLUDE_EP_FORCING_CODE
-         vTrans(i,j)  = 0. _d 0
+       CALL CALC_EP_FORCING(myThid)
-         DO k=1,Nr
+ #endif
-          phiHyd (i,j,k)  = 0. _d 0
-          KappaRU(i,j,k) = 0. _d 0
-          KappaRV(i,j,k) = 0. _d 0
-          sigmaX(i,j,k) = 0. _d 0
-          sigmaY(i,j,k) = 0. _d 0
-          sigmaR(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
-         buoyKM1(i,j) = 0. _d 0
-         buoyK  (i,j) = 0. _d 0
-         maskC  (i,j) = 0. _d 0
-        ENDDO
-       ENDDO
+ #ifdef ALLOW_AUTODIFF_MONITOR_DIAG
+       CALL DUMMY_IN_DYNAMICS( myTime, myIter, myThid )
+ #endif
  #ifdef ALLOW_AUTODIFF_TAMC
  C--   HPF directive to help TAMC
-Line 219 
 CHPF$ INDEPENDENT
+Line 322 
 CHPF$ INDEPENDENT
  #ifdef ALLOW_AUTODIFF_TAMC
  C--    HPF directive to help TAMC
- CHPF$  INDEPENDENT, NEW (rTrans,rVel,fVerT,fVerS,fVerU,fVerV
+ CHPF$  INDEPENDENT, NEW (fVerU,fVerV
- CHPF$&                  ,phiHyd,utrans,vtrans,maskc,xA,yA
+ CHPF$&                  ,phiHydF
- CHPF$&                  ,KappaRT,KappaRS,KappaRU,KappaRV
+ CHPF$&                  ,KappaRU,KappaRV
  CHPF$&                  )
  #endif /* ALLOW_AUTODIFF_TAMC */
-Line 230 
 CHPF$&                  )
+Line 333 
 CHPF$&                  )
  #ifdef ALLOW_AUTODIFF_TAMC
            act1 = bi - myBxLo(myThid)
            max1 = myBxHi(myThid) - myBxLo(myThid) + 1
            act2 = bj - myByLo(myThid)
            max2 = myByHi(myThid) - myByLo(myThid) + 1
            act3 = myThid - 1
            max3 = nTx*nTy
            act4 = ikey_dynamics - 1
+           idynkey = (act1 + 1) + act2*max1
-           ikey = (act1 + 1) + act2*max1
       &                      + act3*max1*max2
       &                      + 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
-         DO j=1-OLy,sNy+OLy
+ C     These initial values do not alter the numerical results. They
-          DO i=1-OLx,sNx+OLx
+ C     just ensure that all memory references are to valid floating
-           rTrans(i,j)   = 0. _d 0
+ C     point numbers. This prevents spurious hardware signals due to
-           rVel  (i,j,1) = 0. _d 0
+ C     uninitialised but inert locations.
-           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
-          ENDDO
-         ENDDO
+ #ifdef ALLOW_AUTODIFF
          DO k=1,Nr
           DO j=1-OLy,sNy+OLy
            DO i=1-OLx,sNx+OLx
- #ifdef INCLUDE_CONVECT_CALL
+ c--   need some re-initialisation here to break dependencies
-            ConvectCount(i,j,k) = 0.
+            gU(i,j,k,bi,bj) = 0. _d 0
- #endif
+            gV(i,j,k,bi,bj) = 0. _d 0
-            KappaRT(i,j,k) = 0. _d 0
-            KappaRS(i,j,k) = 0. _d 0
            ENDDO
           ENDDO
          ENDDO
+ #endif /* ALLOW_AUTODIFF */
-         iMin = 1-OLx+1
+         DO j=1-OLy,sNy+OLy
-         iMax = sNx+OLx
+          DO i=1-OLx,sNx+OLx
-         jMin = 1-OLy+1
+           fVerU  (i,j,1) = 0. _d 0
-         jMax = sNy+OLy
+           fVerU  (i,j,2) = 0. _d 0
+           fVerV  (i,j,1) = 0. _d 0
+           fVerV  (i,j,2) = 0. _d 0
- C--     Start of diagnostic loop
+           phiHydF (i,j)  = 0. _d 0
-         DO k=Nr,1,-1
+           phiHydC (i,j)  = 0. _d 0
+ #ifndef INCLUDE_PHIHYD_CALCULATION_CODE
- #ifdef ALLOW_AUTODIFF_TAMC
+           dPhiHydX(i,j)  = 0. _d 0
- C? Patrick, is this formula correct now that we change the loop range?
+           dPhiHydY(i,j)  = 0. _d 0
- C? Do we still need this?
-          kkey = (ikey-1)*(Nr-2+1) + (k-2) + 1
- #endif /* ALLOW_AUTODIFF_TAMC */
- C--       Integrate continuity vertically for vertical velocity
-           CALL INTEGRATE_FOR_W(
-      I                         bi, bj, k, uVel, vVel,
-      O                         wVel,
-      I                         myThid )
- #ifdef    ALLOW_OBCS
- C--       Calculate future values on open boundaries
-           IF (openBoundaries) THEN
- #ifdef      ALLOW_NONHYDROSTATIC
-             IF (nonHydrostatic) THEN
-               CALL OBCS_APPLY_W( bi, bj, k, wVel, myThid )
-             ENDIF
- #endif      /* ALLOW_NONHYDROSTATIC */
-             CALL OBCS_CALC( bi, bj, k, myTime+deltaT, myThid )
-           ENDIF
- #endif    /* ALLOW_OBCS */
- C--       Calculate gradients of potential density for isoneutral
- C         slope terms (e.g. GM/Redi tensor or IVDC diffusivity)
-           IF ( k.GT.1 .AND. (useGMRedi.OR.ivdc_kappa.NE.0.) ) THEN
-             CALL FIND_RHO(
-      I        bi, bj, iMin, iMax, jMin, jMax, k, k, eosType,
-      O        rhoK,
-      I        myThid )
-             CALL FIND_RHO(
-      I        bi, bj, iMin, iMax, jMin, jMax, k-1, k, eosType,
-      O        rhoKm1,
-      I        myThid )
-             CALL GRAD_SIGMA(
-      I             bi, bj, iMin, iMax, jMin, jMax, k,
-      I             rhoK, rhoKm1, rhoK,
-      O             sigmaX, sigmaY, sigmaR,
-      I             myThid )
-           ENDIF
- C--       Implicit Vertical Diffusion for Convection
-           IF (k.GT.1 .AND. ivdc_kappa.NE.0.) THEN
-             CALL CALC_IVDC(
-      I        bi, bj, iMin, iMax, jMin, jMax, k,
-      I        rhoKm1, rhoK,
- c should use sigmaR !!!
-      U        ConvectCount, KappaRT, KappaRS,
-      I        myTime, myIter, myThid)
-           END IF
- C--     end of diagnostic k loop (Nr:1)
-         ENDDO
- C--     Determines forcing terms based on external fields
- C       relaxation terms, etc.
-         CALL EXTERNAL_FORCING_SURF(
-      I             bi, bj, iMin, iMax, jMin, jMax,
-      I             myThid )
- #ifdef  ALLOW_GMREDI
- C--     Calculate iso-neutral slopes for the GM/Redi parameterisation
-         IF (useGMRedi) THEN
-           DO k=1,Nr
-             CALL GMREDI_CALC_TENSOR(
-      I             bi, bj, iMin, iMax, jMin, jMax, k,
-      I             sigmaX, sigmaY, sigmaR,
-      I             myThid )
-           ENDDO
-         ENDIF
- #endif  /* ALLOW_GMREDI */
- #ifdef  ALLOW_KPP
- C--     Compute KPP mixing coefficients
-         IF (useKPP) THEN
-           CALL KPP_CALC(
-      I                  bi, bj, myTime, myThid )
-         ENDIF
- #endif  /* ALLOW_KPP */
- #ifdef ALLOW_AUTODIFF_TAMC
- CADJ STORE KappaRT(:,:,:)     = comlev1_bibj, key = ikey, byte = isbyte
- CADJ STORE KappaRS(:,:,:)     = comlev1_bibj, key = ikey, byte = isbyte
- CADJ STORE theta(:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte
- CADJ STORE salt (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte
- CADJ STORE uvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte
- CADJ STORE vvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte
- #endif /* ALLOW_AUTODIFF_TAMC */
- C--     Start of thermodynamics loop
-         DO k=Nr,1,-1
- C--       km1    Points to level above k (=k-1)
- C--       kup    Cycles through 1,2 to point to layer above
- C--       kDown  Cycles through 2,1 to point to current layer
-           km1  = MAX(1,k-1)
-           kup  = 1+MOD(k+1,2)
-           kDown= 1+MOD(k,2)
-           iMin = 1-OLx+2
-           iMax = sNx+OLx-1
-           jMin = 1-OLy+2
-           jMax = sNy+OLy-1
- #ifdef ALLOW_AUTODIFF_TAMC
- CPatrick Is this formula correct?
-          kkey = (ikey-1)*(Nr-1+1) + (k-1) + 1
- CADJ STORE rvel  (:,:,kDown) = comlev1_bibj_k, key = kkey, byte = isbyte
- CADJ STORE rTrans(:,:)       = comlev1_bibj_k, key = kkey, byte = isbyte
- CADJ STORE KappaRT(:,:,:)    = comlev1_bibj_k, key = kkey, byte = isbyte
- CADJ STORE KappaRS(:,:,:)    = comlev1_bibj_k, key = kkey, byte = isbyte
- #endif /* ALLOW_AUTODIFF_TAMC */
- 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,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,
-      O        KappaRT,KappaRS,KappaRU,KappaRV,
-      I        myThid)
  #endif
+           phiSurfX(i,j)  = 0. _d 0
- C--      Calculate active tracer tendencies (gT,gS,...)
+           phiSurfY(i,j)  = 0. _d 0
- C        and step forward storing result in gTnm1, gSnm1, etc.
+           guDissip(i,j)  = 0. _d 0
-          IF ( tempStepping ) THEN
+           gvDissip(i,j)  = 0. _d 0
-            CALL CALC_GT(
+ #ifdef ALLOW_AUTODIFF
-      I         bi,bj,iMin,iMax,jMin,jMax, k,km1,kup,kDown,
+           phiHydLow(i,j,bi,bj) = 0. _d 0
-      I         xA,yA,uTrans,vTrans,rTrans,maskUp,maskC,
+ # if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM)
-      I         KappaRT,
+ #  ifndef DISABLE_RSTAR_CODE
-      U         fVerT,
+           dWtransC(i,j,bi,bj) = 0. _d 0
-      I         myTime, myThid)
+           dWtransU(i,j,bi,bj) = 0. _d 0
-            CALL TIMESTEP_TRACER(
+           dWtransV(i,j,bi,bj) = 0. _d 0
-      I         bi,bj,iMin,iMax,jMin,jMax,k,
+ #  endif
-      I         theta, gT,
+ # endif
-      U         gTnm1,
+ #endif /* ALLOW_AUTODIFF */
-      I         myIter, myThid)
+          ENDDO
-          ENDIF
-          IF ( saltStepping ) THEN
-            CALL CALC_GS(
-      I         bi,bj,iMin,iMax,jMin,jMax, k,km1,kup,kDown,
-      I         xA,yA,uTrans,vTrans,rTrans,maskUp,maskC,
-      I         KappaRS,
-      U         fVerS,
-      I         myTime, myThid)
-            CALL TIMESTEP_TRACER(
-      I         bi,bj,iMin,iMax,jMin,jMax,k,
-      I         salt, gS,
-      U         gSnm1,
-      I         myIter, myThid)
-          ENDIF
- #ifdef   ALLOW_OBCS
- C--      Apply open boundary conditions
-          IF (openBoundaries) THEN
-            CALL OBCS_APPLY_TS( bi, bj, k, gTnm1, gSnm1, myThid )
-          END IF
- #endif   /* ALLOW_OBCS */
- C--      Freeze water
-          IF (allowFreezing) THEN
- #ifdef ALLOW_AUTODIFF_TAMC
- CADJ STORE gTNm1(:,:,k,bi,bj) = comlev1_bibj_k
- CADJ &   , key = kkey, byte = isbyte
- #endif /* ALLOW_AUTODIFF_TAMC */
-             CALL FREEZE( bi, bj, iMin, iMax, jMin, jMax, k, myThid )
-          END IF
- C--     end of thermodynamic k loop (Nr:1)
          ENDDO
+ C--     Start computation of dynamics
  #ifdef ALLOW_AUTODIFF_TAMC
- CPatrick? What about this one?
+ CADJ STORE wVel (:,:,:,bi,bj) =
-            maximpl = 6
+ CADJ &     comlev1_bibj, key=idynkey, byte=isbyte
-            iikey = (ikey-1)*maximpl
  #endif /* ALLOW_AUTODIFF_TAMC */
- C--     Implicit diffusion
+ C--     Explicit part of the Surface Potential Gradient (add in TIMESTEP)
-         IF (implicitDiffusion) THEN
+ C       (note: this loop will be replaced by CALL CALC_GRAD_ETA)
+         IF (implicSurfPress.NE.1.) THEN
-           IF (tempStepping) THEN
+           CALL CALC_GRAD_PHI_SURF(
- #ifdef ALLOW_AUTODIFF_TAMC
+      I         bi,bj,iMin,iMax,jMin,jMax,
-             idkey = iikey + 1
+      I         etaN,
- #endif /* ALLOW_AUTODIFF_TAMC */
+      O         phiSurfX,phiSurfY,
-             CALL IMPLDIFF(
-      I         bi, bj, iMin, iMax, jMin, jMax,
-      I         deltaTtracer, KappaRT, recip_HFacC,
-      U         gTNm1,
       I         myThid )
-          ENDIF
+         ENDIF
-          IF (saltStepping) THEN
  #ifdef ALLOW_AUTODIFF_TAMC
-          idkey = iikey + 2
+ 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 &                 = comlev1_bibj, key=idynkey, byte=isbyte
+ #endif /* ALLOW_KPP */
  #endif /* ALLOW_AUTODIFF_TAMC */
-             CALL IMPLDIFF(
-      I         bi, bj, iMin, iMax, jMin, jMax,
-      I         deltaTtracer, KappaRS, recip_HFacC,
-      U         gSNm1,
-      I         myThid )
-          ENDIF
- #ifdef   ALLOW_OBCS
+ #ifndef ALLOW_AUTODIFF
- C--      Apply open boundary conditions
+         IF ( .NOT.momViscosity ) THEN
-          IF (openBoundaries) THEN
+ #endif
-            DO K=1,Nr
+           DO k=1,Nr
-              CALL OBCS_APPLY_TS( bi, bj, k, gTnm1, gSnm1, myThid )
+            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
-          END IF
+           ENDDO
- #endif   /* ALLOW_OBCS */
+ #ifndef ALLOW_AUTODIFF
+         ENDIF
+ #endif
+ #ifdef INCLUDE_CALC_DIFFUSIVITY_CALL
+ C--     Calculate the total vertical viscosity
+         IF ( momViscosity ) THEN
+           CALL CALC_VISCOSITY(
+      I            bi,bj, iMin,iMax,jMin,jMax,
+      O            KappaRU, KappaRV,
+      I            myThid )
+         ENDIF
+ #endif /* INCLUDE_CALC_DIFFUSIVITY_CALL */
- C--     End If implicitDiffusion
+ #ifdef ALLOW_SMAG_3D
+         IF ( useSmag3D ) THEN
+           CALL MOM_CALC_3D_STRAIN(
+      O         str11, str22, str33, str12, str13, str23,
+      I         bi, bj, myThid )
          ENDIF
+ #endif /* ALLOW_SMAG_3D */
+ #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
          DO k=1,Nr
-Line 517 
 C--       kup    Cycles through 1,2 to p
+Line 477 
 C--       kup    Cycles through 1,2 to p
  C--       kDown  Cycles through 2,1 to point to current layer
            km1  = MAX(1,k-1)
+           kp1  = MIN(k+1,Nr)
            kup  = 1+MOD(k+1,2)
            kDown= 1+MOD(k,2)
-           iMin = 1-OLx+2
+ #ifdef ALLOW_AUTODIFF_TAMC
-           iMax = sNx+OLx-1
+          kkey = (idynkey-1)*Nr + k
-           jMin = 1-OLy+2
+ CADJ STORE totPhiHyd (:,:,k,bi,bj)
-           jMax = sNy+OLy-1
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
+ CADJ STORE phiHydLow (:,:,bi,bj)
- C--      Calculate buoyancy
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
-          CALL FIND_RHO(
+ CADJ STORE theta (:,:,k,bi,bj)
-      I        bi, bj, iMin, iMax, jMin, jMax, km1, km1, eosType,
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
-      O        rhoKm1,
+ CADJ STORE salt  (:,:,k,bi,bj)
-      I        myThid )
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
-          CALL CALC_BUOYANCY(
+ CADJ STORE gT(:,:,k,bi,bj)
-      I        bi,bj,iMin,iMax,jMin,jMax,k,rhoKm1,
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
-      O        buoyKm1,
+ CADJ STORE gS(:,:,k,bi,bj)
-      I        myThid )
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
-          CALL FIND_RHO(
+ # ifdef NONLIN_FRSURF
-      I        bi, bj, iMin, iMax, jMin, jMax, k, k, eosType,
+ cph-test
-      O        rhoK,
+ CADJ STORE  phiHydC (:,:)
-      I        myThid )
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
-          CALL CALC_BUOYANCY(
+ CADJ STORE  phiHydF (:,:)
-      I        bi,bj,iMin,iMax,jMin,jMax,k,rhoK,
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
-      O        buoyK,
+ CADJ STORE gU(:,:,k,bi,bj)
-      I        myThid )
+ 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 /* NONLIN_FRSURF */
+ #endif /* ALLOW_AUTODIFF_TAMC */
- C--      Integrate hydrostatic balance for phiHyd with BC of
+ C--      Integrate hydrostatic balance for phiHyd with BC of phiHyd(z=0)=0
- C--      phiHyd(z=0)=0
           CALL CALC_PHI_HYD(
-      I        bi,bj,iMin,iMax,jMin,jMax,k,buoyKm1,buoyK,
+      I        bi,bj,iMin,iMax,jMin,jMax,k,
-      U        phiHyd,
+      I        theta, salt,
-      I        myThid )
+      U        phiHydF,
+      O        phiHydC, dPhiHydX, dPhiHydY,
+      I        myTime, myIter, myThid )
+ #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
-            CALL CALC_MOM_RHS(
+ #ifdef ALLOW_AUTODIFF
-      I         bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown,
+            DO j=1-OLy,sNy+OLy
-      I         phiHyd,KappaRU,KappaRV,
+             DO i=1-OLx,sNx+OLx
-      U         fVerU, fVerV,
+               guDissip(i,j)  = 0. _d 0
-      I         myTime, myThid)
+               gvDissip(i,j)  = 0. _d 0
+             ENDDO
+            ENDDO
+ #endif /* ALLOW_AUTODIFF */
+ #ifdef ALLOW_AUTODIFF_TAMC
+ # if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM)
+ #  ifndef 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
+ # endif /* NONLIN_FRSURF and ALLOW_MOM_FLUXFORM */
+ # if (defined NONLIN_FRSURF) || (defined ALLOW_DEPTH_CONTROL)
+ CADJ STORE fVerU(:,:,:) = comlev1_bibj_k, key=kkey, byte=isbyte
+ CADJ STORE fVerV(:,:,:) = comlev1_bibj_k, key=kkey, byte=isbyte
+ # endif
+ #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
+            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
+ #ifdef ALLOW_SMAG_3D
+            IF ( useSmag3D ) THEN
+              CALL MOM_CALC_SMAG_3D(
+      I         str11, str22, str33, str12, str13, str23,
+      O         viscAh3d_00, viscAh3d_12, viscAh3d_13, viscAh3d_23,
+      I         smag3D_hLsC, smag3D_hLsW, smag3D_hLsS, smag3D_hLsZ,
+      I         k, bi, bj, myThid )
+              CALL MOM_UV_SMAG_3D(
+      I         str11, str22, str12, str13, str23,
+      I         viscAh3d_00, viscAh3d_12, viscAh3d_13, viscAh3d_23,
+      O         addDissU, addDissV,
+      I         iMin,iMax,jMin,jMax, k, bi, bj, myThid )
+              DO j= jMin,jMax
+               DO i= iMin,iMax
+                guDissip(i,j) = guDissip(i,j) + addDissU(i,j)
+                gvDissip(i,j) = gvDissip(i,j) + addDissV(i,j)
+               ENDDO
+              ENDDO
+            ENDIF
+ #endif /* ALLOW_SMAG_3D */
             CALL TIMESTEP(
       I         bi,bj,iMin,iMax,jMin,jMax,k,
-      I         myIter, myThid)
+      I         dPhiHydX,dPhiHydY, phiSurfX, phiSurfY,
+      I         guDissip, gvDissip,
+      I         myTime, myIter, myThid)
- #ifdef   ALLOW_OBCS
- C--      Apply open boundary conditions
-          IF (openBoundaries) THEN
-            CALL OBCS_APPLY_UV( bi, bj, k, gUnm1, gVnm1, myThid )
-          END IF
- #endif   /* ALLOW_OBCS */
- #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 Vertical advection & viscosity
+ #if (defined (INCLUDE_IMPLVERTADV_CODE) && \
- C--     Implicit viscosity
+      defined (ALLOW_MOM_COMMON) && !(defined ALLOW_AUTODIFF_TAMC))
-         IF (implicitViscosity.AND.momStepping) THEN
+         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
-           idkey = iikey + 3
+ 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         -1, KappaRU, recip_hFacW(1-OLx,1-OLy,1,bi,bj),
-      U         gUNm1,
+      U         gU(1-OLx,1-OLy,1,bi,bj),
       I         myThid )
  #ifdef    ALLOW_AUTODIFF_TAMC
-           idkey = iikey + 4
+ 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,
+      I         -2, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj),
-      U         gVNm1,
+      U         gV(1-OLx,1-OLy,1,bi,bj),
       I         myThid )
+         ENDIF
- #ifdef   ALLOW_OBCS
+ #ifdef ALLOW_OBCS
  C--      Apply open boundary conditions
-          IF (openBoundaries) THEN
+         IF ( useOBCS ) THEN
-            DO K=1,Nr
+ C--      but first save intermediate velocities to be used in the
-              CALL OBCS_APPLY_UV( bi, bj, k, gUnm1, gVnm1, myThid )
+ C        next time step for the Stevens boundary conditions
-            ENDDO
+           CALL OBCS_SAVE_UV_N(
-          END IF
+      I        bi, bj, iMin, iMax, jMin, jMax, 0,
- #endif   /* ALLOW_OBCS */
+      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
-           idkey = iikey + 5
+ 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,
+      U         vVelD(1-OLx,1-OLy,1,bi,bj),
       I         myThid )
  #ifdef    ALLOW_AUTODIFF_TAMC
-           idkey = iikey + 6
+ CADJ STORE uVelD(:,:,:,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,
+      I         0, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj),
-      U         uVelD,
+      U         uVelD(1-OLx,1-OLy,1,bi,bj),
       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                 str13, str23, str33,
+      I                 viscAh3d_00, viscAh3d_13, viscAh3d_23,
+      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
-       RETURN
+ #ifdef ALLOW_OBCS
-       END
+       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, maskInC, maskInC, rA, drF,
+ C     &                     'phiHydLow', myTime, 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. 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)
+ #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
- C--      Cumulative diagnostic calculations (ie. time-averaging)
+ #ifdef DYNAMICS_GUGV_EXCH_CHECK
- #ifdef INCLUDE_DIAGNOSTICS_INTERFACE_CODE
+ C- jmc: For safety checking only: This Exchange here should not change
- c        IF (taveFreq.GT.0.) THEN
+ C       the solution. If solution changes, it means something is wrong,
- c         CALL DO_TIME_AVERAGES(
+ C       but it does not mean that it is less wrong with this exchange.
- c    I                           myTime, myIter, bi, bj, k, kup, kDown,
+       IF ( debugLevel .GE. debLevE ) THEN
- c    I                           ConvectCount,
+        CALL EXCH_UV_XYZ_RL(gU,gV,.TRUE.,myThid)
- c    I                           myThid )
+       ENDIF
- c        ENDIF
  #endif
+ #ifdef ALLOW_DEBUG
+       IF (debugMode) CALL DEBUG_LEAVE( 'DYNAMICS', myThid )
+ #endif
+       RETURN
+       END

 Legend:



Removed from v.1.54.2.7
 


changed lines


 
Added in v.1.172
 Legend:



Removed from v.1.54.2.7
 


changed lines


 
Added in v.1.172
-Removed from v.1.54.2.7
+Added in v.1.172

	ViewVC Help
Powered by ViewVC 1.1.22