Changeset 3211 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

Timestamp:

2011-12-11T16:00:26+01:00 (13 years ago)

Author:

spickles2

Message:

Stephen Pickles, 11 Dec 2011

Commit to bring the rest of the DCSE NEMO development branch
in line with the latest development version. This includes
array index re-ordering of all OPA_SRC/.

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) (4 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -24 +24 @@
 
    PUBLIC   dyn_keg    ! routine called by step module
+
+   !! * Control permutation of array indices
+#  include "oce_ftrans.h90"
+#  include "dom_oce_ftrans.h90"
    
    !! * Substitutions
@@ -55 +59 @@
       USE oce     , ONLY:   ztrdu => ta       , ztrdv => sa   ! (ta,sa) used as 3D workspace   
       USE wrk_nemo, ONLY:   zhke  => wrk_3d_1                 ! 3D workspace
+      !! DCSE_NEMO: need additional directives for renamed module variables
+!FTRANS ztrdu ztrdv zhke :I :I :z
+
       !!
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
@@ -77 +84 @@
       ENDIF
       
+#if defined key_z_first
+      DO jj = 2, jpj            ! Horizontal kinetic energy at T-point
+         DO ji = 2, jpi
+            DO jk = 1, jpkm1
+               zhke(ji,jj,jk) = 0.25 * (   un(ji-1,jj  ,jk) * un(ji-1,jj  ,jk)   &
+                  &                      + un(ji  ,jj  ,jk) * un(ji  ,jj  ,jk)   &
+                                         + vn(ji  ,jj-1,jk) * vn(ji  ,jj-1,jk)   &
+                  &                      + vn(ji  ,jj  ,jk) * vn(ji  ,jj  ,jk)   )
+            END DO  
+         END DO  
+      END DO
+      DO jj = 2, jpjm1          ! add the gradient of kinetic energy to the general momentum trends
+         DO ji = 2, jpim1
+            DO jk = 1, jpkm1
+               ua(ji,jj,jk) = ua(ji,jj,jk) - ( zhke(ji+1,jj  ,jk) - zhke(ji,jj,jk) ) / e1u(ji,jj)
+               va(ji,jj,jk) = va(ji,jj,jk) - ( zhke(ji  ,jj+1,jk) - zhke(ji,jj,jk) ) / e2v(ji,jj)
+            END DO 
+         END DO
+      END DO
+#else
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab
@@ -126 +153 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+#endif
 
       IF( l_trddyn ) THEN      ! save the Kinetic Energy trends for diagnostic