Changeset 7916

Timestamp:

2017-04-18T10:31:34+02:00 (7 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:

• DYN/dynvor.F90 (modified) (1 diff)
• ZDF/zdfgls.F90 (modified) (2 diffs)

branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -163 +163 @@
                              CALL vor_ens( kt, nrvm, un , vn , ua, va )   ! relative vorticity or metric trend (ens)
                              CALL vor_ene( kt, ncor, un , vn , ua, va )   ! planetary vorticity trend (ene)
-            IF( ln_stcor )   CALL vor_ens( kt, nrvm, usd, vsd, ua, va )   ! add the Stokes-Coriolis trend
             IF( ln_stcor )   CALL vor_ene( kt, ncor, usd, vsd, ua, va )   ! add the Stokes-Coriolis trend
          ENDIF

branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -68 +68 @@
    REAL(wp) ::   rn_crban_default  ! Craig and Banner constant for surface breaking waves mixing
    REAL(wp) ::   rn_hsro           ! Minimum surface roughness
-   REAL(wp) ::   rn_frac_hs        ! Fraction of wave height as surface roughness (if nn_z0_met = 1) 
+   REAL(wp) ::   rn_frac_hs        ! Fraction of wave height as surface roughness (if nn_z0_met = 1, 3) 
 
    REAL(wp) ::   rcm_sf        =  0.73_wp     ! Shear free turbulence parameters
@@ -221 +221 @@
          zhsro(:,:) = MAX(rsbc_zs2 * ustars2(:,:) * zdep(:,:)**1.5, rn_hsro) ! zhsro = rn_frac_hs * Hsw (eq. 11)
       CASE ( 3 )             ! Roughness given by the wave model (coupled or read in file) 
-         WHERE( hsw == 0._wp ) ! surface roughness length according to Charnock formula when sign. wave height 0
-            zhsro = MAX(rn_charn / grav * ustars2, rn_hsro)
-         ELSEWHERE
-            zhsro = MAX(hsw, rn_hsro)
-         END WHERE
+         zhsro = MAX(rn_frac_hs * hsw, rn_hsro)
       END SELECT