Changeset 2236 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA/traadv.F90

Timestamp:

2010-10-12T20:49:32+02:00 (14 years ago)

Author:

cetlod

Message:

First guess of NEMO_v3.3

File:

• branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA/traadv.F90 (modified) (3 diffs)

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA/traadv.F90

@@ -51 +51 @@
    !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -83 +83 @@
       zwn(:,:,jpk) = 0.e0                                                     ! no transport trough the bottom
       !
-      IF( lk_traldf_eiv )   CALL tra_adv_eiv( kt, zun, zvn, zwn, 'TRA' )      ! add the eiv transport (if necessary)
+      IF( lk_traldf_eiv .AND. .NOT. ln_traldf_grif )   &
+         &                  CALL tra_adv_eiv( kt, zun, zvn, zwn, 'TRA' )      ! add the eiv transport (if necessary)
       !
       CALL iom_put( "uoce_eff", zun )                                         ! output effective transport      
       CALL iom_put( "voce_eff", zvn )
       CALL iom_put( "woce_eff", zwn )
-
 
       SELECT CASE ( nadv )                            !==  compute advection trend and add it to general trend  ==!
@@ -97 +97 @@
       CASE ( 5 )   ;    CALL tra_adv_ubs   ( kt, 'TRA', r2dt, zun, zvn, zwn, tsb, tsn, tsa, jpts )   !  UBS 
       CASE ( 6 )   ;    CALL tra_adv_qck   ( kt, 'TRA', r2dt, zun, zvn, zwn, tsb, tsn, tsa, jpts )   !  QUICKEST 
+
       !
       CASE (-1 )                                      !==  esopa: test all possibility with control print  ==!