Changeset 1175 for trunk/NEMO/TOP_SRC/TRP/trcnxt.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/trcnxt.F90 (modified) (6 diffs)

trunk/NEMO/TOP_SRC/TRP/trcnxt.F90

@@ -4 +4 @@
    !! Ocean passive tracers:  time stepping on passives tracers
    !!======================================================================
+   !!======================================================================
+   !! History :  7.0  !  91-11  (G. Madec)  Original code
+   !!                 !  93-03  (M. Guyon)  symetrical conditions
+   !!                 !  95-02  (M. Levy)   passive tracers
+   !!                 !  96-02  (G. Madec & M. Imbard)  opa release 8.0
+   !!            8.0  !  96-04  (A. Weaver)  Euler forward step
+   !!            8.2  !  99-02  (G. Madec, N. Grima)  semi-implicit pressure grad.
+   !!            8.5  !  02-08  (G. Madec)  F90: Free form and module
+   !!                 !  02-11  (C. Talandier, A-M Treguier) Open boundaries
+   !!            9.0  !  04-03  (C. Ethe) passive tracers
+   !!                 !  07-02  (C. Deltel) Diagnose ML trends for passive tracers
+   !!----------------------------------------------------------------------
 #if defined key_top
    !!----------------------------------------------------------------------
@@ -16 +28 @@
    USE trctrp_lec      ! pasive tracers transport
    USE prtctl_trc      ! Print control for debbuging
+   USE trdmld_trc
+   USE trdmld_trc_oce
    USE agrif_top_update
    USE agrif_top_interp
@@ -55 +69 @@
       !!
       !! ** Action  : - update trb, trn
-      !!
-      !! History :
-      !!   7.0  !  91-11  (G. Madec)  Original code
-      !!        !  93-03  (M. Guyon)  symetrical conditions
-      !!        !  95-02  (M. Levy)   passive tracers 
-      !!        !  96-02  (G. Madec & M. Imbard)  opa release 8.0
-      !!   8.0  !  96-04  (A. Weaver)  Euler forward step
-      !!   8.2  !  99-02  (G. Madec, N. Grima)  semi-implicit pressure grad.
-      !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
-      !!        !  02-11  (C. Talandier, A-M Treguier) Open boundaries
-      !!   9.0  !  04-03  (C. Ethe) passive tracers 
       !!----------------------------------------------------------------------
       !! * Arguments
+      USE oce_trc, ONLY : ztrtrd => ua      ! use ua as a 3D workspace
       INTEGER, INTENT( in ) ::   kt         ! ocean time-step index
       !! * Local declarations
@@ -130 +134 @@
                      END DO
                   END DO
+                  IF( l_trdtrc )   ztrtrd(:,:,:) = 0.e0           !    no trend
                ELSE
+                  IF( l_trdtrc ) THEN                             !    Asselin trend
+                     DO jj = 1, jpj
+                        DO ji = 1, jpi
+                           ztrtrd(ji,jj,jk) = atfp * ( trb(ji,jj,jk,jn) - 2*trn(ji,jj,jk,jn) + tra(ji,jj,jk,jn) )
+                        END DO
+                     END DO
+                  ENDIF
+
                   DO jj = 1, jpj
                      DO ji = 1, jpi
@@ -139 +152 @@
                   END DO
                ENDIF
-
-            ELSE
-!  case of smolar scheme or muscl
+            ELSE                                                  ! >> EULER-FORWARD schemes (SMOLAR, MUSCL)
+               IF( l_trdtrc ) ztrtrd(:,:,:) = 0.e0                !    no trend
+
                DO jj = 1, jpj
                   DO ji = 1, jpi
@@ -154 +167 @@
          END DO                                           !   End of slab
          !                                                ! ===============
-      END DO
+
+         IF( l_trdtrc ) THEN                                      ! trends
+            DO jk = 1, jpk
+               zfact = 2. * rdttra(jk) * FLOAT(ndttrc)
+               ztrtrd(:,:,jk) = ztrtrd(:,:,jk) / zfact            ! n.b. ztrtrd=0 in Euler-forward case
+            END DO
+            IF (luttrd(jn)) CALL trd_mod_trc( ztrtrd, jn, jptrc_trd_atf, kt )
+         ENDIF
+         !                                                        ! ===========
+      END DO                                                      ! tracer loop
+      !                                                           ! ===========
 
       IF(ln_ctl)   THEN  ! print mean trends (used for debugging)