Changeset 14760

Timestamp:

2021-04-28T11:03:37+02:00 (3 years ago)

Author:

smueller

Message:

Synchronisation of the OSMOSIS boundary layer scheme with the version developed in branch ^{/NEMO/branches/NERC/dev_r11078_OSMOSIS_IMMERSE_Nurser_4.0: transfer of changesets [14755,14756,14759] (ticket #2353)}

File:

• NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/OCE/ZDF/zdfosm.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/OCE/ZDF/zdfosm.F90

@@ -1508 +1508 @@
          zekman(A2D(0)) = EXP( -1.0_wp * zek * ABS( ff_t(A2D(0)) ) * zhbl(A2D(0)) / MAX(sustar(A2D(0)), 1.e-8 ) )
 
+         zshear(:,:) = zlarge
          zshear(A2D(0)) = 0._wp
 #ifdef key_osm_debug
@@ -3397 +3398 @@
       INTEGER  ::   ji, jj, jk     ! dummy loop indices
       REAL z1_t2
+      REAL(wp) ::   zlarge = -1.0e10_wp, zero = 0.0_wp
       !!
       NAMELIST/namzdf_osm/ ln_use_osm_la, rn_osm_la, rn_osm_dstokes, nn_ave &
@@ -3566 +3568 @@
       ENDIF
 
+      dstokes(:,:) = zlarge
       IF (nn_osm_wave == 0) THEN
          dstokes(:,:) = rn_osm_dstokes
@@ -3672 +3675 @@
             CALL iom_get( numror, jpdom_auto, 'hbl' , hbl  )
             CALL iom_get( numror, jpdom_auto, 'dh', dh )
+            hml(:,:) = hbl(:,:) - dh(:,:)   ! Initialise ML depth
             WRITE(numout,*) ' ===>>>> :  hbl & dh read from restart file'
             IF( ln_osm_mle ) THEN