Changeset 888 for trunk/NEMO/OPA_SRC/TRA/trasbc.F90

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

File:

• trunk/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -13 +13 @@
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and active tracers
+   USE sbc_oce         ! surface boundary condition: ocean
    USE dom_oce         ! ocean space domain variables
-   USE ocesbc          ! surface thermohaline fluxes
    USE phycst          ! physical constant
    USE traqsr          ! solar radiation penetration
@@ -32 +32 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
+   !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -132 +132 @@
 #endif
             IF( lk_vvl) THEN
-               zta = ro0cpr * ( qt(ji,jj) - qsr(ji,jj) ) * zse3t &   ! temperature : heat flux
+               zta = ro0cpr * qns(ji,jj) * zse3t &                   ! temperature : heat flux
                 &    - emp(ji,jj) * zsrau * tn(ji,jj,1)  * zse3t     ! & cooling/heating effet of EMP flux
                zsa = 0.e0                                            ! No salinity concent./dilut. effect
             ELSE
-               zta = ro0cpr * ( qt(ji,jj) - qsr(ji,jj) ) * zse3t     ! temperature : heat flux
+               zta = ro0cpr * qns(ji,jj) * zse3t     ! temperature : heat flux
                zsa = emps(ji,jj) * zsrau * sn(ji,jj,1)   * zse3t     ! salinity :  concent./dilut. effect
             ENDIF