Changeset 7916


Ignore:
Timestamp:
2017-04-18T10:31:34+02:00 (3 years ago)
Author:
jcastill
Message:

Bug fix the Stokes-Coriolis term, and the calculation of the surface roughness

Location:
branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

    r7905 r7916  
    163163                             CALL vor_ens( kt, nrvm, un , vn , ua, va )   ! relative vorticity or metric trend (ens) 
    164164                             CALL vor_ene( kt, ncor, un , vn , ua, va )   ! planetary vorticity trend (ene) 
    165             IF( ln_stcor )   CALL vor_ens( kt, nrvm, usd, vsd, ua, va )   ! add the Stokes-Coriolis trend 
    166165            IF( ln_stcor )   CALL vor_ene( kt, ncor, usd, vsd, ua, va )   ! add the Stokes-Coriolis trend 
    167166         ENDIF 
  • branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

    r7905 r7916  
    6868   REAL(wp) ::   rn_crban_default  ! Craig and Banner constant for surface breaking waves mixing 
    6969   REAL(wp) ::   rn_hsro           ! Minimum surface roughness 
    70    REAL(wp) ::   rn_frac_hs        ! Fraction of wave height as surface roughness (if nn_z0_met = 1)  
     70   REAL(wp) ::   rn_frac_hs        ! Fraction of wave height as surface roughness (if nn_z0_met = 1, 3)  
    7171 
    7272   REAL(wp) ::   rcm_sf        =  0.73_wp     ! Shear free turbulence parameters 
     
    221221         zhsro(:,:) = MAX(rsbc_zs2 * ustars2(:,:) * zdep(:,:)**1.5, rn_hsro) ! zhsro = rn_frac_hs * Hsw (eq. 11) 
    222222      CASE ( 3 )             ! Roughness given by the wave model (coupled or read in file)  
    223          WHERE( hsw == 0._wp ) ! surface roughness length according to Charnock formula when sign. wave height 0 
    224             zhsro = MAX(rn_charn / grav * ustars2, rn_hsro) 
    225          ELSEWHERE 
    226             zhsro = MAX(hsw, rn_hsro) 
    227          END WHERE 
     223         zhsro = MAX(rn_frac_hs * hsw, rn_hsro) 
    228224      END SELECT 
    229225 
Note: See TracChangeset for help on using the changeset viewer.