Changeset 13259


Ignore:
Timestamp:
2020-07-07T14:22:34+02:00 (4 weeks ago)
Author:
ayoung
Message:

Merging change from ticket #2445 (introduction of minimum value for surface roughness when nn_z0_met = 3).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/ZDF/zdfgls.F90

    r11536 r13259  
    203203         zhsro(:,:) = MAX(rsbc_zs2 * ustar2_surf(:,:) * zdep(:,:)**1.5, rn_hsro)          ! zhsro = rn_frac_hs * Hsw (eq. 11) 
    204204      CASE ( 3 )             ! Roughness given by the wave model (coupled or read in file) 
    205          zhsro(:,:) = rn_frac_hs * hsw(:,:)   ! (rn_frac_hs=1.6 see Eq. (5) of Rascle et al. 2008 ) 
     205         zhsro(:,:) = MAX(rn_frac_hs * hsw(:,:), rn_hsro)   ! (rn_frac_hs=1.6 see Eq. (5) of Rascle et al. 2008 ) 
    206206      END SELECT 
    207207      ! 
Note: See TracChangeset for help on using the changeset viewer.