New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12806 – NEMO

Changeset 12806


Ignore:
Timestamp:
2020-04-23T11:26:12+02:00 (4 years ago)
Author:
dancopsey
Message:

Merge in NEMO_4.0.1_old_tidal_mixing

Location:
NEMO/branches/UKMO/r4.0-HEAD_r12713_dan_test_clems_branch
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/r4.0-HEAD_r12713_dan_test_clems_branch/cfgs/SHARED/field_def_nemo-oce.xml

    r12805 r12806  
    541541   <field id="avm_evd"      long_name="convective enhancement of vertical viscosity"   standard_name="ocean_vertical_momentum_diffusivity_due_to_convection"   unit="m2/s" /> 
    542542 
     543        <!-- av_tmx: available with ln_zdftmx --> 
     544        <field id="av_tmx"      long_name="vertical diffusivity due to tidal mixing" unit="m2/s" /> 
     545 
    543546        <!-- avt_tide: available with ln_zdfiwm=T --> 
    544547        <field id="av_ratio"     long_name="S over T diffusivity ratio"                     standard_name="salinity_over_temperature_diffusivity_ratio"                     unit="1"    /> 
  • NEMO/branches/UKMO/r4.0-HEAD_r12713_dan_test_clems_branch/src/OCE/ZDF/zdf_oce.F90

    r12801 r12806  
    4040   LOGICAL , PUBLIC ::   ln_zdfswm   !: surface  wave-induced mixing flag 
    4141   LOGICAL , PUBLIC ::   ln_zdfiwm   !: internal wave-induced mixing flag 
     42   LOGICAL , PUBLIC ::   ln_zdftmx   !: old tidal mixing scheme (Simmons et al 2004) 
    4243   !                             ! coefficients  
    4344   REAL(wp), PUBLIC ::   rn_avm0     !: vertical eddy viscosity (m2/s) 
  • NEMO/branches/UKMO/r4.0-HEAD_r12713_dan_test_clems_branch/src/OCE/ZDF/zdfphy.F90

    r12801 r12806  
    2222   USE zdfevd         ! vertical physics: convection via enhanced vertical diffusion   
    2323   USE zdfiwm         ! vertical physics: internal wave-induced mixing   
     24   USE zdftmx         ! vertical physics: old tidal mixing scheme (Simmons et al 2004) 
    2425   USE zdfswm         ! vertical physics: surface  wave-induced mixing 
    2526   USE zdfmxl         ! vertical physics: mixed layer 
     
    8081         &             ln_zdfswm,                                    &     ! surface  wave-induced mixing 
    8182         &             ln_zdfiwm,                                    &     ! internal  -      -      - 
     83         &             ln_zdftmx,                                    &     ! old tidal mixing scheme (Simmons et al 2004) 
    8284         &             ln_zad_Aimp,                                  &     ! apdative-implicit vertical advection 
    8385         &             rn_avm0, rn_avt0, nn_avb, nn_havtb                  ! coefficients 
     
    207209      !                          !== gravity wave-driven mixing  ==! 
    208210      IF( ln_zdfiwm )   CALL zdf_iwm_init       ! internal wave-driven mixing 
     211      IF( ln_zdftmx )   CALL zdf_tmx_init       ! old tidal mixing scheme (Simmons et al) 
    209212      IF( ln_zdfswm )   CALL zdf_swm_init       ! surface  wave-driven mixing 
    210213 
     
    293296      IF( ln_zdfswm )   CALL zdf_swm( kt, avm, avt, avs )   ! surface  wave (Qiao et al. 2004)  
    294297      IF( ln_zdfiwm )   CALL zdf_iwm( kt, avm, avt, avs )   ! internal wave (de Lavergne et al 2017) 
     298      IF( ln_zdftmx )   CALL zdf_tmx( kt, avm, avt, avs )   ! old tidal mixing scheme (Simmons et al 2004) 
    295299 
    296300#if defined key_agrif  
Note: See TracChangeset for help on using the changeset viewer.