Changeset 7997 for branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfsh2.F90

Timestamp:

2017-05-08T11:24:47+02:00 (7 years ago)

Author:

gm

Message:

#1880 (HPC-09) - step-5: bug correction + optimisation in zdfsh2.F90

File:

• branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfsh2.F90 (modified) (1 diff)

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfsh2.F90

@@ -58 +58 @@
       !
       DO jk = 2, jpkm1
-         DO jj = 1, jpjm1        !* Shear production at uw- and vw-points (energy conserving form)
+         DO jj = 1, jpjm1        !* 2 x shear production at uw- and vw-points (energy conserving form)
             DO ji = 1, jpim1
-               zsh2u(ji,jj) = 0.5 * ( avm(ji+1,jj,jk) + avm(ji,jj,jk) ) * wumask(ji,jj,jk)  &
-                  &               * (  un(ji,jj,jk-1) -  un(ji,jj,jk) )   &
-                  &               * (  ub(ji,jj,jk-1) -  ub(ji,jj,jk) ) / ( e3uw_n(ji,jj,jk) * e3uw_b(ji,jj,jk) )
-               zsh2v(ji,jj) = 0.5 * ( avm(ji,jj+1,jk) + avm(ji,jj,jk) ) * wvmask(ji,jj,jk)  &
-                  &               * (  vn(ji,jj,jk-1) -  vn(ji,jj,jk) )   &
-                  &               * (  vb(ji,jj,jk-1) -  vb(ji,jj,jk) ) / ( e3vw_n(ji,jj,jk) * e3vw_b(ji,jj,jk) )
+               zsh2u(ji,jj) = ( avm(ji+1,jj,jk) + avm(ji,jj,jk) ) &
+                  &         * (  un(ji,jj,jk-1) -  un(ji,jj,jk) ) &
+                  &         * (  ub(ji,jj,jk-1) -  ub(ji,jj,jk) ) / ( e3uw_n(ji,jj,jk) * e3uw_b(ji,jj,jk) ) * wumask(ji,jj,jk) 
+               zsh2v(ji,jj) = ( avm(ji,jj+1,jk) + avm(ji,jj,jk) ) &
+                  &         * (  vn(ji,jj,jk-1) -  vn(ji,jj,jk) ) &
+                  &         * (  vb(ji,jj,jk-1) -  vb(ji,jj,jk) ) / ( e3vw_n(ji,jj,jk) * e3vw_b(ji,jj,jk) ) * wvmask(ji,jj,jk)
             END DO
          END DO
          DO jj = 2, jpjm1        !* shear production at w-point
-            DO ji = 2, jpim1
-               !
-!!gm original type of coding
-!              psh2(ji,jj,jk) = ( zsh2u(ji-1,jj) + zsh2u(ji,jj) ) / MAX( 1._wp , umask(ji-1,jj,jk)+umask(ji,jj,jk) )   &
-!                 &           + ( zsh2v(ji,jj-1) + zsh2v(ji,jj) ) / MAX( 1._wp , vmask(ji,jj-1,jk)+vmask(ji,jj,jk) )    
-!
-!!gm optimized but it changes the last digits after 1 year of GYRE
-               !                       ! coast mask: =1 at the coast ; =2 otherwise
-               !                       ! no need of wmask as zsh2 are already masked
-               psh2(ji,jj,jk) = ( zsh2u(ji-1,jj) + zsh2u(ji,jj) ) * ( 2._wp - umask(ji-1,jj,jk) * umask(ji,jj,jk) )   &
-                  &           + ( zsh2v(ji,jj-1) + zsh2v(ji,jj) ) * ( 2._wp - vmask(ji,jj-1,jk) * vmask(ji,jj,jk) )
+            DO ji = 2, jpim1           ! coast mask: =2 at the coast ; =1 otherwise (NB: wmask useless as zsh2 are masked)
+               psh2(ji,jj,jk) = 0.25 * (   ( zsh2u(ji-1,jj) + zsh2u(ji,jj) ) * ( 2. - umask(ji-1,jj,jk) * umask(ji,jj,jk) )   &
+                  &                      + ( zsh2v(ji,jj-1) + zsh2v(ji,jj) ) * ( 2. - vmask(ji,jj-1,jk) * vmask(ji,jj,jk) )   )
             END DO
          END DO