Changeset 1175 for trunk/NEMO/TOP_SRC/TRP/trczdf_exp.F90

Timestamp:

2008-09-11T18:26:34+02:00 (16 years ago)

Author:

cetlod

Message:

update transport modules to take into account new trends organization, see ticket:248

File:

• trunk/NEMO/TOP_SRC/TRP/trczdf_exp.F90 (modified) (6 diffs)

trunk/NEMO/TOP_SRC/TRP/trczdf_exp.F90

@@ -4 +4 @@
    !! Ocean passive tracers:  vertical component of the tracer mixing trend using
    !!                        an explicit time-stepping (time spllitting scheme)
-   !!==============================================================================
+   !!======================================================================
+   !! History :  6.0  !  90-10  (B. Blanke)  Original code
+   !!            7.0  !  91-11  (G. Madec)
+   !!                 !  92-06  (M. Imbard)  correction on tracer trend loops
+   !!                 !  96-01  (G. Madec)  statement function for e3
+   !!                 !  97-05  (G. Madec)  vertical component of isopycnal
+   !!                 !  97-07  (G. Madec)  geopotential diffusion in s-coord
+   !!                 !  98-03  (L. Bopp MA Foujols) passive tracer generalisation
+   !!                 !  00-05  (MA Foujols) add lbc for tracer trends
+   !!                 !  00-06  (O Aumont)  correct isopycnal scheme suppress
+   !!                 !                     avt multiple correction
+   !!                 !  00-08  (G. Madec)  double diffusive mixing
+   !!            8.5  !  02-08  (G. Madec)  F90: Free form and module
+   !!            9.0  !  04-03  (C. Ethe )  adapted for passive tracers
+   !!                 !  07-02  (C. Deltel)  Diagnose ML trends for passive tracers
+   !!----------------------------------------------------------------------
 #if defined key_top
    !!----------------------------------------------------------------------
@@ -17 +32 @@
    USE trctrp_lec       ! passive tracers transport
    USE prtctl_trc          ! Print control for debbuging
+   USE trdmld_trc
+   USE trdmld_trc_oce
 
    IMPLICIT NONE
@@ -56 +73 @@
       !!
       !! ** Action : - Update tra with the before vertical diffusion trend
-      !!             - Save the trends  in trtrd ('key_trc_diatrd')
+      !!             - Save the trends ('key_trdmld_trc')
       !!
-      !! History :
-      !!   6.0  !  90-10  (B. Blanke)  Original code
-      !!   7.0  !  91-11  (G. Madec)
-      !!        !  92-06  (M. Imbard)  correction on tracer trend loops
-      !!        !  96-01  (G. Madec)  statement function for e3
-      !!        !  97-05  (G. Madec)  vertical component of isopycnal
-      !!        !  97-07  (G. Madec)  geopotential diffusion in s-coord
-      !!        !  98-03  (L. Bopp MA Foujols) passive tracer generalisation
-      !!        !  00-05  (MA Foujols) add lbc for tracer trends
-      !!        !  00-06  (O Aumont)  correct isopycnal scheme suppress
-      !!        !                     avt multiple correction
-      !!        !  00-08  (G. Madec)  double diffusive mixing
-      !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
-      !!   9.0  !  04-03  (C. Ethe )  adapted for passive tracers
       !!---------------------------------------------------------------------
+      USE oce_trc, ONLY :   ztrtrd => ua    ! use ua as 3D workspace
       !! * Arguments
       INTEGER, INTENT( in ) ::   kt           ! ocean time-step index
@@ -93 +97 @@
       ENDIF
 
+      IF( l_trdtrc ) THEN
+         STOP 'trczdf_exp: this was never validated, please comment this line to proceed...'
+      ENDIF
+
       ! 0. Local constant initialization
       ! --------------------------------
@@ -110 +118 @@
 
       DO jn = 1, jptra
-
+         !
+         IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn)   ! save trends
          !                                                ! ===============
          DO jj = 2, jpjm1                                 !  Vertical slab
@@ -163 +172 @@
          END DO                                           !   End of slab
          !                                                ! ===============
-      END DO
+         IF( l_trdtrc ) THEN
+            ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:)
+            IF (luttrd(jn)) CALL trd_mod_trc( ztrtrd, jn, jptrc_trd_zdf, kt )
+         END IF
+
+         !                                                    ! ===========
+      END DO                                                  ! tracer loop
+      !                                                       ! ===========
 
       IF(ln_ctl)   THEN  ! print mean trends (used for debugging)