Changeset 7471 for branches/UKMO/r6232_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

Timestamp:

2016-12-07T13:15:34+01:00 (7 years ago)

Author:

jcastill

Message:

Version as merged to the trunk during the Nov-2016 merge party, equivalent to branches/UKMO/r5936_INGV1_WAVE-coupling@7360

File:

• branches/UKMO/r6232_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) (4 diffs)

branches/UKMO/r6232_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

@@ -6 +6 @@
    !! History :  2.0  !  2005-11  (G. Madec)  Original code
    !!            3.3  !  2010-09  (C. Ethe, G. Madec)  merge TRC-TRA + switch from velocity to transport
+   !!            3.6  !  2015-06  (E. Clementi) Addition of Stokes drift in case of wave coupling
    !!            4.0  !  2011-06  (G. Madec)  Addition of Mixed Layer Eddy parameterisation
    !!----------------------------------------------------------------------
@@ -34 +35 @@
    USE timing          ! Timing
    USE sbc_oce
-   USE diaptr          ! Poleward heat transport 
-
+   USE sbcwave        ! wave module 
+   USE sbc_oce        ! surface boundary condition: ocean 
+   USE diaptr         ! Poleward heat transport
 
    IMPLICIT NONE
@@ -85 +87 @@
       CALL wrk_alloc( jpi, jpj, jpk, zun, zvn, zwn )
       !                                          ! set time step
+      zun(:,:,:) = 0.0 
+      zvn(:,:,:) = 0.0 
+      zwn(:,:,:) = 0.0 
+      !     
       IF( neuler == 0 .AND. kt == nit000 ) THEN     ! at nit000
          r2dtra(:) =  rdttra(:)                          ! = rdtra (restarting with Euler time stepping)
@@ -94 +100 @@
       !
       !                                               !==  effective transport  ==!
-      DO jk = 1, jpkm1
-         zun(:,:,jk) = e2u(:,:) * fse3u(:,:,jk) * un(:,:,jk)                  ! eulerian transport only
-         zvn(:,:,jk) = e1v(:,:) * fse3v(:,:,jk) * vn(:,:,jk)
-         zwn(:,:,jk) = e1t(:,:) * e2t(:,:)      * wn(:,:,jk)
-      END DO
+      IF(ln_wave .AND. ln_sdw) THEN 
+         DO jk = 1, jpkm1 
+            zun(:,:,jk) = e2u(:,:) * fse3u(:,:,jk) *      & 
+                        &  ( un(:,:,jk) + usd3d(:,:,jk) )                     !eulerian transport + Stokes Drift 
+            zvn(:,:,jk) = e1v(:,:) * fse3v(:,:,jk) *      & 
+                        &  ( vn(:,:,jk) + vsd3d(:,:,jk) ) 
+            zwn(:,:,jk) = e1e2t(:,:) *                    & 
+                        &  ( wn(:,:,jk) + wsd3d(:,:,jk) ) 
+         END DO 
+      ELSE 
+         DO jk = 1, jpkm1 
+            zun(:,:,jk) = e2u  (:,:) * fse3u(:,:,jk) * un(:,:,jk)             ! eulerian transport only 
+            zvn(:,:,jk) = e1v  (:,:) * fse3v(:,:,jk) * vn(:,:,jk) 
+            zwn(:,:,jk) = e1e2t(:,:)                 * wn(:,:,jk) 
+         END DO 
+      ENDIF 
       !
       IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN