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

trunk/NEMO/OPA_SRC/DYN/dynzad.F90

@@ -12 +12 @@
    USE dom_oce         ! ocean space and time domain
    USE in_out_manager  ! I/O manager
-   USE trddyn_oce     ! dynamics trends diagnostics variables
-   USE flxrnf          ! ???
+   USE trdmod          ! ocean dynamics trends 
+   USE trdmod_oce      ! ocean variables trends
+   USE flxrnf          ! ocean runoffs
 
    IMPLICIT NONE
@@ -57 +58 @@
       !!   7.5  !  96-01  (G. Madec) statement function for e3
       !!   8.5  !  02-07  (G. Madec) Free form, F90
+      !!   9.0  !  04-08  (C. Talandier) New trends organization
       !!----------------------------------------------------------------------
       !! * modules used
@@ -70 +72 @@
       REAL(wp), DIMENSION(jpi) ::   &
          zww                           ! temporary workspace
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
+         ztdua, ztdva                  ! temporary workspace
       !!----------------------------------------------------------------------
       
@@ -76 +80 @@
          IF(lwp) WRITE(numout,*) 'dyn_zad : arakawa advection scheme'
          IF(lwp) WRITE(numout,*) '~~~~~~~   Auto-tasking case, j-slab, no vector opt.'
+      ENDIF
+
+      ! Save ua and va trends
+      IF( l_trddyn )   THEN
+         ztdua(:,:,:) = ua(:,:,:) 
+         ztdva(:,:,:) = va(:,:,:) 
       ENDIF
 
@@ -115 +125 @@
                ua(ji,jj,jk) = ua(ji,jj,jk) + zua
                va(ji,jj,jk) = va(ji,jj,jk) + zva
-#   if defined key_trddyn || defined key_trd_vor
-               ! save the trends for diagnostics
-               utrd(ji,jj,jk,6) = zua
-               vtrd(ji,jj,jk,6) = zva
-#   endif
             END DO  
          END DO  
@@ -125 +130 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+
+      ! save the vertical advection trends for diagnostic
+      ! momentum trends
+      IF( l_trddyn )   THEN
+         ztdua(:,:,:) = ua(:,:,:) - ztdua(:,:,:)
+         ztdva(:,:,:) = va(:,:,:) - ztdva(:,:,:)
+
+         CALL trd_mod(ztdua, ztdva, jpdtdzad, 'DYN', kt)
+      ENDIF
 
       IF(l_ctl) THEN         ! print sum trends (used for debugging)
@@ -170 +184 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   &
          zww                           ! temporary  workspace
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
+         ztdua, ztdva                  ! temporary workspace
       !!----------------------------------------------------------------------
       
@@ -176 +192 @@
          IF(lwp)WRITE(numout,*) 'dyn_zad : arakawa advection scheme'
          IF(lwp)WRITE(numout,*) '~~~~~~~   vector optimization k-j-i loop'
+      ENDIF
+
+      ! Save ua and va trends
+      IF( l_trddyn )   THEN
+         ztdua(:,:,:) = ua(:,:,:) 
+         ztdva(:,:,:) = va(:,:,:) 
       ENDIF
       
@@ -218 +240 @@
                ua(ji,jj,jk) = ua(ji,jj,jk) + zua
                va(ji,jj,jk) = va(ji,jj,jk) + zva
-#   if defined key_trddyn || defined key_trd_vor
-               ! save the trends for diagnostics
-               utrd(ji,jj,jk,6) = zua
-               vtrd(ji,jj,jk,6) = zva
-#   endif
             END DO  
          END DO  
       END DO
+
+      ! save the vertical advection trends for diagnostic
+      ! momentum trends
+      IF( l_trddyn )   THEN
+         ztdua(:,:,:) = ua(:,:,:) - ztdua(:,:,:)
+         ztdva(:,:,:) = va(:,:,:) - ztdva(:,:,:)
+
+         CALL trd_mod(ztdua, ztdva, jpdtdzad, 'DYN', kt)
+      ENDIF
 
       IF(l_ctl) THEN         ! print sum trends (used for debugging)