Changeset 7063 for branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90

Timestamp:

2016-10-21T15:11:17+02:00 (8 years ago)

Author:

timgraham

Message:

Fixes to get kinetic energy from GM & potential energy from vertical mixing to work with VVL

File:

• branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) (3 diffs)

branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90

@@ -105 +105 @@
       ENDIF
       !
+      zke(:,:,jpk) = 0._wp
+      zke(1,:, : ) = 0._wp
       zke(:,1, : ) = 0._wp
       DO jk = 1, jpkm1
@@ -200 +202 @@
             ! S = isoneutral slope.
             ! Most terms are on W grid so work on this grid
+            CALL wrk_alloc( jpi, jpj, zke2d )
             zke2d(:,:) = 0._wp
             DO jk = 1,jpk
@@ -207 +210 @@
                           &                      * ( wslpi(ji, jj, jk) * wslpi(ji,jj,jk)    &
                           &                      +   wslpj(ji, jj, jk) * wslpj(ji,jj,jk) )  &
-                          &                      *   bn2(ji,jj,jk) * fse3w(ji, jj, jk)
+                          &                      *   rn2(ji,jj,jk) * fse3w(ji, jj, jk)
                   ENDDO
                ENDDO
             ENDDO
-            iom_put("ketrd_eiv", zke2d)
+            CALL iom_put("ketrd_eiv", zke2d)
+            CALL wrk_dealloc( jpi, jpj, zke2d )
          !
       END SELECT