Changeset 7350 for branches/2016/dev_INGV_UKMO_2016/NEMOGCM/NEMO/OPA_SRC/TRA

Timestamp:

2016-11-28T13:08:46+01:00 (7 years ago)

Author:

emanuelaclementi

Message:

ticket #1805 step 2: Add in changes from the 2015/dev_r5936_INGV1_WAVE branch

File:

• branches/2016/dev_INGV_UKMO_2016/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) (4 diffs)

branches/2016/dev_INGV_UKMO_2016/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

@@ -9 +9 @@
    !!            3.7  !  2014-05  (G. Madec)  Add 2nd/4th order cases for CEN and FCT schemes 
    !!             -   !  2014-12  (G. Madec) suppression of cross land advection option
+   !!            3.6  !  2015-06  (E. Clementi) Addition of Stokes drift in case of wave coupling
    !!----------------------------------------------------------------------
 
@@ -34 +35 @@
    USE wrk_nemo       ! Memory Allocation
    USE timing         ! Timing
-
-   USE diaptr          ! Poleward heat transport 
+   USE sbcwave        ! wave module
+   USE sbc_oce        ! surface boundary condition: ocean
+   USE diaptr         ! Poleward heat transport 
 
    IMPLICIT NONE
@@ -95 +97 @@
       !
       !                                          ! 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)
@@ -102 +108 @@
       !
       !                                         !==  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) = e1e2t(:,:)                 * 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                                ! add z-tilde and/or vvl corrections