Changeset 14250 for NEMO/branches/UKMO/NEMO_4.0.4_CO9_package/src/OCE/ZDF/zdfgls.F90

Timestamp:

2020-12-24T07:20:29+01:00 (4 years ago)

Author:

deazer

Message:

Some bug fixes for bdy, adds tides and bug fix gls

File:

• NEMO/branches/UKMO/NEMO_4.0.4_CO9_package/src/OCE/ZDF/zdfgls.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_CO9_package/src/OCE/ZDF/zdfgls.F90

@@ -188 +188 @@
          DO jj = 2, jpjm1                      ! bottom friction
             DO ji = fs_2, fs_jpim1   ! vector opt.         
-               zmsku = ( 2._wp - umask(ji-1,jj,mbkt(ji,jj)) * umask(ji,jj,mbkt(ji,jj)) )
-               zmskv = ( 2._wp - vmask(ji,jj-1,mbkt(ji,jj)) * vmask(ji,jj,mbkt(ji,jj)) )     ! (CAUTION: CdU<0)
+               zmsku = 0.5*( 2._wp - umask(ji-1,jj,mbkt(ji,jj)) * umask(ji,jj,mbkt(ji,jj)) )
+               zmskv = 0.5*( 2._wp - vmask(ji,jj-1,mbkt(ji,jj)) * vmask(ji,jj,mbkt(ji,jj)) )     ! (CAUTION: CdU<0)
                ustar2_bot(ji,jj) = - rCdU_bot(ji,jj) * SQRT(  ( zmsku*( ub(ji,jj,mbkt(ji,jj))+ub(ji-1,jj,mbkt(ji,jj)) ) )**2  &
                   &                                         + ( zmskv*( vb(ji,jj,mbkt(ji,jj))+vb(ji,jj-1,mbkt(ji,jj)) ) )**2  )
@@ -406 +406 @@
                !
                z_en =  MAX( rc02r * ustar2_bot(ji,jj), rn_emin )
+
+!CEOD This is not set in default code .. bug.
+               en(ji,jj,ibot) = MAX( rc02r * ustar2_bot(ji,jj), rn_emin )
+
                !
                ! Bottom level Dirichlet condition: