Changeset 9923 for NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OCE/DYN/sshwzv.F90

Timestamp:

2018-07-11T10:24:17+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): step I.2: dev_r9838_ENHANCE04_MLF

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OCE/DYN/sshwzv.F90 (modified) (9 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OCE/DYN/sshwzv.F90

@@ -69 +69 @@
       ! 
       INTEGER  ::   jk         ! dummy loop indice
-      REAL(wp) ::   z1_2rau0   ! local scalars
+      REAL(wp) ::   z1_2rho0   ! local scalars
       REAL(wp), DIMENSION(jpi,jpj) ::   zhdiv   ! 2D workspace
       !!----------------------------------------------------------------------
@@ -81 +81 @@
       ENDIF
       !
-      z1_2rau0 = 0.5_wp * r1_rau0
+      z1_2rho0 = 0.5_wp * r1_rho0
 
       !                                           !------------------------------!
@@ -87 +87 @@
       !                                           !------------------------------!
 
-      IF(ln_wd_il)   CALL wad_lmt( sshb, z1_2rau0 * (emp_b(:,:) + emp(:,:)), r2dt )
+      IF(ln_wd_il)   CALL wad_lmt( sshb, z1_2rho0 * (emp_b(:,:) + emp(:,:)), rDt )
 
       CALL div_hor( kt )                               ! Horizontal divergence
@@ -99 +99 @@
       ! compute the vertical velocity which can be used to compute the non-linear terms of the momentum equations.
       ! 
-      ssha(:,:) = (  sshb(:,:) - r2dt * ( z1_2rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * ssmask(:,:)
+      ssha(:,:) = (  sshb(:,:) - rDt * ( z1_2rho0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * ssmask(:,:)
       !
 #if defined key_agrif
@@ -174 +174 @@
             ! computation of w
             wn(:,:,jk) = wn(:,:,jk+1) - (  e3t_n(:,:,jk) * hdivn(:,:,jk) + zhdiv(:,:,jk)    &
-               &                         + r1_2dt * ( e3t_a(:,:,jk) - e3t_b(:,:,jk) )     ) * tmask(:,:,jk)
+               &                         + r1_Dt * ( e3t_a(:,:,jk) - e3t_b(:,:,jk) )      ) * tmask(:,:,jk)
          END DO
          !          IF( ln_vvl_layer ) wn(:,:,:) = 0.e0
@@ -182 +182 @@
             ! computation of w
             wn(:,:,jk) = wn(:,:,jk+1) - (  e3t_n(:,:,jk) * hdivn(:,:,jk)                 &
-               &                         + r1_2dt * ( e3t_a(:,:,jk) - e3t_b(:,:,jk) )  ) * tmask(:,:,jk)
+               &                         + r1_Dt * ( e3t_a(:,:,jk) - e3t_b(:,:,jk) )  ) * tmask(:,:,jk)
          END DO
       ENDIF
@@ -194 +194 @@
 #if defined key_agrif 
       IF( .NOT. AGRIF_Root() ) THEN 
-         IF ((nbondi ==  1).OR.(nbondi == 2)) wn(nlci-1 , :     ,:) = 0.e0      ! east 
-         IF ((nbondi == -1).OR.(nbondi == 2)) wn(2      , :     ,:) = 0.e0      ! west 
-         IF ((nbondj ==  1).OR.(nbondj == 2)) wn(:      ,nlcj-1 ,:) = 0.e0      ! north 
-         IF ((nbondj == -1).OR.(nbondj == 2)) wn(:      ,2      ,:) = 0.e0      ! south 
+         IF ( nbondi ==  1 .OR. nbondi == 2 )   wn(nlci-1 ,   :   ,:) = 0._wp    ! east 
+         IF ( nbondi == -1 .OR. nbondi == 2 )   wn(   2   ,   :   ,:) = 0._wp    ! west 
+         IF ( nbondj ==  1 .OR. nbondj == 2 )   wn(   :   ,nlcj-1 ,:) = 0._wp    ! north 
+         IF ( nbondj == -1 .OR. nbondj == 2 )   wn(   :   ,   2   ,:) = 0._wp    ! south 
       ENDIF 
 #endif 
@@ -216 +216 @@
       !! ** Method  : - apply Asselin time fiter to now ssh (excluding the forcing
       !!              from the filter, see Leclair and Madec 2010) and swap :
-      !!                sshn = ssha + atfp * ( sshb -2 sshn + ssha )
-      !!                            - atfp * rdt * ( emp_b - emp ) / rau0
+      !!                sshn = ssha + rn_atfp * ( sshb -2 sshn + ssha )
+      !!                            - rn_atfp * rn_Dt * ( emp_b - emp ) / rho0
       !!                sshn = ssha
       !!
@@ -245 +245 @@
          !
          !                                   ! before <-- now filtered
-         sshb(:,:) = sshn(:,:) + atfp * ( sshb(:,:) - 2 * sshn(:,:) + ssha(:,:) )
+         sshb(:,:) = sshn(:,:) + rn_atfp * ( sshb(:,:) - 2 * sshn(:,:) + ssha(:,:) )
          IF( .NOT.ln_linssh ) THEN           ! before <-- with forcing removed
-            zcoef = atfp * rdt * r1_rau0
+            zcoef = rn_atfp * rn_Dt * r1_rho0
             sshb(:,:) = sshb(:,:) - zcoef * (     emp_b(:,:) - emp   (:,:)   &
                &                             -    rnf_b(:,:) + rnf   (:,:)   &