Changeset 12806

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:

• cfgs/SHARED/field_def_nemo-oce.xml (modified) (1 diff)
• src/OCE/ZDF/zdf_oce.F90 (modified) (1 diff)
• src/OCE/ZDF/zdfphy.F90 (modified) (4 diffs)
• src/OCE/ZDF/zdftmx.F90 (copied) (copied from NEMO/branches/UKMO/NEMO_4.0.1_old_tidal_mixing/src/OCE/ZDF/zdftmx.F90)

NEMO/branches/UKMO/r4.0-HEAD_r12713_dan_test_clems_branch/cfgs/SHARED/field_def_nemo-oce.xml

@@ -541 +541 @@
    <field id="avm_evd"      long_name="convective enhancement of vertical viscosity"   standard_name="ocean_vertical_momentum_diffusivity_due_to_convection"   unit="m2/s" />
 
+        <!-- av_tmx: available with ln_zdftmx -->
+        <field id="av_tmx"      long_name="vertical diffusivity due to tidal mixing" unit="m2/s" />
+
         <!-- avt_tide: available with ln_zdfiwm=T -->
         <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

@@ -40 +40 @@
    LOGICAL , PUBLIC ::   ln_zdfswm   !: surface  wave-induced mixing flag
    LOGICAL , PUBLIC ::   ln_zdfiwm   !: internal wave-induced mixing flag
+   LOGICAL , PUBLIC ::   ln_zdftmx   !: old tidal mixing scheme (Simmons et al 2004)
    !                             ! coefficients 
    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

@@ -22 +22 @@
    USE zdfevd         ! vertical physics: convection via enhanced vertical diffusion  
    USE zdfiwm         ! vertical physics: internal wave-induced mixing  
+   USE zdftmx         ! vertical physics: old tidal mixing scheme (Simmons et al 2004)
    USE zdfswm         ! vertical physics: surface  wave-induced mixing
    USE zdfmxl         ! vertical physics: mixed layer
@@ -80 +81 @@
          &             ln_zdfswm,                                    &     ! surface  wave-induced mixing
          &             ln_zdfiwm,                                    &     ! internal  -      -      -
+         &             ln_zdftmx,                                    &     ! old tidal mixing scheme (Simmons et al 2004)
          &             ln_zad_Aimp,                                  &     ! apdative-implicit vertical advection
          &             rn_avm0, rn_avt0, nn_avb, nn_havtb                  ! coefficients
@@ -207 +209 @@
       !                          !== gravity wave-driven mixing  ==!
       IF( ln_zdfiwm )   CALL zdf_iwm_init       ! internal wave-driven mixing
+      IF( ln_zdftmx )   CALL zdf_tmx_init       ! old tidal mixing scheme (Simmons et al)
       IF( ln_zdfswm )   CALL zdf_swm_init       ! surface  wave-driven mixing
 
@@ -293 +296 @@
       IF( ln_zdfswm )   CALL zdf_swm( kt, avm, avt, avs )   ! surface  wave (Qiao et al. 2004) 
       IF( ln_zdfiwm )   CALL zdf_iwm( kt, avm, avt, avs )   ! internal wave (de Lavergne et al 2017)
+      IF( ln_zdftmx )   CALL zdf_tmx( kt, avm, avt, avs )   ! old tidal mixing scheme (Simmons et al 2004)
 
 #if defined key_agrif