Changeset 4840

Timestamp:

2014-11-10T18:40:48+01:00 (9 years ago)

Author:

cetlod

Message:

bugfix on trunk:allocate and compute the kinetic energy in NEMO - rke -, see ticket #1410

Location:

trunk/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diawri.F90 (modified) (1 diff)
• oce.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -208 +208 @@
       CALL iom_put( "heatc", z2d )    ! vertically integrated heat content (J/m2)
       CALL iom_put( "saltc", z2ds )   ! vertically integrated salt content (PSU*kg/m2)
-      
+  
+      !
+      rke(:,:,jk) = 0._wp                               !      kinetic energy 
+      DO jk = 1, jpkm1
+         DO jj = 2, jpjm1
+            DO ji = fs_2, fs_jpim1   ! vector opt.
+               zztmp   = 1._wp / ( e1e2t(ji,jj) * fse3t(ji,jj,jk) )
+               zztmpx  = 0.5 * (  un(ji-1,jj,jk) * un(ji-1,jj,jk) * e2u(ji-1,jj) * fse3u(ji-1,jj,jk)    &
+                  &             + un(ji  ,jj,jk) * un(ji  ,jj,jk) * e2u(ji  ,jj) * fse3u(ji  ,jj,jk) )  &
+                  &          *  zztmp 
+               !
+               zztmpy  = 0.5 * (  vn(ji,jj-1,jk) * vn(ji,jj-1,jk) * e1v(ji,jj-1) * fse3v(ji,jj-1,jk)    &
+                  &             + vn(ji,jj  ,jk) * vn(ji,jj  ,jk) * e1v(ji,jj  ) * fse3v(ji,jj  ,jk) )  &
+                  &          *  zztmp 
+               !
+               rke(ji,jj,jk) = 0.5_wp * ( zztmpx + zztmpy )
+               !
+            ENDDO
+         ENDDO
+      ENDDO
+      CALL lbc_lnk( rke, 'T', 1. )
+      CALL iom_put( "eken", rke )           
 
       IF( lk_diaar5 ) THEN

trunk/NEMOGCM/NEMO/OPA_SRC/oce.F90

@@ -85 +85 @@
       ALLOCATE(rhd (jpi,jpj,jpk) ,                                         &
          &     rhop(jpi,jpj,jpk) ,                                         &
+         &     rke(jpi,jpj,jpk)  ,                                         &
          &     sshb(jpi,jpj)     , sshn(jpi,jpj)   , ssha(jpi,jpj)   ,     &
          &     ub_b(jpi,jpj)     , un_b(jpi,jpj)   , ua_b(jpi,jpj)   ,     &