Changeset 216 for trunk/NEMO/OPA_SRC/TRA/tranpc.F90

Timestamp:

2005-03-17T15:02:38+01:00 (19 years ago)

Author:

opalod

Message:

CT : UPDATE151 : New trends organization

File:

• trunk/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/TRA/tranpc.F90

@@ -12 +12 @@
    USE oce             ! ocean dynamics and active tracers 
    USE dom_oce         ! ocean space and time domain
-   USE trdtra_oce     ! ocean active tracer trends
-   USE in_out_manager  ! I/O manager
-
+   USE trdmod          ! ocean active tracer trends
+   USE trdmod_oce      ! ocean variables trends
    USE eosbn2          ! equation of state (eos routine) 
    USE lbclnk          ! lateral boundary conditions (or mpp link)
+   USE in_out_manager  ! I/O manager
 
    IMPLICIT NONE
@@ -22 +22 @@
 
    !! * Routine accessibility
-   PUBLIC tra_npc    ! routine called by step.F90
+   PUBLIC tra_npc      ! routine called by step.F90
 
    !! * Module variable
-   INTEGER ::      &
-      nnpc1 =   1,      &  ! nnpc1   non penetrative convective scheme frequency
-      nnpc2 =  15          ! nnpc2   non penetrative convective scheme print frequency
+   INTEGER ::       &
+      nnpc1 =   1,  &  ! nnpc1   non penetrative convective scheme frequency
+      nnpc2 =  15      ! nnpc2   non penetrative convective scheme print frequency
 
    !! * Substitutions
@@ -68 +68 @@
       !!                                  suppression of common work arrays
       !!   8.5  !  02-06  (G. Madec)  free form F90
-      !!----------------------------------------------------------------------
+      !!   9.0  !  04-08  (C. Talandier) New trends organization
+      !!----------------------------------------------------------------------
+      !! * Modules used     
+      USE oce, ONLY :    ztdta => ua,   & ! use ua as 3D workspace   
+                         ztdsa => va      ! use va as 3D workspace   
+
       !! * Arguments
       INTEGER, INTENT( in ) ::   kt       ! ocean time-step index
@@ -75 +80 @@
       INTEGER ::   ji, jj, jk             ! dummy loop indices
       INTEGER ::   &
-         inpcc ,      &  ! number of statically instable water column
-         inpci ,      &  ! number of iteration for npc scheme
-         jiter, jkdown, jkp,   &
-         ikbot, ik, ikup, ikdown
-      REAL(wp) ::   &           ! temporary arrays
+         inpcc ,                        & ! number of statically instable water column
+         inpci ,                        & ! number of iteration for npc scheme
+         jiter, jkdown, jkp,            & ! ???
+         ikbot, ik, ikup, ikdown          ! ???
+      REAL(wp) ::   &                     ! temporary arrays
          ze3tot, zta, zsa, zraua, ze3dwn
       REAL(wp), DIMENSION(jpi,jpk) ::   &
@@ -100 +105 @@
          CALL eos( tn, sn, rhd, zrhop )
 
+         ! Save tn and sn trends
+         IF( l_trdtra )   THEN
+            ztdta(:,:,:) = tn(:,:,:) 
+            ztdsa(:,:,:) = sn(:,:,:) 
+         ENDIF
+
          !                                                ! ===============
          DO jj = 1, jpj                                   !  Vertical slab
@@ -144 +155 @@
             inpcc = inpcc + NINT( zwz(1,1) )
 
-#   if defined key_trdtra
-            ! save the tracer trends
-            DO jk = 1, jpk
-               DO ji = 1, jpi
-                  ttrd(ji,jj,jk,5) = tn(ji,jj,jk)
-                  strd(ji,jj,jk,5) = sn(ji,jj,jk)
-               END DO
-            END DO
-#   endif
 
             ! 2. Vertical mixing for each instable portion of the density profil
@@ -226 +228 @@
 
             ENDIF
-
-#   if defined key_trdtra
-            ! Non penetrative mixing trends
-            ! -----------------------------
-            DO jk = 1, jpk
-               DO ji = 1, jpi
-                  ttrd(ji,jj,jk,5) = tn(ji,jj,jk) - ttrd(ji,jj,jk,5)
-                  strd(ji,jj,jk,5) = sn(ji,jj,jk) - strd(ji,jj,jk,5)
-               END DO
-            END DO
-#   endif
-
             !                                             ! ===============
          END DO                                           !   End of slab
          !                                                ! ===============
+
+
+         ! save the trends for diagnostic
+         ! Non penetrative mixing trends
+         IF( l_trdtra )   THEN
+            ztdta(:,:,:) = tn(:,:,:) - ztdta(:,:,:)
+            ztdsa(:,:,:) = sn(:,:,:) - ztdsa(:,:,:)
+
+            CALL trd_mod(ztdta, ztdsa, jpttdnpc, 'TRA', kt)
+         ENDIF
       
          ! Lateral boundary conditions on ( tn, sn )   ( Unchanged sign)