Changeset 719 for trunk/NEMO/OPA_SRC/ZDF/zdftke_jki.F90

Timestamp:

2007-10-16T16:59:56+02:00 (17 years ago)

Author:

ctlod

Message:

get back to the nemo_v2_3 version for trunk

File:

• trunk/NEMO/OPA_SRC/ZDF/zdftke_jki.F90 (modified) (4 diffs, 1 prop)

trunk/NEMO/OPA_SRC/ZDF/zdftke_jki.F90

@@ -20 +20 @@
    USE dom_oce         ! ocean space and time domain
    USE zdf_oce         ! ocean vertical physics
-   USE sbc_oce         ! surface boundary condition: ocean
    USE zdftke          ! ???
-   USE phycst          ! physical constants
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
+   USE phycst          ! physical constants
+   USE taumod          ! surface stress
    USE prtctl          ! Print control
    USE restart         ! only for lrst_oce
@@ -57 +57 @@
       !!                  - ediss / emxl en**(2/3)        ! dissipation
       !!      with the boundary conditions:
-      !!         surface: en = max( emin0,ebb sqrt(utau^2 + vtau^2) )
+      !!         surface: en = max( emin0,ebb sqrt(taux^2 + tauy^2) )
       !!         bottom : en = emin
       !!      -1- The dissipation and mixing turbulent lengh scales are computed
@@ -124 +124 @@
       !!--------------------------------------------------------------------
       !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-      !! $Id$
+      !! $Header$ 
       !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
       !!--------------------------------------------------------------------
@@ -253 +253 @@
          ! 2. Surface boundary condition on tke and its eddy viscosity (zmxlm)
          ! -------------------------------------------------
-         ! en(1)   = ebb sqrt(utau^2+vtau^2) / rau0  (min value emin0)
+         ! en(1)   = ebb sqrt(taux^2+tauy^2) / rau0  (min value emin0)
          ! zmxlm(1) = avmb(1) and zmxlm(jpk) = 0.
 !CDIR NOVERRCHK
          DO ji = 2, jpim1
-            ztx2 = utau(ji-1,jj  ) + utau(ji,jj)
-            zty2 = vtau(ji  ,jj-1) + vtau(ji,jj)
+            ztx2 = taux(ji-1,jj  ) + taux(ji,jj)
+            zty2 = tauy(ji  ,jj-1) + tauy(ji,jj)
             zesurf = zbbrau * SQRT( ztx2 * ztx2 + zty2 * zty2 )
             en (ji,jj,1) = MAX( zesurf, emin0 ) * tmask(ji,jj,1)