Changeset 2980 for branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

Timestamp:

2011-10-24T11:29:46+02:00 (13 years ago)

Author:

acc

Message:

Branch dev_NOC_2011_MERGE. #874. Step 2: Add changes from the 2011/dev_r2782_NOCS_Griffies branch

File:

• branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) (1 diff)

branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

@@ -103 +103 @@
 
       !                                                   ! add the eiv transport (if necessary)
-      IF( lk_traldf_eiv )   CALL tra_adv_eiv( kt, zun, zvn, zwn, 'TRC' )
+      IF( lk_traldf_eiv .AND. .NOT. ln_traldf_grif )   &
+         &              CALL tra_adv_eiv( kt, zun, zvn, zwn, 'TRC' )          ! add the eiv transport (if necessary)
       !
       SELECT CASE ( nadv )                            !==  compute advection trend and add it to general trend  ==!