Changeset 888 for trunk/NEMO/OPA_SRC/ZDF

Timestamp:

2008-04-11T19:05:03+02:00 (16 years ago)

Author:

ctlod

Message:

merge dev_001_SBC branche with the trunk to include the New Surface Module package, see ticket: #113

Location:

trunk/NEMO/OPA_SRC/ZDF

Files:

• zdfkpp.F90 (modified) (4 diffs)
• zdftke.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdfkpp.F90

@@ -21 +21 @@
    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 eosbn2          ! equation of state
-   USE ocesbc          ! thermohaline fluxes
    USE zdfddm          ! double diffusion mixing
    USE in_out_manager  ! I/O manager
@@ -148 +147 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL   (2005)
-   !! $Header$ 
+   !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -460 +459 @@
             zBosol(ji,jj) = grav * zthermal * qsr(ji,jj)
             ! Non radiative surface buoyancy force
-            zBo   (ji,jj) = grav * zthermal * ( qt(ji,jj) - qsr(ji,jj) ) -  grav * zhalin * emp(ji,jj)
+            zBo   (ji,jj) = grav * zthermal * qns(ji,jj) -  grav * zhalin * emp(ji,jj)
             ! Surface Temperature flux for non-local term
-            wt0(ji,jj) = - qt(ji,jj) * ro0cpr * tmask(ji,jj,1)
+            wt0(ji,jj) = - ( qsr(ji,jj) + qns(ji,jj) )* ro0cpr * tmask(ji,jj,1)
             ! Surface salinity flux for non-local term
             ws0(ji,jj) = - ( emp(ji,jj) * sn(ji,jj,1) * rcs ) * tmask(ji,jj,1)
@@ -476 +475 @@
             zrhos         = rhop(ji,jj,1) + zflageos * rau0 * ( 1. - tmask(ji,jj,1) )  
             ! Friction velocity (zustar), at T-point : LMD94 eq. 2
-            ztx           = 0.5 * ( taux(ji,jj) + taux(ji - 1, jj    ) )
-            zty           = 0.5 * ( tauy(ji,jj) + tauy(ji    , jj - 1) )
+            ztx           = 0.5 * ( utau(ji,jj) + utau(ji - 1, jj    ) )
+            zty           = 0.5 * ( vtau(ji,jj) + vtau(ji    , jj - 1) )
             ztau          = SQRT( ztx * ztx + zty * zty )
             zustar(ji,jj) = SQRT( ztau / ( zrhos +  epsln ) )

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
@@ -79 +79 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/ZDF/zdftke.F90,v 1.16 2007/06/05 10:39:27 opalod Exp $ 
+   !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -99 +99 @@
       !!                  - ediss / emxl en**(2/3)        ! dissipation
       !!      with the boundary conditions:
-      !!         surface: en = max( emin0,ebb sqrt(taux^2 + tauy^2) )
+      !!         surface: en = max( emin0,ebb sqrt(utau^2 + vtau^2) )
       !!         bottom : en = emin
       !!      -1- The dissipation and mixing turbulent lengh scales are computed
@@ -299 +299 @@
       ! 2. Surface boundary condition on tke and its eddy viscosity (zmxlm)
       ! -------------------------------------------------
-      ! en(1)   = ebb sqrt(taux^2+tauy^2) / rau0  (min value emin0)
+      ! en(1)   = ebb sqrt(utau^2+vtau^2) / rau0  (min value emin0)
       ! zmxlm(1) = avmb(1) and zmxlm(jpk) = 0.
 !CDIR NOVERRCHK
@@ -305 +305 @@
 !CDIR NOVERRCHK
          DO ji = fs_2, fs_jpim1   ! vector opt.
-            ztx2 = taux(ji-1,jj  ) + taux(ji,jj)
-            zty2 = tauy(ji  ,jj-1) + tauy(ji,jj)
+            ztx2 = utau(ji-1,jj  ) + utau(ji,jj)
+            zty2 = vtau(ji  ,jj-1) + vtau(ji,jj)
             zesurf = zbbrau * SQRT( ztx2 * ztx2 + zty2 * zty2 )
             en (ji,jj,1) = MAX( zesurf, emin0 ) * tmask(ji,jj,1)