Changeset 14774

Timestamp:

2021-04-30T12:53:12+02:00 (3 years ago)

Author:

dancopsey

Message:

Merge in revisions 14705 to 14759 of:

​http://forge.ipsl.jussieu.fr/nemo/log/NEMO/branches/NERC/dev_r11078_OSMOSIS_IMMERSE_Nurser_4.0

File:

• NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90

@@ -2054 +2054 @@
       zekman(2:jpim1,2:jpjm1) = EXP( - zek * ABS( ff_t(2:jpim1,2:jpjm1) ) * zhbl(2:jpim1,2:jpjm1) / MAX(zustar(2:jpim1,2:jpjm1), 1.e-8 ) )
 
+      zshear(:,:) = zlarge
       zshear(2:jpim1,2:jpjm1) = 0._wp
 #ifdef key_osm_debug
@@ -3317 +3318 @@
     INTEGER  ::   ji, jj, jk     ! dummy loop indices
     REAL z1_t2
+    REAL(wp) :: zlarge = -1.e10_wp, zero = 0._wp
     !!
 #ifdef key_osm_debug
@@ -3490 +3492 @@
     ENDIF
 
+    dstokes(:,:) = zlarge
     IF (nn_osm_wave == 0) THEN
        dstokes(:,:) = rn_osm_dstokes
@@ -3609 +3612 @@
           CALL iom_get( numror, jpdom_autoglo, 'hbl' , hbl , ldxios = lrxios )
           CALL iom_get( numror, jpdom_autoglo, 'dh', dh, ldxios = lrxios  )
+          hml (:,:) = hbl(:,:) - dh(:,:) ! Initialise ML depth.
           WRITE(numout,*) ' ===>>>> :  hbl & dh read from restart file'
           IF( ln_osm_mle ) THEN