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

trunk/NEMO/OPA_SRC/TRA/tradmp.F90

@@ -17 +17 @@
    USE oce             ! ocean dynamics and tracers variables
    USE dom_oce         ! ocean space and time domain variables
-   USE trdtra_oce      ! ocean active tracer trend variables
+   USE trdmod          ! ocean active tracers trends 
+   USE trdmod_oce      ! ocean variables trends
    USE zdf_oce         ! ocean vertical physics
    USE in_out_manager  ! I/O manager
@@ -24 +25 @@
    USE dtasal          ! salinity data
    USE zdfmxl          ! mixed layer depth
-   USE lib_mpp         ! ???
+   USE lib_mpp         ! distribued memory computing
 
    IMPLICIT NONE
@@ -85 +86 @@
       !!        !  97-05  (G. Madec)  macro-tasked on jk-slab
       !!   8.5  !  02-08  (G. Madec)  free form + modules
-      !!----------------------------------------------------------------------
+      !!   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
+      INTEGER, INTENT( in ) ::   kt       ! ocean time-step index
 
       !! * Local declarations
-      INTEGER  ::   ji, jj, jk         ! dummy loop indices
-      REAL(wp) ::   ztest, zta, zsa    ! temporary scalars
+      INTEGER  ::   ji, jj, jk            ! dummy loop indices
+      REAL(wp) ::   ztest, zta, zsa       ! temporary scalars
       !!----------------------------------------------------------------------
 
@@ -97 +103 @@
       !    --------------
       IF( kt == nit000 ) CALL tra_dmp_init
+
+      ! Save ta and sa trends
+      IF( l_trdtra )   THEN
+         ztdta(:,:,:) = ta(:,:,:) 
+         ztdsa(:,:,:) = sa(:,:,:) 
+      ENDIF
 
       ! 1. Newtonian damping trends on tracer fields
@@ -115 +127 @@
                   ! save the salinity trend (used in flx to close the salt budget)
                   strdmp(ji,jj,jk) = zsa
-#    if defined key_trdtra
-                  ! save the trends for diagnostics
-                  ttrd(ji,jj,jk,6) = zta
-                  strd(ji,jj,jk,6) = zsa
-#    endif
                END DO
             END DO
@@ -141 +148 @@
                   ! save the salinity trend (used in flx to close the salt budget)
                   strdmp(ji,jj,jk) = zsa
-#    if defined key_trdtra
-                  ! save the trends for diagnostics
-                  ttrd(ji,jj,jk,6) = zta
-                  strd(ji,jj,jk,6) = zsa
-#    endif
                END DO
             END DO
@@ -166 +168 @@
                   ! save the salinity trend (used in flx to close the salt budget)
                   strdmp(ji,jj,jk) = zsa
-#    if defined key_trdtra
-                  ! save the trends for diagnostics
-                  ttrd(ji,jj,jk,6) = zta
-                  strd(ji,jj,jk,6) = zsa
-#    endif
                END DO
             END DO
@@ -176 +173 @@
 
       END SELECT
+
+      ! save the trends for diagnostic
+      ! damping salinity trends
+      IF( l_trdtra )   THEN
+         ztdta(:,:,:) = ta(:,:,:) - ztdta(:,:,:)
+         ztdsa(:,:,:) = sa(:,:,:) - ztdsa(:,:,:)
+         CALL trd_mod(ztdta, ztdsa, jpttddoe, 'TRA', kt)
+      ENDIF
 
       IF(l_ctl) THEN         ! print mean trends (used for debugging)