Changeset 7412 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

Timestamp:

2016-12-01T11:30:29+01:00 (8 years ago)

Author:

lovato

Message:

Merge dev_NOC_CMCC_merge_2016 into branch

File:

• branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (5 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -22 +22 @@
    USE divhor         ! horizontal divergence
    USE phycst         ! physical constants
-   USE bdy_oce        ! 
-   USE bdy_par        !
+   USE bdy_oce   , ONLY: ln_bdy, bdytmask
    USE bdydyn2d       ! bdy_ssh routine
 #if defined key_agrif
@@ -88 +87 @@
       ENDIF
       !
-      CALL div_hor( kt )                              ! Horizontal divergence
-      !
-      z2dt = 2._wp * rdt                              ! set time step size (Euler/Leapfrog)
+      z2dt = 2._wp * rdt                          ! set time step size (Euler/Leapfrog)
       IF( neuler == 0 .AND. kt == nit000 )   z2dt = rdt
+      zcoef = 0.5_wp * r1_rau0
 
       !                                           !------------------------------!
       !                                           !   After Sea Surface Height   !
       !                                           !------------------------------!
+      IF(ln_wd) THEN
+         CALL wad_lmt(sshb, zcoef * (emp_b(:,:) + emp(:,:)), z2dt)
+      ENDIF
+
+      CALL div_hor( kt )                               ! Horizontal divergence
+      !
       zhdiv(:,:) = 0._wp
       DO jk = 1, jpkm1                                 ! Horizontal divergence of barotropic transports
@@ -104 +108 @@
       ! compute the vertical velocity which can be used to compute the non-linear terms of the momentum equations.
       ! 
-      zcoef = 0.5_wp * r1_rau0
-
-      IF(ln_wd) CALL wad_lmt(sshb, zcoef * (emp_b(:,:) + emp(:,:)), z2dt)
-
       ssha(:,:) = (  sshb(:,:) - z2dt * ( zcoef * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * ssmask(:,:)
 
@@ -116 +116 @@
          CALL agrif_ssh( kt )
 # endif
-# if defined key_bdy
-         IF( lk_bdy ) THEN
+         IF( ln_bdy ) THEN
             CALL lbc_lnk( ssha, 'T', 1. )    ! Not sure that's necessary
             CALL bdy_ssh( ssha )             ! Duplicate sea level across open boundaries
          ENDIF
-# endif
       ENDIF
 
@@ -211 +209 @@
       ENDIF
 
-#if defined key_bdy
-      IF( lk_bdy ) THEN
+      IF( ln_bdy ) THEN
          DO jk = 1, jpkm1
             wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:)
          END DO
       ENDIF
-#endif
       !
       IF( nn_timing == 1 )  CALL timing_stop('wzv')