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

trunk/NEMO/OPA_SRC/TRA/trazdf_imp.F90

@@ -13 +13 @@
    USE dom_oce         ! ocean space and time domain
    USE zdf_oce         ! ocean vertical physics
-   USE ldftra_oce      ! ???
+   USE ldftra_oce      ! ocean active tracers: lateral physics
    USE zdfddm          ! ocean vertical physics: double diffusion
-   USE trdtra_oce      ! tracers trends diagnostics 
+   USE trdmod          ! ocean active tracers trends 
+   USE trdmod_oce      ! ocean variables trends
    USE in_out_manager  ! I/O manager
 
@@ -67 +68 @@
       !!        !  00-08  (G. Madec)  double diffusive mixing
       !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
+      !!   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
@@ -74 +80 @@
       INTEGER ::   ji, jj, jk                 ! dummy loop indices
       INTEGER ::   ikst, ikenm2, ikstp1
+      REAL(wp)  ::   zta, zsa                 ! temporary scalars
       REAL(wp), DIMENSION(jpi,jpk) ::   &
          zwd, zws, zwi,          &  ! ???
          zwx, zwy, zwz, zwt         ! ???
-#if defined key_trdtra   ||   defined key_trdmld
-      REAL(wp) ::   zta, zsa        ! temporary scalars
-#endif
       !!---------------------------------------------------------------------
 
@@ -93 +97 @@
       ENDIF
 
+      ! Save ta and sa trends
+      IF( l_trdtra )   THEN
+         ztdta(:,:,:) = ta(:,:,:) 
+         ztdsa(:,:,:) = sa(:,:,:) 
+      ENDIF
+
       !                                                ! ===============
       DO jj = 2, jpjm1                                 !  Vertical slab
@@ -131 +141 @@
 #   include "zdf.matrixsolver.h90"
 
-#if defined key_trdtra   ||   defined key_trdmld
-         ! Compute and save the vertical diffusive temperature trends
-         IF( l_traldf_iso ) THEN
-            DO jk = 1, jpkm1
-               DO ji = 2, jpim1
-                  zta = ( zwx(ji,jk) - tb(ji,jj,jk) ) / r2dt(jk)
-                  ttrd(ji,jj,jk,4) = zta - ta(ji,jj,jk) + ttrd(ji,jj,jk,4)
-               END DO
-            END DO
-         ELSE
-            DO jk = 1, jpkm1
-               DO ji = 2, jpim1
-                  zta = ( zwx(ji,jk) - tb(ji,jj,jk) ) / r2dt(jk)
-                  ttrd(ji,jj,jk,4) = zta - ta(ji,jj,jk)
-               END DO
-            END DO
-         ENDIF
-
-#endif
-
          ! Save the masked temperature after in ta
          ! (c a u t i o n:  temperature not its trend, Leap-frog scheme done
@@ -197 +187 @@
 #   include "zdf.matrixsolver.h90"
 
-#if defined key_trdtra   ||   defined key_trdmld
-         ! Compute and save the vertical diffusive salinity trends
-         IF( l_traldf_iso ) THEN
-            DO jk = 1, jpkm1
-               DO ji = 2, jpim1
-                  zsa = ( zwx(ji,jk) - sb(ji,jj,jk) ) / r2dt(jk)
-                  strd(ji,jj,jk,4) = zsa - sa(ji,jj,jk) + strd(ji,jj,jk,4)
-               END DO
-            END DO
-         ELSE
-            DO jk = 1, jpkm1
-               DO ji = 2, jpim1
-                  zsa = ( zwx(ji,jk) - sb(ji,jj,jk) ) / r2dt(jk)
-                  strd(ji,jj,jk,4) = zsa - sa(ji,jj,jk)
-               END DO
-            END DO
-         ENDIF
-#endif
 
          ! Save the masked salinity after in sa
@@ -229 +201 @@
       !                                                ! ===============
 
+      ! save the trends for diagnostic
+      ! Compute and save the vertical diffusive temperature & salinity trends
+      IF( l_trdtra )   THEN
+         ! compute the vertical diffusive trends in substracting the previous 
+         ! trends ztdta()/ztdsa() to the new one computed (dT/dt or dS/dt) 
+         ! with the new temperature/salinity ta/sa
+         DO jk = 1, jpkm1
+            ztdta(:,:,jk) = ( ( ta(:,:,jk) - tb(:,:,jk) ) / r2dt(jk) )   & ! new trend
+                &           - ztdta(:,:,jk)                                ! old trend
+            ztdsa(:,:,jk) = ( ( sa(:,:,jk) - sb(:,:,jk) ) / r2dt(jk) )   & ! new trend
+                &           - ztdsa(:,:,jk)                                ! old trend
+         END DO
+
+         CALL trd_mod(ztdta, ztdsa, jpttdzdf, 'TRA', kt)
+      ENDIF
+
+      IF(l_ctl) THEN         ! print mean trends (used for debugging)
+         zta = SUM( ta(2:nictl,2:njctl,1:jpkm1) * tmask(2:nictl,2:njctl,1:jpkm1) )
+         zsa = SUM( sa(2:nictl,2:njctl,1:jpkm1) * tmask(2:nictl,2:njctl,1:jpkm1) )
+         WRITE(numout,*) ' zdf  - Ta: ', zta-t_ctl, ' Sa: ', zsa-s_ctl
+         t_ctl = zta   ;   s_ctl = zsa
+      ENDIF
+
    END SUBROUTINE tra_zdf_imp