Changeset 12844 for NEMO/branches/2020/r12581_ticket2418/src/OCE/ZDF

Timestamp:

2020-05-01T12:57:50+02:00 (4 years ago)

Author:

smasson

Message:

r12581_ticket2418: merge with trunk@12843, see #2418

File:

• NEMO/branches/2020/r12581_ticket2418/src/OCE/ZDF/zdftke.F90 (modified) (3 diffs)

NEMO/branches/2020/r12581_ticket2418/src/OCE/ZDF/zdftke.F90

@@ -214 +214 @@
       !                     !  Surface/top/bottom boundary condition on tke
       !                     !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      
+      ! 
       DO_2D_00_00
          en(ji,jj,1) = MAX( rn_emin0, zbbrau * taum(ji,jj) ) * tmask(ji,jj,1)
       END_2D
-      IF ( ln_isfcav ) THEN
-         DO_2D_00_00
-            en(ji,jj,mikt(ji,jj)) = rn_emin * tmask(ji,jj,1)
-         END_2D
-      ENDIF
       !
       !                     !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@@ -249 +244 @@
                zetop = - 0.001875_wp * rCdU_top(ji,jj) * SQRT(  ( zmsku*( uu(ji,jj,mikt(ji,jj),Kbb)+uu(ji-1,jj,mikt(ji,jj),Kbb) ) )**2  &
                   &                                           + ( zmskv*( vv(ji,jj,mikt(ji,jj),Kbb)+vv(ji,jj-1,mikt(ji,jj),Kbb) ) )**2  )
-               en(ji,jj,mikt(ji,jj)) = MAX( zetop, rn_emin ) * (1._wp - tmask(ji,jj,1))   ! masked at ocean surface
+               ! (1._wp - tmask(ji,jj,1)) * ssmask(ji,jj) = 1 where ice shelves are present
+               en(ji,jj,mikt(ji,jj)) = en(ji,jj,1)           * tmask(ji,jj,1) &
+                  &                  + MAX( zetop, rn_emin ) * (1._wp - tmask(ji,jj,1)) * ssmask(ji,jj)
             END_2D
          ENDIF
@@ -518 +515 @@
       IF( nn_pdl == 1 ) THEN      !* Prandtl number case: update avt
          DO_3D_00_00( 2, jpkm1 )
-            p_avt(ji,jj,jk)   = MAX( apdlr(ji,jj,jk) * p_avt(ji,jj,jk), avtb_2d(ji,jj) * avtb(jk) ) * tmask(ji,jj,jk)
+            p_avt(ji,jj,jk)   = MAX( apdlr(ji,jj,jk) * p_avt(ji,jj,jk), avtb_2d(ji,jj) * avtb(jk) ) * wmask(ji,jj,jk)
          END_3D
       ENDIF