Changeset 14007 for NEMO/trunk/src/OCE/DYN/dynzad.F90

Timestamp:

2020-12-02T15:30:51+01:00 (4 years ago)

Author:

emanuelaclementi

Message:

merging branch dev_r12702_ASINTER-02_emanuelaclementi_Waves

File:

• NEMO/trunk/src/OCE/DYN/dynzad.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/DYN/dynzad.F90

@@ -16 +16 @@
    USE trd_oce        ! trends: ocean variables
    USE trddyn         ! trend manager: dynamics
+   USE sbcwave, ONLY: wsd   ! Surface Waves (add vertical Stokes-drift)
    !
    USE in_out_manager ! I/O manager
@@ -79 +80 @@
       DO jk = 2, jpkm1                ! Vertical momentum advection at level w and u- and v- vertical
          DO_2D( 0, 1, 0, 1 )              ! vertical fluxes
+          IF( ln_vortex_force ) THEN
+            zww(ji,jj) = 0.25_wp * e1e2t(ji,jj) * ( ww(ji,jj,jk) + wsd(ji,jj,jk) )
+          ELSE
             zww(ji,jj) = 0.25_wp * e1e2t(ji,jj) * ww(ji,jj,jk)
+          ENDIF
          END_2D
          DO_2D( 0, 0, 0, 0 )              ! vertical momentum advection at w-point