Changeset 14564 for NEMO/branches/2021

Timestamp:

2021-03-01T20:12:52+01: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 [14410,14411] (ticket #2353)}

Location:

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

Files:

• cfgs/SHARED/namelist_ref (modified) (1 diff)
• src/OCE/ZDF/zdfosm.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/cfgs/SHARED/namelist_ref

@@ -1273 +1273 @@
    rn_osm_mle_thresh   = 0.0001    ! delta b criterion used for FK MLE criterion
    rn_osm_mle_tau      = 172800.   ! time scale for FK-OSM (seconds)  (case rn_osm_mle=0)
-   ln_osm_hmle_limit   = .true.    ! limit hmle to rn_osm_hmle_limit*hbl
-   rn_osm_hmle_limit   = 500.0
+   ln_osm_hmle_limit   = .true.    ! If true, limit hmle to rn_osm_hmle_limit*hbl
+   rn_osm_hmle_limit   = 1.5
    /
 !-----------------------------------------------------------------------

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

@@ -1974 +1974 @@
            ENDIF
         ENDIF
-        hmle(ji,jj) = MIN(hmle(ji,jj), ht(ji,jj))
-       IF(ln_osm_hmle_limit) hmle(ji,jj) = MIN(hmle(ji,jj), MAX(rn_osm_hmle_limit,1.2*hbl(ji,jj)) )
+        hmle(ji,jj) = MAX( MIN( hmle(ji,jj), ht(ji,jj) ), gdepw(ji,jj,4,Kmm) )
+        IF(ln_osm_hmle_limit) hmle(ji,jj) = MIN( hmle(ji,jj), rn_osm_hmle_limit*hbl(ji,jj) )
        ! For now try just set hmle to zmld
        hmle(ji,jj) = pmld(ji,jj)