Changeset 216 for trunk/NEMO/OPA_SRC/TRA/traldf_lap.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/traldf_lap.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/TRA/traldf_lap.F90

@@ -13 +13 @@
    USE dom_oce         ! ocean space and time domain
    USE ldftra_oce      ! ocean active tracers: lateral physics
-   USE trdtra_oce      ! ocean active tracer trends
+   USE trdmod          ! ocean active tracers trends 
+   USE trdmod_oce      ! ocean variables trends
    USE in_out_manager  ! I/O manager
    USE diaptr          ! poleward transport diagnostics
@@ -56 +57 @@
       !! ** Action  : - Update (ta,sa) arrays with the before iso-level 
       !!                harmonic mixing trend.
-      !!              - Save the trends in (ttrd,strd) ('key_diatrends')
+      !!              - Save the trends in (ztdta,ztdsa) ('key_trdtra')
       !!
       !! History :
@@ -64 +65 @@
       !!        !  96-01  (G. Madec)  statement function for e3
       !!   8.5  !  02-06  (G. Madec)  F90: Free form and module
+      !!   9.0  !  04-08  (C. Talandier) New trends organization
       !!----------------------------------------------------------------------
       USE oce              , ztu => ua,  &  ! use ua as workspace
@@ -80 +82 @@
          zabe1, zabe2, zbtr, zta, zsa     ! temporary scalars
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
-         ztv, zsv               ! workspace
+         ztv, zsv,                      &  ! temporary workspace arrays
+         ztdta, ztdsa                      !    "         "
       !!----------------------------------------------------------------------
       
@@ -92 +95 @@
       ENDIF
       
+      ! Save ta and sa trends
+      IF( l_trdtra )   THEN
+         ztdta(:,:,:) = ta(:,:,:) 
+         ztdsa(:,:,:) = sa(:,:,:) 
+      ENDIF
+
       !                                                  ! =============
       DO jk = 1, jpkm1                                   ! Vertical slab
@@ -131 +140 @@
                ta(ji,jj,jk) = ta(ji,jj,jk) + zta
                sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
-#if defined key_trdtra || defined key_trdmld
-               ! save the horizontal diffusive trends
-               ttrd(ji,jj,jk,3) = zta
-               strd(ji,jj,jk,3) = zsa
-#endif
             END DO  
          END DO  
@@ -141 +145 @@
       END DO                                             !  End of slab  
       !                                                  ! =============
+
+      ! save the trends for diagnostic
+      ! save the horizontal diffusive trends
+      IF( l_trdtra )   THEN
+         ztdta(:,:,:) = ta(:,:,:) - ztdta(:,:,:)
+         ztdsa(:,:,:) = sa(:,:,:) - ztdsa(:,:,:)
+
+         CALL trd_mod(ztdta, ztdsa, jpttdldf, 'TRA', kt)
+      ENDIF
 
       IF(l_ctl) THEN         ! print mean trends (used for debugging)