diff --git a/nam_vvl b/nam_vvl
index 581bc7acbaa98cc31c09171816bc0e4e337a24e2..02328b81f5106d05d393b19bc38315a94431dc2b 100644
--- a/nam_vvl
+++ b/nam_vvl
@@ -11,4 +11,8 @@
rn_lf_cutoff = 5.0 ! cutoff frequency for low-pass filter [days]
rn_zdef_max = 0.9 ! maximum fractional e3t deformation
ln_vvl_dbg = .false. ! debug prints (T/F)
+ nn_vvl_interp = 2 ! interpolation method of scale factor anomalies at U/V/F points
+ ! =0 linear even at the bottom (old)
+ ! =1 linear with bottom correction
+ ! =2 proportionnal to scale factors at rest ("qco" like)
/
diff --git a/namagrif b/namagrif
index 743476dd9247a121b1467e75cc29add90c89ef74..f9f449929bbd82d95c5ca504e150d51dc4656957 100644
--- a/namagrif
+++ b/namagrif
@@ -4,7 +4,7 @@
ln_agrif_2way = .true. ! activate two way nesting
ln_init_chfrpar = .false. ! initialize child grids from parent
ln_vert_remap = .false. ! use vertical remapping
- ln_spc_dyn = .true. ! use 0 as special value for dynamics
+ ln_spc_dyn = .false. ! use 0 as special value for dynamics
ln_chk_bathy = .true. ! =T check the parent bathymetry
rn_sponge_tra = 0.002 ! coefficient for tracer sponge layer []
rn_sponge_dyn = 0.002 ! coefficient for dynamics sponge layer []
diff --git a/namopt b/namopt
new file mode 100644
index 0000000000000000000000000000000000000000..5f8b7febff6a47bd2e6a8121bba79aa12c57fd67
--- /dev/null
+++ b/namopt
@@ -0,0 +1,11 @@
+!-----------------------------------------------------------------------
+&namtrc_opt ! light availability in the water column
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_par = 'par.orca' , 24 , 'fr_par' , .true. , .true. , 'yearly' , '' , '' , ''
+ cn_dir = './' ! root directory for the location of the dynamical files
+ ln_varpar = .true. ! Read PAR from file
+ parlux = 0.43 ! Fraction of shortwave as PAR
+ light_loc = 'center' ! Light location in the water cell ('center', 'integral')
+/
diff --git a/namsto b/namsto
index 92016babf1a61e88af82d2658ac6a22a601393e4..48ffdd373d1d497a719ce56a58472eace87d7821 100644
--- a/namsto
+++ b/namsto
@@ -1,6 +1,20 @@
!-----------------------------------------------------------------------
&namsto ! Stochastic parametrization of EOS (default: OFF)
!-----------------------------------------------------------------------
+ ln_sto_ldf = .false. ! stochastic lateral diffusion
+ rn_ldf_std = 0.1 ! lateral diffusion standard deviation (in percent)
+ rn_ldf_tcor = 1440. ! lateral diffusion correlation timescale (in timesteps)
+ ln_sto_hpg = .false. ! stochastic pressure gradient
+ rn_hpg_std = 0.1 ! density gradient standard deviation (in percent)
+ rn_hpg_tcor = 1440. ! density gradient correlation timescale (in timesteps)
+ ln_sto_pstar = .false. ! stochastic ice strength
+ rn_pstar_std = 0.1 ! ice strength standard deviation (in percent)
+ rn_pstar_tcor = 1440. ! ice strength correlation timescale (in timesteps)
+ nn_pstar_ord = 1 ! order of autoregressive processes
+ nn_pstar_flt = 0 ! passes of Laplacian filter
+ ln_sto_trd = .false. ! stochastic model trend
+ rn_trd_std = 0.1 ! trend standard deviation (in percent)
+ rn_trd_tcor = 1440. ! trend correlation timescale (in timesteps)
ln_sto_eos = .false. ! stochastic equation of state
nn_sto_eos = 1 ! number of independent random walks
rn_eos_stdxy = 1.4 ! random walk horz. standard deviation (in grid points)
@@ -9,6 +23,14 @@
nn_eos_ord = 1 ! order of autoregressive processes
nn_eos_flt = 0 ! passes of Laplacian filter
rn_eos_lim = 2.0 ! limitation factor (default = 3.0)
+ ln_sto_trc = .false. ! stochastic tracer dynamics
+ nn_sto_trc = 1 ! number of independent random walks
+ rn_trc_stdxy = 1.4 ! random walk horz. standard deviation (in grid points)
+ rn_trc_stdz = 0.7 ! random walk vert. standard deviation (in grid points)
+ rn_trc_tcor = 1440. ! random walk time correlation (in timesteps)
+ nn_trc_ord = 1 ! order of autoregressive processes
+ nn_trc_flt = 0 ! passes of Laplacian filter
+ rn_trc_lim = 3.0 ! limitation factor (default = 3.0)
ln_rststo = .false. ! start from mean parameter (F) or from restart file (T)
ln_rstseed = .true. ! read seed of RNG from restart file
cn_storst_in = "restart_sto" ! suffix of stochastic parameter restart file (input)
diff --git a/namtrc b/namtrc
index 972c5c2c272ff8ccbf788f506247b30b75499cd2..7ab18a03cbb44cc3c13d30e2bf080b5d74c111c9 100644
--- a/namtrc
+++ b/namtrc
@@ -19,7 +19,7 @@
!
jp_dia3d = 0 ! Number of 3D diagnostic variables
jp_dia2d = 0 ! Number of 2D diagnostic variables
- !_____________!___________!_________________________________________!____________!________________!
+
! ! name ! title of the field ! units ! init from file !
! sn_tracer(1) = 'tracer ', 'Tracer Concentration ', ' - ' , .false.
/
diff --git a/namtrc_dcy b/namtrc_dcy
new file mode 100644
index 0000000000000000000000000000000000000000..0b369b09d0388e9a749e9043a1b5d951b0cc0972
--- /dev/null
+++ b/namtrc_dcy
@@ -0,0 +1,5 @@
+!-----------------------------------------------------------------------
+&namtrc_dcy ! Diurnal cycle
+!-----------------------------------------------------------------------
+ ln_trcdc2dm = .false. ! Diurnal cycle for TOP
+/
diff --git a/namtrc_opt b/namtrc_opt
index 24ed9988e29b97f8b49ee66a1a91f28755e39bd1..5f8b7febff6a47bd2e6a8121bba79aa12c57fd67 100644
--- a/namtrc_opt
+++ b/namtrc_opt
@@ -1,11 +1,11 @@
!-----------------------------------------------------------------------
&namtrc_opt ! light availability in the water column
!-----------------------------------------------------------------------
-! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
-! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
- sn_par = 'par.orca' , 24 , 'fr_par' , .true. , .true. , 'yearly' , '' , '' , ''
- cn_dir = './' ! root directory for the location of the dynamical files
- ln_varpar = .true. ! Read PAR from file
- parlux = 0.43 ! Fraction of shortwave as PAR
- light_loc = 'center' ! Light location in the water cell ('center', 'integral')
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_par = 'par.orca' , 24 , 'fr_par' , .true. , .true. , 'yearly' , '' , '' , ''
+ cn_dir = './' ! root directory for the location of the dynamical files
+ ln_varpar = .true. ! Read PAR from file
+ parlux = 0.43 ! Fraction of shortwave as PAR
+ light_loc = 'center' ! Light location in the water cell ('center', 'integral')
/
diff --git a/namzdf_tke b/namzdf_tke
index 85990fe702a48f44706e7551821e6dfb73671634..d5d10df2c1acffe4a5b3d63741eb18604c2e5989 100644
--- a/namzdf_tke
+++ b/namzdf_tke
@@ -13,7 +13,7 @@
! ! = 2 first vertical derivative of mixing length bounded by 1
! ! = 3 as =2 with distinct dissipative an mixing length scale
ln_mxl0 = .true. ! surface mixing length scale = F(wind stress) (T) or not (F)
- nn_mxlice = 2 ! type of scaling under sea-ice
+ nn_mxlice = 0 ! type of scaling under sea-ice
! ! = 0 no scaling under sea-ice
! ! = 1 scaling with constant sea-ice thickness
! ! = 2 scaling with mean sea-ice thickness ( only with SI3 sea-ice model )