Changeset 11860 for NEMO/branches/UKMO

Timestamp:

2019-11-05T17:09:12+01:00 (4 years ago)

Author:

cguiavarch

Message:

Update with an updated version of zdfosm.F90 from George Nurser

File:

• NEMO/branches/UKMO/NEMO_4.0_OSMOSIS/src/OCE/ZDF/zdfosm.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0_OSMOSIS/src/OCE/ZDF/zdfosm.F90

@@ -367 +367 @@
               zus_y = zsin_wind(ji,jj) * zustar(ji,jj) / 0.3**2
               zustke(ji,jj) = MAX ( SQRT( zus_x*zus_x + zus_y*zus_y), 1.0e-8 )
+              dstokes(ji,jj) = rn_osm_dstokes
               ! dstokes(ji,jj) set to constant value rn_osm_dstokes from namelist in zdf_osm_init
            END DO
@@ -376 +377 @@
               ! Use wind speed wndm included in sbc_oce module
               zustke(ji,jj) = MAX ( 0.016 * wndm(ji,jj), 1.0e-8 )
-              dstokes(ji,jj) = 0.12 * wndm(ji,jj)**2 / grav
+              dstokes(ji,jj) = MAX( 0.12 * wndm(ji,jj)**2 / grav, 5.e-1)
            END DO
         END DO