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

trunk/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -12 +12 @@
    USE dom_oce         ! ocean space and time domain
    USE in_out_manager  ! I/O manager
-   USE trddyn_oce      ! dynamics trends diagnostics
+   USE trdmod          ! ocean dynamics trends 
+   USE trdmod_oce      ! ocean variables trends
 
    IMPLICIT NONE
@@ -50 +51 @@
       !!   7.0  !  97-05  (G. Madec)  Split dynber into dynkeg and dynhpg
       !!   9.0  !  02-07  (G. Madec)  F90: Free form and module
+      !!    "   !  04-08  (C. Talandier) New trends organization
       !!----------------------------------------------------------------------
-      !! * modules used     
-      USE oce, ONLY :   zhke => ta      ! use ta as 3D workspace   
+      !! * Modules used     
+      USE oce, ONLY :    ztdua => ta,   & ! use ta as 3D workspace   
+                         ztdva => sa      ! use sa as 3D workspace   
 
       !! * Arguments
@@ -60 +63 @@
       INTEGER  ::   ji, jj, jk          ! dummy loop indices
       REAL(wp) ::   zua, zva, zu, zv    ! temporary scalars
-#if defined key_trddyn_new
-      REAL(wp) ::   zuu, zvv            ! temporary scalars
-      REAL(wp), DIMENSION(jpi,jpj) ::   &
-         zvke, zuke                     ! temporary workspace
-#endif
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
+         zhke                           ! temporary workspace
       !!----------------------------------------------------------------------
 
@@ -71 +71 @@
          IF(lwp) WRITE(numout,*) 'dyn_keg : kinetic energy gradient trend'
          IF(lwp) WRITE(numout,*) '~~~~~~~'
+      ENDIF
+
+      ! Save ua and va trends
+      IF( l_trddyn )   THEN
+         ztdua(:,:,:) = ua(:,:,:) 
+         ztdva(:,:,:) = va(:,:,:) 
       ENDIF
       
@@ -84 +90 @@
                             + un(ji  ,jj  ,jk) * un(ji  ,jj  ,jk)  )
                zhke(ji,jj,jk) = zv + zu
-#if defined key_trddyn_new
-               zvke(ji,jj) = zv
-               zuke(ji,jj) = zu
-#endif
             END DO  
          END DO  
@@ -100 +102 @@
                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
-               ! add to the general momentum trends
-               utrd(ji,jj,jk,2) = zua
-               vtrd(ji,jj,jk,2) = zva
-#endif
-#if defined key_trddyn_new
-               zuu = -( zuke(ji+1,jj  ) - zuke(ji,jj) ) / e1u(ji,jj)
-               zvv = -( zvke(ji  ,jj+1) - zvke(ji,jj) ) / e2v(ji,jj)
-               utrd(ji,jj,jk,2) = zua - zuu
-               vtrd(ji,jj,jk,3) = zva - zvv
-               utrd(ji,jj,jk,3) = zuu
-               vtrd(ji,jj,jk,2) = zvv
-#endif
             END DO 
          END DO
@@ -118 +107 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+
+      ! save the Kinetic Energy trends for diagnostic
+      ! momentum trends
+      IF( l_trddyn )   THEN
+         ztdua(:,:,:) = ua(:,:,:) - ztdua(:,:,:)
+         ztdva(:,:,:) = va(:,:,:) - ztdva(:,:,:)
+
+         CALL trd_mod(ztdua, ztdva, jpdtdkeg, 'DYN', kt)
+      ENDIF
 
       IF(l_ctl) THEN         ! print sum trends (used for debugging)