Changeset 719 for trunk/NEMO/OPA_SRC/ZDF/zdftke.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.F90 (modified) (5 diffs, 1 prop)

trunk/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -31 +31 @@
    USE dom_oce         ! ocean space and time domain
    USE zdf_oce         ! ocean vertical physics
-   USE sbc_oce         ! surface boundary condition: ocean
    USE phycst          ! physical constants
+   USE taumod          ! surface stress
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE prtctl          ! Print control
@@ -81 +81 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $Id$
+   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/ZDF/zdftke.F90,v 1.16 2007/06/05 10:39:27 opalod Exp $ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -101 +101 @@
       !!                  - 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
@@ -301 +301 @@
       ! 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
@@ -307 +307 @@
 !CDIR NOVERRCHK
          DO ji = fs_2, fs_jpim1   ! vector opt.
-            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)