Skip to content
Snippets Groups Projects
Commit 1a493a4d authored by Guillaume Samson's avatar Guillaume Samson :snowman2:
Browse files

Merge branch 'dev_r15388_updated_zdfiwm' into 'main' 

import commits from dev_r15388_updated_zdfiwm SVN branch

See merge request nemo/nemo!10
parents fb2dd326 f5f425f0
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg
+ 8
− 8
View file @ 1a493a4d
......@@ -399,19 +399,19 @@
!-----------------------------------------------------------------------
&namzdf_iwm ! internal wave-driven mixing parameterization (ln_zdfiwm =T)
!-----------------------------------------------------------------------
nn_zpyc = 2 ! pycnocline-intensified dissipation scales as N (=1) or N^2 (=2)
ln_mevar = .true. ! variable (T) or constant (F) mixing efficiency
ln_mevar = .false. ! variable (T) or constant (F) mixing efficiency
ln_tsdiff = .true. ! account for differential T/S mixing (T) or not (F)
cn_dir = './' ! root directory for the iwm data location
cn_dir = './' ! root directory for the iwm data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
sn_mpb = 'int_wave_mix' , -12. , 'mixing_power_bot' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpp = 'int_wave_mix' , -12. , 'mixing_power_pyc' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpc = 'int_wave_mix' , -12. , 'mixing_power_cri' , .false. , .true. , 'yearly' , '' , '' , ''
sn_dsb = 'int_wave_mix' , -12. , 'decay_scale_bot' , .false. , .true. , 'yearly' , '' , '' , ''
sn_dsc = 'int_wave_mix' , -12. , 'decay_scale_cri' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpb = 'zdfiwm_forcing' , -12. , 'power_bot' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpc = 'zdfiwm_forcing' , -12. , 'power_cri' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpn = 'zdfiwm_forcing' , -12. , 'power_nsq' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mps = 'zdfiwm_forcing' , -12. , 'power_sho' , .false. , .true. , 'yearly' , '' , '' , ''
sn_dsb = 'zdfiwm_forcing' , -12. , 'scale_bot' , .false. , .true. , 'yearly' , '' , '' , ''
sn_dsc = 'zdfiwm_forcing' , -12. , 'scale_cri' , .false. , .true. , 'yearly' , '' , '' , ''
/
!!======================================================================
!! *** Diagnostics namelists *** !!
......
cfgs/SHARED/namelist_ref
+ 7
− 8
View file @ 1a493a4d
......@@ -330,7 +330,6 @@
rn_ldyn_max = 1.5 ! dynamics nudging magnitude above the ABL [hour] (~1 rn_Dt)
rn_ltra_min = 4.5 ! tracers nudging magnitude inside the ABL [hour] (~3 rn_Dt)
rn_ltra_max = 1.5 ! tracers nudging magnitude above the ABL [hour] (~1 rn_Dt)
rn_vfac = 1. ! multiplicative factor for ocean/ice velocity
nn_amxl = 0 ! mixing length: = 0 Deardorff 80 length-scale
! = 1 length-scale based on the distance to the PBL height
! = 2 Bougeault & Lacarrere 89 length-scale
......@@ -1308,19 +1307,19 @@
!-----------------------------------------------------------------------
&namzdf_iwm ! internal wave-driven mixing parameterization (ln_zdfiwm =T)
!-----------------------------------------------------------------------
nn_zpyc = 1 ! pycnocline-intensified dissipation scales as N (=1) or N^2 (=2)
ln_mevar = .true. ! variable (T) or constant (F) mixing efficiency
ln_mevar = .false. ! variable (T) or constant (F) mixing efficiency
ln_tsdiff = .true. ! account for differential T/S mixing (T) or not (F)
cn_dir = './' ! root directory for the iwm data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
sn_mpb = 'NOT USED' , -12. , 'mixing_power_bot' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpp = 'NOT USED' , -12. , 'mixing_power_pyc' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpc = 'NOT USED' , -12. , 'mixing_power_cri' , .false. , .true. , 'yearly' , '' , '' , ''
sn_dsb = 'NOT USED' , -12. , 'decay_scale_bot' , .false. , .true. , 'yearly' , '' , '' , ''
sn_dsc = 'NOT USED' , -12. , 'decay_scale_cri' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpb = 'NOT USED' , -12. , 'power_bot' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpc = 'NOT USED' , -12. , 'power_cri' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mpn = 'NOT USED' , -12. , 'power_nsq' , .false. , .true. , 'yearly' , '' , '' , ''
sn_mps = 'NOT USED' , -12. , 'power_sho' , .false. , .true. , 'yearly' , '' , '' , ''
sn_dsb = 'NOT USED' , -12. , 'scale_bot' , .false. , .true. , 'yearly' , '' , '' , ''
sn_dsc = 'NOT USED' , -12. , 'scale_cri' , .false. , .true. , 'yearly' , '' , '' , ''
/
!!======================================================================
!! *** Diagnostics namelists *** !!
......
src/OCE/LDF/ldftra.F90
+ 2
− 2
View file @ 1a493a4d
......@@ -97,7 +97,7 @@ MODULE ldftra
# include "domzgr_substitute.h90"
!!----------------------------------------------------------------------
!! NEMO/OCE 4.0 , NEMO Consortium (2018)
!! $Id: ldftra.F90 15093 2021-07-06 16:20:39Z clem $
!! $Id: ldftra.F90 15475 2021-11-05 14:14:45Z cdllod $
!! Software governed by the CeCILL license (see ./LICENSE)
!!----------------------------------------------------------------------
CONTAINS
......@@ -516,7 +516,7 @@ CONTAINS
WRITE(numout,*) ' Eddy Induced Velocity (eiv) param. ln_ldfeiv = ', ln_ldfeiv
WRITE(numout,*) ' eiv streamfunction & velocity diag. ln_ldfeiv_dia = ', ln_ldfeiv_dia
WRITE(numout,*) ' coefficients :'
WRITE(numout,*) ' type of time-space variation nn_aei_ijk_t = ', nn_aht_ijk_t
WRITE(numout,*) ' type of time-space variation nn_aei_ijk_t = ', nn_aei_ijk_t
WRITE(numout,*) ' lateral diffusive velocity (if cst) rn_Ue = ', rn_Ue, ' m/s'
WRITE(numout,*) ' lateral diffusive length (if cst) rn_Le = ', rn_Le, ' m'
WRITE(numout,*)
......
src/OCE/ZDF/zdfiwm.F90
+ 191
− 259
View file @ 1a493a4d
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment