Changeset 9939 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/TRD/trdglo.F90

Timestamp:

2018-07-13T09:28:50+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branche phased with MLF@9937 branche

Location:

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3

Files:

• . (copied) (copied from NEMO/trunk)
• src/OCE/TRD/trdglo.F90 (modified) (6 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/TRD/trdglo.F90

@@ -75 +75 @@
       INTEGER ::   ji, jj, jk      ! dummy loop indices
       INTEGER ::   ikbu, ikbv      ! local integers
-      REAL(wp)::   zvm, zvt, zvs, z1_2rau0   ! local scalars
+      REAL(wp)::   zvm, zvt, zvs, z1_2rho0   ! local scalars
       REAL(wp), DIMENSION(jpi,jpj)  :: ztswu, ztswv, z2dx, z2dy   ! 2D workspace 
       !!----------------------------------------------------------------------
@@ -132 +132 @@
             !                 
             IF( ktrd == jpdyn_zdf ) THEN      ! zdf trend: compute separately the surface forcing trend
-               z1_2rau0 = 0.5_wp / rau0
+               z1_2rho0 = 0.5_wp / rho0
                DO jj = 1, jpjm1
                   DO ji = 1, jpim1
                      zvt = ( utau_b(ji,jj) + utau(ji,jj) ) * tmask_i(ji+1,jj) * tmask_i(ji,jj) * umask(ji,jj,jk)   &
-                        &                                                     * z1_2rau0       * e1e2u(ji,jj)
+                        &                                                     * z1_2rho0       * e1e2u(ji,jj)
                      zvs = ( vtau_b(ji,jj) + vtau(ji,jj) ) * tmask_i(ji,jj+1) * tmask_i(ji,jj) * vmask(ji,jj,jk)   &
-                        &                                                     * z1_2rau0       * e1e2v(ji,jj)
+                        &                                                     * z1_2rho0       * e1e2v(ji,jj)
                      umo(jpdyn_tau) = umo(jpdyn_tau) + zvt
                      vmo(jpdyn_tau) = vmo(jpdyn_tau) + zvs
@@ -150 +150 @@
 !               !
 !               IF( ln_drgimp ) THEN                   ! implicit drag case: compute separately the bottom friction 
-!                  z1_2rau0 = 0.5_wp / rau0
+!                  z1_2rho0 = 0.5_wp / rho0
 !                  DO jj = 1, jpjm1
 !                     DO ji = 1, jpim1
@@ -211 +211 @@
          CALL eos( tsn, rhd, rhop )       ! now potential density
 
-         zcof = 0.5_wp / rau0             ! Density flux at w-point
+         zcof = 0.5_wp / rho0             ! Density flux at w-point
          zkz(:,:,1) = 0._wp
          DO jk = 2, jpk
@@ -217 +217 @@
          END DO
          
-         zcof   = 0.5_wp / rau0           ! Density flux at u and v-points
+         zcof   = 0.5_wp / rho0           ! Density flux at u and v-points
          DO jk = 1, jpkm1
             DO jj = 1, jpjm1
@@ -363 +363 @@
  9546    FORMAT(' 0 < horizontal diffusion                                  : ', e20.13)
  9547    FORMAT(' 0 < vertical diffusion                                    : ', e20.13)
- 9548    FORMAT(' pressure gradient u2 = - 1/rau0 u.dz(rhop)                : ', e20.13, '  u.dz(rhop) =', e20.13)
+ 9548    FORMAT(' pressure gradient u2 = - 1/rho0 u.dz(rho)                 : ', e20.13, '  u.dz(rho) =', e20.13)
          !
          ! Save potential to kinetic energy conversion for next time step