Changeset 7171 for branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

Timestamp:

2016-11-03T11:18:03+01:00 (7 years ago)

Author:

emanuelaclementi

Message:

#1643 Updates and bug fix on development branch 2015/dev_r5936_INGV1_WAVE

File:

• branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (3 diffs)

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -39 +39 @@
    USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
-   USE sbcwave,  ONLY:  zusd2dt, zvsd2dt,wsd3d
+   USE sbcwave,  ONLY:  usd3dt, vsd3dt,wsd3d
 
    IMPLICIT NONE
@@ -162 +162 @@
       REAL(wp), POINTER, DIMENSION(:,:  ) ::  z2d
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  z3d, zhdiv
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:  ) ::  sshnu, sshnv, dsshnu, dsshnv
+      REAL(wp) ::  dsshnu, dsshnv
       !!----------------------------------------------------------------------
       !
@@ -210 +210 @@
       ENDIF
 !
-!     In case ln_wave and ln_sdw the surface vertical velocity is modified
+!     In case ln_wave and ln_sdw, the surface vertical velocity is modified
 !     accounting for Sokes Drift velocity
+!
       IF ( ln_wave .AND. ln_sdw )  THEN
-       ALLOCATE(sshnu(jpi,jpj),sshnv(jpi,jpj),dsshnu(jpi,jpj),dsshnv(jpi,jpj))
-       sshnu (:,:) = 0._wp
-       sshnv (:,:) = 0._wp
-       dsshnu(:,:) = 0._wp
-       dsshnv(:,:) = 0._wp
-       ! sshn interpolated on U-V grid
-       !---------------------------------
-       DO jj = 1 , jpjm1
-         DO ji = 1 , jpim1
-           sshnu(ji,jj) =  0.5 * ( 2. - umask(ji,jj,1) ) *               &
-                        &        ( sshn(ji  ,jj) * tmask(ji  ,jj,1)      &
-                        &        + sshn(ji+1,jj) * tmask(ji+1,jj,1) )
-           sshnv(ji,jj) =  0.5 * ( 2. - vmask(ji,jj,1) ) *               &
-                        &        ( sshn(ji,jj  ) * tmask(ji,jj  ,1)      &
-                        &        + sshn(ji,jj+1) * tmask(ji,jj+1,1) )
-         ENDDO
+      ! Compute d(ssh)/dx  and d(ssh)/dy  
+      ! Compute the surface vertical velocity accounting for the Stokes Drift
+      !---------------------------------
+       DO jj = 2 , jpjm1
+        DO ji = 2 , jpim1
+          dsshnu = ( ssha(ji+1,jj) - ssha(ji,jj) ) / e1u(ji,jj)
+          dsshnv = ( ssha(ji,jj+1) - ssha(ji,jj) ) / e2v(ji,jj)
+          wn(ji,jj,1) = wn(ji,jj,1) +( usd3dt(ji,jj,1) * dsshnu     &
+                &     + vsd3dt(ji,jj,1) * dsshnv                    &
+                &     - ( wsd3d (ji,jj,1) )) * tmask(ji,jj,1)
+        ENDDO
        ENDDO
-       ! Compute d(ssh)/dx  and d(ssh)/dy  
-       !---------------------------------
-       DO jj = 1 , jpjm1
-         DO ji = 1 , jpim1
-           dsshnu(ji,jj) = ( sshnu(ji+1,jj) - sshnu(ji,jj) ) / e1u(ji,jj)
-           dsshnv(ji,jj) = ( sshnv(ji,jj+1) - sshnv(ji,jj) ) / e2v(ji,jj)
-         ENDDO
-       ENDDO
-       ! Compute the surface vertical velocity accounting for the Stokes Drift 
-       !---------------------------------------------------------------------
-       wn(:,:,1) = wn(:,:,1) + zusd2dt(:,:) * dsshnu(:,:)     &
-                 &           + zvsd2dt(:,:) * dsshnv(:,:)      &
-                 &           - ( wsd3d (:,:,1) ) * tmask(:,:,1)
       ENDIF
       !