Changeset 6839 for branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90

Timestamp:

2016-08-03T16:04:57+02:00 (8 years ago)

Author:

timgraham

Message:

Merged in nemo_v3_6_STABLE at r6721

File:

• branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90

@@ -67 +67 @@
          IF( lk_trabbl )        CALL trc_bbl( kstp )            ! advective (and/or diffusive) bottom boundary layer scheme
          IF( ln_trcdmp )        CALL trc_dmp( kstp )            ! internal damping trends
-         IF( ln_trcdmp_clo )    CALL trc_dmp_clo( kstp )        ! internal damping trends on closed seas only
                                 CALL trc_adv( kstp )            ! horizontal & vertical advection 
                                 CALL trc_ldf( kstp )            ! lateral mixing
@@ -78 +77 @@
                                 CALL trc_nxt( kstp )            ! tracer fields at next time step     
          IF( ln_trcrad )        CALL trc_rad( kstp )            ! Correct artificial negative concentrations
+         IF( ln_trcdmp_clo )    CALL trc_dmp_clo( kstp )        ! internal damping trends on closed seas only
 
 #if defined key_agrif