Changeset 8762 for branches/2017/dev_r8624_AGRIF3_VVL/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

Timestamp:

2017-11-21T11:15:35+01:00 (6 years ago)

Author:

jchanut

Message:

AGRIF + vvl: Final changes, update SETTE tests (these are ok except SAS) - #1965

File:

• branches/2017/dev_r8624_AGRIF3_VVL/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) (1 diff)

branches/2017/dev_r8624_AGRIF3_VVL/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -207 +207 @@
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               avmu(ji,jj,jk) = 0.5_wp * ( avm(ji,jj,jk) + avm(ji+1,jj,jk) )   &
+!               avmu(ji,jj,jk) =   avmu(ji,jj,jk) &
+               avmu(ji,jj,jk) = 0.5_wp * ( avm(ji,jj,jk) + avm(ji+1,jj,jk) ) * umask(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) )
-               avmv(ji,jj,jk) = 0.5_wp * ( avm(ji,jj,jk) + avm(ji,jj+1,jk) )   & 
+!               avmv(ji,jj,jk) =   avmv(ji,jj,jk) &
+               avmv(ji,jj,jk) = 0.5_wp * ( avm(ji,jj,jk) + avm(ji,jj+1,jk) ) * vmask(ji,jj,jk)  & 
                   &                    * ( vn(ji,jj,jk-1) - vn(ji,jj,jk)   )   &
                   &                    * ( vb(ji,jj,jk-1) - vb(ji,jj,jk) )     &