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

Timestamp:

2017-04-13T12:07:16+02:00 (7 years ago)

Author:

jcastill

Message:

Series of small bug fixes and stetic changes:

-Fix possible bug in the calculation of Stokes-Coriolis
-Move all the wave control variables to namelist namsbc_wave
-Use one namelist variable instead of two to set Stokes drift velocity coupling
-Cap the values of the Craig and Banner constant as calculated from wave input fields to take into account small values of the friction velocity
-Add new Phillips parametrization for Stokes drift vertical velocity, using the inverse depth scale as in Breivik 2015, instead of the peak wave number as calculated from wave input fields
-Better control of the wave fields that are read from file depending on the wave parameters

File:

• branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) (9 diffs)

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

@@ -24 +24 @@
    USE phycst         ! physical constants
    USE zdfmxl         ! mixed layer
-   USE sbcwave, ONLY: hsw,rn_crban
+   USE sbcwave
    ! 
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
@@ -62 +62 @@
    INTEGER  ::   nn_stab_func      ! stability functions G88, KC or Canuto (=0/1/2)
    INTEGER  ::   nn_clos           ! closure 0/1/2/3 MY82/k-eps/k-w/gen
-   INTEGER  ::   nn_wmix           ! type of wave breaking mixing
-   INTEGER, PUBLIC, PARAMETER ::   jp_craigbanner = 0   ! Craig and Banner formulation (original NEMO formulation -
-                                                        !    direct conversion of mechanical to turbulent energy)
-   INTEGER, PUBLIC, PARAMETER ::   jp_janssen     = 1   ! Janssen formulation - no assumption on direct energy conversion 
    REAL(wp) ::   rn_clim_galp      ! Holt 2008 value for k-eps: 0.267
    REAL(wp) ::   rn_epsmin         ! minimum value of dissipation (m2/s3)
@@ -181 +177 @@
             rsbc_tke3(:,:) = rdt * rn_crban(:,:)                                           ! Neumann + Wave breaking
             rsbc_psi1(:,:) = rc0**rpp * rsbc_tke1(:,:)**rmm * rl_sf**rnn                   ! Dirichlet + Wave breaking
-         ELSE
+         ELSE IF( nn_wmix==jp_craigbanner ) THEN
             rsbc_tke1(:,:) = -3._wp/2._wp*rn_crban(:,:)*ra_sf*rl_sf
             rsbc_tke3(:,:) = rdt * rn_crban(:,:) / rl_sf
@@ -359 +355 @@
                z_elem_c(:,:,2) = 0._wp
                z_elem_b(:,:,2) = 1._wp
-            ELSE
+            ELSE IF( nn_wmix==jp_craigbanner ) THEN
                en(:,:,1) = rc02r * ustars2(:,:) * (1._wp + rsbc_tke1(:,:))**(2._wp/3._wp)
                en(:,:,1) = MAX(en(:,:,1), rn_emin) 
@@ -405 +401 @@
                zflxs(:,:) = rsbc_tke3(:,:) * ustars2(:,:)**1.5_wp * ((zhsro(:,:)+fsdept(:,:,1) ) / zhsro(:,:) )**(1.5*ra_sf)
                en(:,:,2) = en(:,:,2) + zflxs(:,:) / fse3w(:,:,2)
-            ELSE
+            ELSE IF( nn_wmix==jp_craigbanner ) THEN
                ! Dirichlet conditions at k=1
                en(:,:,1)       = rc02r * ustars2(:,:) * (1._wp + rsbc_tke1(:,:))**(2._wp/3._wp)
@@ -652 +648 @@
                ! 
                !
-            ELSE
+            ELSE IF( nn_wmix==jp_craigbanner ) THEN
                ! Surface value
                zdep(:,:)       = zhsro(:,:) * rl_sf ! Cosmetic
@@ -708 +704 @@
                psi(:,:,2) = psi(:,:,2) + zflxs(:,:) / fse3w(:,:,2)
                !
-            ELSE
+            ELSE IF( nn_wmix==jp_craigbanner ) THEN
                ! Surface value: Dirichlet
                zdep(:,:)       = zhsro(:,:) * rl_sf
@@ -1047 +1043 @@
          &            rn_crban_default, rn_charn, rn_frac_hs,&
          &            nn_bc_surf, nn_bc_bot, nn_z0_met,      &
-         &            nn_stab_func, nn_clos, nn_wmix
+         &            nn_stab_func, nn_clos
       !!----------------------------------------------------------
       !
@@ -1090 +1086 @@
       IF( nn_bc_surf < 0 .OR. nn_bc_surf > 1 ) CALL ctl_stop( 'zdf_gls_init: bad flag: nn_bc_surf is 0 or 1' ) 
       IF( nn_z0_met < 0 .OR. nn_z0_met > 3 ) CALL ctl_stop( 'zdf_gls_init: bad flag: nn_z0_met is 0, 1, 2 or 3' ) 
-      IF( nn_z0_met == 3 .AND. .NOT.ln_sdw ) CALL ctl_stop( 'zdf_gls_init: nn_z0_met=3 requires ln_sdw=T' ) 
+      IF( nn_z0_met == 3 .AND. .NOT.ln_rough ) CALL ctl_stop( 'zdf_gls_init: nn_z0_met=3 requires ln_rough=T' ) 
+      IF( nn_z0_met .NE. 3 .AND. ln_rough ) THEN
+         CALL ctl_warn('W A R N I N G:  ln_rough=.TRUE. but nn_z0_met is not 3 - resetting nn_z0_met to 3')
+         nn_z0_met = 3
+      ENDIF
       IF( nn_stab_func  < 0 .OR. nn_stab_func  > 3 ) CALL ctl_stop( 'zdf_gls_init: bad flag: nn_stab_func is 0, 1, 2 and 3' ) 
       IF( nn_clos       < 0 .OR. nn_clos       > 3 ) CALL ctl_stop( 'zdf_gls_init: bad flag: nn_clos is 0, 1, 2 or 3' )