Changeset 7360

Timestamp:

2016-11-29T11:21:16+01:00 (7 years ago)

Author:

jcastill

Message:

Final changes as they are going to the trunk after Nov-2016 merge party

Location:

branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/sshwzv.F90 (modified) (4 diffs)
• SBC/sbcwave.F90 (modified) (2 diffs)
• step.F90 (modified) (1 diff)

branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -9 +9 @@
    !!             -   !  2010-09  (D.Storkey and E.O'Dea) bug fixes for BDY module
    !!            3.3  !  2011-10  (M. Leclair) split former ssh_wzv routine and remove all vvl related work
-   !!            3.6  !  2014-10  (E. Clementi, P. Oddo) add wave contribution to surface vertical velocity 
    !!----------------------------------------------------------------------
 
@@ -39 +38 @@
    USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
-   USE sbcwave         ! Stokes velocities
 
    IMPLICIT NONE
@@ -162 +160 @@
       REAL(wp), POINTER, DIMENSION(:,:  ) ::  z2d
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  z3d, zhdiv
-      REAL(wp) ::  zdsshu, zdsshv
       !!----------------------------------------------------------------------
       !
@@ -210 +207 @@
       ENDIF
 
-      IF( ln_wave .AND. ln_sdw ) THEN
-         ! Compute d(ssh)/dx  and d(ssh)/dy  
-         ! Compute the surface vertical velocity accounting for the Stokes Drift
-         DO jj = 1 , jpjm1
-            DO ji = 1 , fs_jpim1
-              zdsshu = ( sshn(ji+1,jj) - sshn(ji,jj) ) / e1u(ji,jj)
-              zdsshv = ( sshn(ji,jj+1) - sshn(ji,jj) ) / e2v(ji,jj)
-              wn(ji,jj,1) = wn(ji,jj,1) + ( usd3dt(ji,jj,1) * zdsshu   &
-                 &                        + vsd3dt(ji,jj,1) * zdsshv   &
-                 &        - wsd3d (ji,jj,1) ) * tmask(ji,jj,1)
-            END DO
-         END DO
-      ENDIF
       !
 #if defined key_bdy

branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90

@@ -54 +54 @@
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)       :: tauoc_wave
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)       :: tsd2d
-   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)       :: usd2d, vsd2d
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)       :: zusd2dt, zvsd2dt
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:,:)     :: usd3d, vsd3d, wsd3d 
@@ -284 +283 @@
                CALL fld_fill( sf_sd, slf_i, cn_dir, 'sbc_wave', 'Wave module ', 'namsbc_wave' )
             ENDIF
-            ALLOCATE( usd2d(jpi,jpj),vsd2d(jpi,jpj) )
             ALLOCATE( usd3d(jpi,jpj,jpk),vsd3d(jpi,jpj,jpk),wsd3d(jpi,jpj,jpk) )
             ALLOCATE( usd3dt(jpi,jpj,jpk),vsd3dt(jpi,jpj,jpk) )

branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -220 +220 @@
                          CALL dyn_adv       ( kstp )  ! advection (vector or flux form)
                          CALL dyn_vor       ( kstp )  ! vorticity term including Coriolis
-      IF( ln_wave .AND. ln_sdw .AND. ln_stcor    )  &
+      IF( ln_wave .AND. ln_sdw .AND. ln_stcor )          &
                &         CALL dyn_stcor     ( kstp )  ! Stokes-Coriolis forcing
                          CALL dyn_ldf       ( kstp )  ! lateral mixing