Changeset 11564 for NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/doc/latex/NEMO/subfiles/chap_ZDF.tex

Timestamp:

2019-09-18T16:11:52+02:00 (5 years ago)

Author:

jchanut

Message:

#2199, merged with trunk

Location:

NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/doc

Files:

• . (modified) (1 prop)
• latex (modified) (1 prop)
• latex/NEMO (modified) (1 prop)
• latex/NEMO/subfiles/chap_ZDF.tex (modified) (50 diffs)

NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/doc/latex

@@ -1 @@
-*.aux
-*.bbl
-*.blg
-*.dvi
-*.fdb*
-*.fls
-*.idx
-*.ilg
-*.ind
-*.log
-*.maf
-*.mtc*
-*.out
-*.pdf
-*.toc
-_minted-*
+figures

@@ -1 @@
-*.aux
-*.bbl
-*.blg
-*.dvi
-*.fdb*
-*.fls
-*.idx
-*.ilg
-*.ind
-*.log
-*.maf
-*.mtc*
-*.out
-*.pdf
-*.toc
-_minted-*
+figures

NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/doc/latex/NEMO/subfiles/chap_ZDF.tex

@@ -1 +1 @@
 \documentclass[../main/NEMO_manual]{subfiles}
+
+%% Custom aliases
+\newcommand{\cf}{\ensuremath{C\kern-0.14em f}}
 
 \begin{document}
@@ -8 +11 @@
 \label{chap:ZDF}
 
-\minitoc
+\chaptertoc
 
 %gm% Add here a small introduction to ZDF and naming of the different physics (similar to what have been written for TRA and DYN.
@@ -18 +21 @@
 % ================================================================
 \section{Vertical mixing}
-\label{sec:ZDF_zdf}
+\label{sec:ZDF}
 
 The discrete form of the ocean subgrid scale physics has been presented in
@@ -25 +28 @@
 At the surface they are prescribed from the surface forcing (see \autoref{chap:SBC}),
 while at the bottom they are set to zero for heat and salt,
-unless a geothermal flux forcing is prescribed as a bottom boundary condition (\ie \key{trabbl} defined,
+unless a geothermal flux forcing is prescribed as a bottom boundary condition (\ie\ \np{ln\_trabbc} defined,
 see \autoref{subsec:TRA_bbc}), and specified through a bottom friction parameterisation for momentum
-(see \autoref{sec:ZDF_bfr}).
+(see \autoref{sec:ZDF_drg}).
 
 In this section we briefly discuss the various choices offered to compute the vertical eddy viscosity and
@@ -33 +36 @@
 respectively (see \autoref{sec:TRA_zdf} and \autoref{sec:DYN_zdf}).
 These coefficients can be assumed to be either constant, or a function of the local Richardson number,
-or computed from a turbulent closure model (either TKE or GLS formulation).
-The computation of these coefficients is initialized in the \mdl{zdfini} module and performed in
-the \mdl{zdfric}, \mdl{zdftke} or \mdl{zdfgls} modules.
+or computed from a turbulent closure model (either TKE or GLS or OSMOSIS formulation).
+The computation of these coefficients is initialized in the \mdl{zdfphy} module and performed in
+the \mdl{zdfric}, \mdl{zdftke} or \mdl{zdfgls} or \mdl{zdfosm} modules.
 The trends due to the vertical momentum and tracer diffusion, including the surface forcing,
-are computed and added to the general trend in the \mdl{dynzdf} and \mdl{trazdf} modules, respectively. 
-These trends can be computed using either a forward time stepping scheme
-(namelist parameter \np{ln\_zdfexp}\forcode{ = .true.}) or a backward time stepping scheme
-(\np{ln\_zdfexp}\forcode{ = .false.}) depending on the magnitude of the mixing coefficients,
-and thus of the formulation used (see \autoref{chap:STP}).
-
-% -------------------------------------------------------------------------------------------------------------
-%        Constant 
-% -------------------------------------------------------------------------------------------------------------
-\subsection{Constant (\protect\key{zdfcst})}
+are computed and added to the general trend in the \mdl{dynzdf} and \mdl{trazdf} modules, respectively.
+%These trends can be computed using either a forward time stepping scheme
+%(namelist parameter \np{ln\_zdfexp}\forcode{=.true.}) or a backward time stepping scheme
+%(\np{ln\_zdfexp}\forcode{=.false.}) depending on the magnitude of the mixing coefficients,
+%and thus of the formulation used (see \autoref{chap:TD}).
+
+%--------------------------------------------namzdf--------------------------------------------------------
+
+\begin{listing}
+  \nlst{namzdf}
+  \caption{\texttt{namzdf}}
+  \label{lst:namzdf}
+\end{listing}
+%--------------------------------------------------------------------------------------------------------------
+
+% -------------------------------------------------------------------------------------------------------------
+%        Constant
+% -------------------------------------------------------------------------------------------------------------
+\subsection[Constant (\forcode{ln_zdfcst=.true.})]
+{Constant (\protect\np{ln\_zdfcst}\forcode{=.true.})}
 \label{subsec:ZDF_cst}
-%--------------------------------------------namzdf---------------------------------------------------------
-
-\nlst{namzdf}
-%--------------------------------------------------------------------------------------------------------------
-
-Options are defined through the \ngn{namzdf} namelist variables.
-When \key{zdfcst} is defined, the momentum and tracer vertical eddy coefficients are set to
+
+Options are defined through the \nam{zdf} namelist variables.
+When \np{ln\_zdfcst} is defined, the momentum and tracer vertical eddy coefficients are set to
 constant values over the whole ocean.
 This is the crudest way to define the vertical ocean physics.
-It is recommended that this option is only used in process studies, not in basin scale simulations.
+It is recommended to use this option only in process studies, not in basin scale simulations.
 Typical values used in this case are:
 \begin{align*}
@@ -64 +73 @@
 \end{align*}
 
-These values are set through the \np{rn\_avm0} and \np{rn\_avt0} namelist parameters. 
+These values are set through the \np{rn\_avm0} and \np{rn\_avt0} namelist parameters.
 In all cases, do not use values smaller that those associated with the molecular viscosity and diffusivity,
 that is $\sim10^{-6}~m^2.s^{-1}$ for momentum, $\sim10^{-7}~m^2.s^{-1}$ for temperature and
@@ -72 +81 @@
 %        Richardson Number Dependent
 % -------------------------------------------------------------------------------------------------------------
-\subsection{Richardson number dependent (\protect\key{zdfric})}
+\subsection[Richardson number dependent (\forcode{ln_zdfric=.true.})]
+{Richardson number dependent (\protect\np{ln\_zdfric}\forcode{=.true.})}
 \label{subsec:ZDF_ric}
 
 %--------------------------------------------namric---------------------------------------------------------
 
-\nlst{namzdf_ric}
+\begin{listing}
+  \nlst{namzdf_ric}
+  \caption{\texttt{namzdf\_ric}}
+  \label{lst:namzdf_ric}
+\end{listing}
 %--------------------------------------------------------------------------------------------------------------
 
-When \key{zdfric} is defined, a local Richardson number dependent formulation for the vertical momentum and
-tracer eddy coefficients is set through the \ngn{namzdf\_ric} namelist variables.
-The vertical mixing coefficients are diagnosed from the large scale variables computed by the model. 
+When \np{ln\_zdfric}\forcode{=.true.}, a local Richardson number dependent formulation for the vertical momentum and
+tracer eddy coefficients is set through the \nam{zdf\_ric} namelist variables.
+The vertical mixing coefficients are diagnosed from the large scale variables computed by the model.
 \textit{In situ} measurements have been used to link vertical turbulent activity to large scale ocean structures.
 The hypothesis of a mixing mainly maintained by the growth of Kelvin-Helmholtz like instabilities leads to
 a dependency between the vertical eddy coefficients and the local Richardson number
-(\ie the ratio of stratification to vertical shear).
-Following \citet{Pacanowski_Philander_JPO81}, the following formulation has been implemented:
-\[
-  % \label{eq:zdfric}
+(\ie\ the ratio of stratification to vertical shear).
+Following \citet{pacanowski.philander_JPO81}, the following formulation has been implemented:
+\[
+  % \label{eq:ZDF_ric}
   \left\{
     \begin{aligned}
@@ -98 +112 @@
 \]
 where $Ri = N^2 / \left(\partial_z \textbf{U}_h \right)^2$ is the local Richardson number,
-$N$ is the local Brunt-Vais\"{a}l\"{a} frequency (see \autoref{subsec:TRA_bn2}), 
+$N$ is the local Brunt-Vais\"{a}l\"{a} frequency (see \autoref{subsec:TRA_bn2}),
 $A_b^{vT} $ and $A_b^{vm}$ are the constant background values set as in the constant case
 (see \autoref{subsec:ZDF_cst}), and $A_{ric}^{vT} = 10^{-4}~m^2.s^{-1}$ is the maximum value that
@@ -106 +120 @@
 
 A simple mixing-layer model to transfer and dissipate the atmospheric forcings
-(wind-stress and buoyancy fluxes) can be activated setting the \np{ln\_mldw}\forcode{ = .true.} in the namelist.
+(wind-stress and buoyancy fluxes) can be activated setting the \np{ln\_mldw}\forcode{=.true.} in the namelist.
 
 In this case, the local depth of turbulent wind-mixing or "Ekman depth" $h_{e}(x,y,t)$ is evaluated and
@@ -124 +138 @@
 The final $h_{e}$ is further constrained by the adjustable bounds \np{rn\_mldmin} and \np{rn\_mldmax}.
 Once $h_{e}$ is computed, the vertical eddy coefficients within $h_{e}$ are set to
-the empirical values \np{rn\_wtmix} and \np{rn\_wvmix} \citep{Lermusiaux2001}.
-
-% -------------------------------------------------------------------------------------------------------------
-%        TKE Turbulent Closure Scheme 
-% -------------------------------------------------------------------------------------------------------------
-\subsection{TKE turbulent closure scheme (\protect\key{zdftke})}
+the empirical values \np{rn\_wtmix} and \np{rn\_wvmix} \citep{lermusiaux_JMS01}.
+
+% -------------------------------------------------------------------------------------------------------------
+%        TKE Turbulent Closure Scheme
+% -------------------------------------------------------------------------------------------------------------
+\subsection[TKE turbulent closure scheme (\forcode{ln_zdftke=.true.})]
+{TKE turbulent closure scheme (\protect\np{ln\_zdftke}\forcode{=.true.})}
 \label{subsec:ZDF_tke}
-
 %--------------------------------------------namzdf_tke--------------------------------------------------
 
-\nlst{namzdf_tke}
+\begin{listing}
+  \nlst{namzdf_tke}
+  \caption{\texttt{namzdf\_tke}}
+  \label{lst:namzdf_tke}
+\end{listing}
 %--------------------------------------------------------------------------------------------------------------
 
@@ -140 +158 @@
 a prognostic equation for $\bar{e}$, the turbulent kinetic energy,
 and a closure assumption for the turbulent length scales.
-This turbulent closure model has been developed by \citet{Bougeault1989} in the atmospheric case,
-adapted by \citet{Gaspar1990} for the oceanic case, and embedded in OPA, the ancestor of NEMO,
-by \citet{Blanke1993} for equatorial Atlantic simulations.
-Since then, significant modifications have been introduced by \citet{Madec1998} in both the implementation and
+This turbulent closure model has been developed by \citet{bougeault.lacarrere_MWR89} in the atmospheric case,
+adapted by \citet{gaspar.gregoris.ea_JGR90} for the oceanic case, and embedded in OPA, the ancestor of \NEMO,
+by \citet{blanke.delecluse_JPO93} for equatorial Atlantic simulations.
+Since then, significant modifications have been introduced by \citet{madec.delecluse.ea_NPM98} in both the implementation and
 the formulation of the mixing length scale.
 The time evolution of $\bar{e}$ is the result of the production of $\bar{e}$ through vertical shear,
-its destruction through stratification, its vertical diffusion, and its dissipation of \citet{Kolmogorov1942} type:
+its destruction through stratification, its vertical diffusion, and its dissipation of \citet{kolmogorov_IANS42} type:
 \begin{equation}
-  \label{eq:zdftke_e}
+  \label{eq:ZDF_tke_e}
   \frac{\partial \bar{e}}{\partial t} =
   \frac{K_m}{{e_3}^2 }\;\left[ {\left( {\frac{\partial u}{\partial k}} \right)^2
@@ -158 +176 @@
 \end{equation}
 \[
-  % \label{eq:zdftke_kz}
+  % \label{eq:ZDF_tke_kz}
   \begin{split}
     K_m &= C_k\  l_k\  \sqrt {\bar{e}\; }    \\
@@ -164 +182 @@
   \end{split}
 \]
-where $N$ is the local Brunt-Vais\"{a}l\"{a} frequency (see \autoref{subsec:TRA_bn2}), 
-$l_{\epsilon }$ and $l_{\kappa }$ are the dissipation and mixing length scales, 
+where $N$ is the local Brunt-Vais\"{a}l\"{a} frequency (see \autoref{subsec:TRA_bn2}),
+$l_{\epsilon }$ and $l_{\kappa }$ are the dissipation and mixing length scales,
 $P_{rt}$ is the Prandtl number, $K_m$ and $K_\rho$ are the vertical eddy viscosity and diffusivity coefficients.
 The constants $C_k =  0.1$ and $C_\epsilon = \sqrt {2} /2$ $\approx 0.7$ are designed to deal with
-vertical mixing at any depth \citep{Gaspar1990}. 
+vertical mixing at any depth \citep{gaspar.gregoris.ea_JGR90}.
 They are set through namelist parameters \np{nn\_ediff} and \np{nn\_ediss}.
-$P_{rt}$ can be set to unity or, following \citet{Blanke1993}, be a function of the local Richardson number, $R_i$:
+$P_{rt}$ can be set to unity or, following \citet{blanke.delecluse_JPO93}, be a function of the local Richardson number, $R_i$:
 \begin{align*}
-  % \label{eq:prt}
+  % \label{eq:ZDF_prt}
   P_{rt} =
   \begin{cases}
@@ -180 +198 @@
   \end{cases}
 \end{align*}
-Options are defined through the  \ngn{namzdfy\_tke} namelist variables.
 The choice of $P_{rt}$ is controlled by the \np{nn\_pdl} namelist variable.
 
 At the sea surface, the value of $\bar{e}$ is prescribed from the wind stress field as
 $\bar{e}_o = e_{bb} |\tau| / \rho_o$, with $e_{bb}$ the \np{rn\_ebb} namelist parameter.
-The default value of $e_{bb}$ is 3.75. \citep{Gaspar1990}), however a much larger value can be used when
+The default value of $e_{bb}$ is 3.75. \citep{gaspar.gregoris.ea_JGR90}), however a much larger value can be used when
 taking into account the surface wave breaking (see below Eq. \autoref{eq:ZDF_Esbc}).
 The bottom value of TKE is assumed to be equal to the value of the level just above.
@@ -191 +208 @@
 the numerical scheme does not ensure its positivity.
 To overcome this problem, a cut-off in the minimum value of $\bar{e}$ is used (\np{rn\_emin} namelist parameter).
-Following \citet{Gaspar1990}, the cut-off value is set to $\sqrt{2}/2~10^{-6}~m^2.s^{-2}$.
-This allows the subsequent formulations to match that of \citet{Gargett1984} for the diffusion in
+Following \citet{gaspar.gregoris.ea_JGR90}, the cut-off value is set to $\sqrt{2}/2~10^{-6}~m^2.s^{-2}$.
+This allows the subsequent formulations to match that of \citet{gargett_JMR84} for the diffusion in
 the thermocline and deep ocean :  $K_\rho = 10^{-3} / N$.
 In addition, a cut-off is applied on $K_m$ and $K_\rho$ to avoid numerical instabilities associated with
 too weak vertical diffusion.
 They must be specified at least larger than the molecular values, and are set through \np{rn\_avm0} and
-\np{rn\_avt0} (namzdf namelist, see \autoref{subsec:ZDF_cst}).
+\np{rn\_avt0} (\nam{zdf} namelist, see \autoref{subsec:ZDF_cst}).
 
 \subsubsection{Turbulent length scale}
 
 For computational efficiency, the original formulation of the turbulent length scales proposed by
-\citet{Gaspar1990} has been simplified.
+\citet{gaspar.gregoris.ea_JGR90} has been simplified.
 Four formulations are proposed, the choice of which is controlled by the \np{nn\_mxl} namelist parameter.
-The first two are based on the following first order approximation \citep{Blanke1993}:
+The first two are based on the following first order approximation \citep{blanke.delecluse_JPO93}:
 \begin{equation}
-  \label{eq:tke_mxl0_1}
+  \label{eq:ZDF_tke_mxl0_1}
   l_k = l_\epsilon = \sqrt {2 \bar{e}\; } / N
 \end{equation}
 which is valid in a stable stratified region with constant values of the Brunt-Vais\"{a}l\"{a} frequency.
 The resulting length scale is bounded by the distance to the surface or to the bottom
-(\np{nn\_mxl}\forcode{ = 0}) or by the local vertical scale factor (\np{nn\_mxl}\forcode{ = 1}).
-\citet{Blanke1993} notice that this simplification has two major drawbacks:
+(\np{nn\_mxl}\forcode{=0}) or by the local vertical scale factor (\np{nn\_mxl}\forcode{=1}).
+\citet{blanke.delecluse_JPO93} notice that this simplification has two major drawbacks:
 it makes no sense for locally unstable stratification and the computation no longer uses all
 the information contained in the vertical density profile.
-To overcome these drawbacks, \citet{Madec1998} introduces the \np{nn\_mxl}\forcode{ = 2..3} cases,
+To overcome these drawbacks, \citet{madec.delecluse.ea_NPM98} introduces the \np{nn\_mxl}\forcode{=2, 3} cases,
 which add an extra assumption concerning the vertical gradient of the computed length scale.
-So, the length scales are first evaluated as in \autoref{eq:tke_mxl0_1} and then bounded such that:
+So, the length scales are first evaluated as in \autoref{eq:ZDF_tke_mxl0_1} and then bounded such that:
 \begin{equation}
-  \label{eq:tke_mxl_constraint}
+  \label{eq:ZDF_tke_mxl_constraint}
   \frac{1}{e_3 }\left| {\frac{\partial l}{\partial k}} \right| \leq 1
   \qquad \text{with }\  l =  l_k = l_\epsilon
 \end{equation}
-\autoref{eq:tke_mxl_constraint} means that the vertical variations of the length scale cannot be larger than
+\autoref{eq:ZDF_tke_mxl_constraint} means that the vertical variations of the length scale cannot be larger than
 the variations of depth.
-It provides a better approximation of the \citet{Gaspar1990} formulation while being much less 
+It provides a better approximation of the \citet{gaspar.gregoris.ea_JGR90} formulation while being much less
 time consuming.
 In particular, it allows the length scale to be limited not only by the distance to the surface or
 to the ocean bottom but also by the distance to a strongly stratified portion of the water column such as
-the thermocline (\autoref{fig:mixing_length}).
-In order to impose the \autoref{eq:tke_mxl_constraint} constraint, we introduce two additional length scales:
+the thermocline (\autoref{fig:ZDF_mixing_length}).
+In order to impose the \autoref{eq:ZDF_tke_mxl_constraint} constraint, we introduce two additional length scales:
 $l_{up}$ and $l_{dwn}$, the upward and downward length scales, and
 evaluate the dissipation and mixing length scales as
@@ -236 +253 @@
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 \begin{figure}[!t]
-  \begin{center}
-    \includegraphics[width=1.00\textwidth]{Fig_mixing_length}
-    \caption{
-      \protect\label{fig:mixing_length}
-      Illustration of the mixing length computation.
-    }
-  \end{center}
+  \centering
+  \includegraphics[width=\textwidth]{Fig_mixing_length}
+  \caption[Mixing length computation]{Illustration of the mixing length computation}
+  \label{fig:ZDF_mixing_length}
 \end{figure}
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 \[
-  % \label{eq:tke_mxl2}
+  % \label{eq:ZDF_tke_mxl2}
   \begin{aligned}
     l_{up\ \ }^{(k)} &= \min \left(  l^{(k)} \ , \ l_{up}^{(k+1)} + e_{3t}^{(k)}\ \ \ \;  \right)
@@ -254 +268 @@
   \end{aligned}
 \]
-where $l^{(k)}$ is computed using \autoref{eq:tke_mxl0_1}, \ie $l^{(k)} = \sqrt {2 {\bar e}^{(k)} / {N^2}^{(k)} }$.
-
-In the \np{nn\_mxl}\forcode{ = 2} case, the dissipation and mixing length scales take the same value:
-$ l_k=  l_\epsilon = \min \left(\ l_{up} \;,\;  l_{dwn}\ \right)$, while in the \np{nn\_mxl}\forcode{ = 3} case,
-the dissipation and mixing turbulent length scales are give as in \citet{Gaspar1990}:
-\[
-  % \label{eq:tke_mxl_gaspar}
+where $l^{(k)}$ is computed using \autoref{eq:ZDF_tke_mxl0_1}, \ie\ $l^{(k)} = \sqrt {2 {\bar e}^{(k)} / {N^2}^{(k)} }$.
+
+In the \np{nn\_mxl}\forcode{=2} case, the dissipation and mixing length scales take the same value:
+$ l_k=  l_\epsilon = \min \left(\ l_{up} \;,\;  l_{dwn}\ \right)$, while in the \np{nn\_mxl}\forcode{=3} case,
+the dissipation and mixing turbulent length scales are give as in \citet{gaspar.gregoris.ea_JGR90}:
+\[
+  % \label{eq:ZDF_tke_mxl_gaspar}
   \begin{aligned}
     & l_k          = \sqrt{\  l_{up} \ \ l_{dwn}\ }   \\
@@ -270 +284 @@
 Usually the surface scale is given by $l_o = \kappa \,z_o$ where $\kappa = 0.4$ is von Karman's constant and
 $z_o$ the roughness parameter of the surface.
-Assuming $z_o=0.1$~m \citep{Craig_Banner_JPO94} leads to a 0.04~m, the default value of \np{rn\_mxl0}.
+Assuming $z_o=0.1$~m \citep{craig.banner_JPO94} leads to a 0.04~m, the default value of \np{rn\_mxl0}.
 In the ocean interior a minimum length scale is set to recover the molecular viscosity when
 $\bar{e}$ reach its minimum value ($1.10^{-6}= C_k\, l_{min} \,\sqrt{\bar{e}_{min}}$ ).
@@ -277 +291 @@
 %-----------------------------------------------------------------------%
 
-Following \citet{Mellor_Blumberg_JPO04}, the TKE turbulence closure model has been modified to
+Following \citet{mellor.blumberg_JPO04}, the TKE turbulence closure model has been modified to
 include the effect of surface wave breaking energetics.
 This results in a reduction of summertime surface temperature when the mixed layer is relatively shallow.
-The \citet{Mellor_Blumberg_JPO04} modifications acts on surface length scale and TKE values and
-air-sea drag coefficient. 
-The latter concerns the bulk formulea and is not discussed here. 
-
-Following \citet{Craig_Banner_JPO94}, the boundary condition on surface TKE value is :
+The \citet{mellor.blumberg_JPO04} modifications acts on surface length scale and TKE values and
+air-sea drag coefficient.
+The latter concerns the bulk formulae and is not discussed here.
+
+Following \citet{craig.banner_JPO94}, the boundary condition on surface TKE value is :
 \begin{equation}
   \label{eq:ZDF_Esbc}
   \bar{e}_o = \frac{1}{2}\,\left(  15.8\,\alpha_{CB} \right)^{2/3} \,\frac{|\tau|}{\rho_o}
 \end{equation}
-where $\alpha_{CB}$ is the \citet{Craig_Banner_JPO94} constant of proportionality which depends on the ''wave age'',
-ranging from 57 for mature waves to 146 for younger waves \citep{Mellor_Blumberg_JPO04}. 
+where $\alpha_{CB}$ is the \citet{craig.banner_JPO94} constant of proportionality which depends on the ''wave age'',
+ranging from 57 for mature waves to 146 for younger waves \citep{mellor.blumberg_JPO04}.
 The boundary condition on the turbulent length scale follows the Charnock's relation:
 \begin{equation}
@@ -297 +311 @@
 \end{equation}
 where $\kappa=0.40$ is the von Karman constant, and $\beta$ is the Charnock's constant.
-\citet{Mellor_Blumberg_JPO04} suggest $\beta = 2.10^{5}$ the value chosen by
-\citet{Stacey_JPO99} citing observation evidence, and
+\citet{mellor.blumberg_JPO04} suggest $\beta = 2.10^{5}$ the value chosen by
+\citet{stacey_JPO99} citing observation evidence, and
 $\alpha_{CB} = 100$ the Craig and Banner's value.
 As the surface boundary condition on TKE is prescribed through $\bar{e}_o = e_{bb} |\tau| / \rho_o$,
-with $e_{bb}$ the \np{rn\_ebb} namelist parameter, setting \np{rn\_ebb}\forcode{ = 67.83} corresponds 
+with $e_{bb}$ the \np{rn\_ebb} namelist parameter, setting \np{rn\_ebb}\forcode{ = 67.83} corresponds
 to $\alpha_{CB} = 100$.
-Further setting  \np{ln\_mxl0} to true applies \autoref{eq:ZDF_Lsbc} as surface boundary condition on length scale,
+Further setting  \np{ln\_mxl0}\forcode{ =.true.},  applies \autoref{eq:ZDF_Lsbc} as the surface boundary condition on the length scale,
 with $\beta$ hard coded to the Stacey's value.
-Note that a minimal threshold of \np{rn\_emin0}$=10^{-4}~m^2.s^{-2}$ (namelist parameters) is applied on
+Note that a minimal threshold of \np{rn\_emin0}$=10^{-4}~m^2.s^{-2}$ (namelist parameters) is applied on the
 surface $\bar{e}$ value.
 
@@ -315 +329 @@
 Although LC have nothing to do with convection, the circulation pattern is rather similar to
 so-called convective rolls in the atmospheric boundary layer.
-The detailed physics behind LC is described in, for example, \citet{Craik_Leibovich_JFM76}.
+The detailed physics behind LC is described in, for example, \citet{craik.leibovich_JFM76}.
 The prevailing explanation is that LC arise from a nonlinear interaction between the Stokes drift and
-wind drift currents. 
+wind drift currents.
 
 Here we introduced in the TKE turbulent closure the simple parameterization of Langmuir circulations proposed by
-\citep{Axell_JGR02} for a $k-\epsilon$ turbulent closure.
+\citep{axell_JGR02} for a $k-\epsilon$ turbulent closure.
 The parameterization, tuned against large-eddy simulation, includes the whole effect of LC in
-an extra source terms of TKE, $P_{LC}$.
-The presence of $P_{LC}$ in \autoref{eq:zdftke_e}, the TKE equation, is controlled by setting \np{ln\_lc} to
-\forcode{.true.} in the namtke namelist.
- 
-By making an analogy with the characteristic convective velocity scale (\eg, \citet{D'Alessio_al_JPO98}),
-$P_{LC}$ is assumed to be : 
+an extra source term of TKE, $P_{LC}$.
+The presence of $P_{LC}$ in \autoref{eq:ZDF_tke_e}, the TKE equation, is controlled by setting \np{ln\_lc} to
+\forcode{.true.} in the \nam{zdf\_tke} namelist.
+
+By making an analogy with the characteristic convective velocity scale (\eg, \citet{dalessio.abdella.ea_JPO98}),
+$P_{LC}$ is assumed to be :
 \[
 P_{LC}(z) = \frac{w_{LC}^3(z)}{H_{LC}}
 \]
 where $w_{LC}(z)$ is the vertical velocity profile of LC, and $H_{LC}$ is the LC depth.
-With no information about the wave field, $w_{LC}$ is assumed to be proportional to 
-the Stokes drift $u_s = 0.377\,\,|\tau|^{1/2}$, where $|\tau|$ is the surface wind stress module 
-\footnote{Following \citet{Li_Garrett_JMR93}, the surface Stoke drift velocity may be expressed as
+With no information about the wave field, $w_{LC}$ is assumed to be proportional to
+the Stokes drift $u_s = 0.377\,\,|\tau|^{1/2}$, where $|\tau|$ is the surface wind stress module
+\footnote{Following \citet{li.garrett_JMR93}, the surface Stoke drift velocity may be expressed as
   $u_s =  0.016 \,|U_{10m}|$.
   Assuming an air density of $\rho_a=1.22 \,Kg/m^3$ and a drag coefficient of
@@ -341 +355 @@
 For the vertical variation, $w_{LC}$ is assumed to be zero at the surface as well as at
 a finite depth $H_{LC}$ (which is often close to the mixed layer depth),
-and simply varies as a sine function in between (a first-order profile for the Langmuir cell structures). 
+and simply varies as a sine function in between (a first-order profile for the Langmuir cell structures).
 The resulting expression for $w_{LC}$ is :
 \[
@@ -350 +364 @@
   \end{cases}
 \]
-where $c_{LC} = 0.15$ has been chosen by \citep{Axell_JGR02} as a good compromise to fit LES data.
+where $c_{LC} = 0.15$ has been chosen by \citep{axell_JGR02} as a good compromise to fit LES data.
 The chosen value yields maximum vertical velocities $w_{LC}$ of the order of a few centimeters per second.
 The value of $c_{LC}$ is set through the \np{rn\_lc} namelist parameter,
-having in mind that it should stay between 0.15 and 0.54 \citep{Axell_JGR02}. 
+having in mind that it should stay between 0.15 and 0.54 \citep{axell_JGR02}.
 
 The $H_{LC}$ is estimated in a similar way as the turbulent length scale of TKE equations:
-$H_{LC}$ is depth to which a water parcel with kinetic energy due to Stoke drift can reach on its own by
-converting its kinetic energy to potential energy, according to 
+$H_{LC}$ is the depth to which a water parcel with kinetic energy due to Stoke drift can reach on its own by
+converting its kinetic energy to potential energy, according to
 \[
 - \int_{-H_{LC}}^0 { N^2\;z  \;dz} = \frac{1}{2} u_s^2
@@ -368 +382 @@
 produce mixed-layer depths that are too shallow during summer months and windy conditions.
 This bias is particularly acute over the Southern Ocean.
-To overcome this systematic bias, an ad hoc parameterization is introduced into the TKE scheme \cite{Rodgers_2014}. 
-The parameterization is an empirical one, \ie not derived from theoretical considerations,
-but rather is meant to account for observed processes that affect the density structure of 
-the ocean’s planetary boundary layer that are not explicitly captured by default in the TKE scheme 
-(\ie near-inertial oscillations and ocean swells and waves).
-
-When using this parameterization (\ie when \np{nn\_etau}\forcode{ = 1}),
+To overcome this systematic bias, an ad hoc parameterization is introduced into the TKE scheme \cite{rodgers.aumont.ea_B14}.
+The parameterization is an empirical one, \ie\ not derived from theoretical considerations,
+but rather is meant to account for observed processes that affect the density structure of
+the ocean’s planetary boundary layer that are not explicitly captured by default in the TKE scheme
+(\ie\ near-inertial oscillations and ocean swells and waves).
+
+When using this parameterization (\ie\ when \np{nn\_etau}\forcode{=1}),
 the TKE input to the ocean ($S$) imposed by the winds in the form of near-inertial oscillations,
 swell and waves is parameterized by \autoref{eq:ZDF_Esbc} the standard TKE surface boundary condition,
@@ -383 +397 @@
 \end{equation}
 where $z$ is the depth, $e_s$ is TKE surface boundary condition, $f_r$ is the fraction of the surface TKE that
-penetrate in the ocean, $h_\tau$ is a vertical mixing length scale that controls exponential shape of
+penetrates in the ocean, $h_\tau$ is a vertical mixing length scale that controls exponential shape of
 the penetration, and $f_i$ is the ice concentration
-(no penetration if $f_i=1$, that is if the ocean is entirely covered by sea-ice).
+(no penetration if $f_i=1$, \ie\ if the ocean is entirely covered by sea-ice).
 The value of $f_r$, usually a few percents, is specified through \np{rn\_efr} namelist parameter.
-The vertical mixing length scale, $h_\tau$, can be set as a 10~m uniform value (\np{nn\_etau}\forcode{ = 0}) or
+The vertical mixing length scale, $h_\tau$, can be set as a 10~m uniform value (\np{nn\_etau}\forcode{=0}) or
 a latitude dependent value (varying from 0.5~m at the Equator to a maximum value of 30~m at high latitudes
-(\np{nn\_etau}\forcode{ = 1}). 
-
-Note that two other option existe, \np{nn\_etau}\forcode{ = 2..3}.
+(\np{nn\_etau}\forcode{=1}).
+
+Note that two other option exist, \np{nn\_etau}\forcode{=2, 3}.
 They correspond to applying \autoref{eq:ZDF_Ehtau} only at the base of the mixed layer,
-or to using the high frequency part of the stress to evaluate the fraction of TKE that penetrate the ocean. 
+or to using the high frequency part of the stress to evaluate the fraction of TKE that penetrates the ocean.
 Those two options are obsolescent features introduced for test purposes.
-They will be removed in the next release. 
-
-% from Burchard et al OM 2008 : 
-% the most critical process not reproduced by statistical turbulence models is the activity of 
-% internal waves and their interaction with turbulence. After the Reynolds decomposition, 
-% internal waves are in principle included in the RANS equations, but later partially 
-% excluded by the hydrostatic assumption and the model resolution. 
-% Thus far, the representation of internal wave mixing in ocean models has been relatively crude 
-% (\eg Mellor, 1989; Large et al., 1994; Meier, 2001; Axell, 2002; St. Laurent and Garrett, 2002).
-
-% -------------------------------------------------------------------------------------------------------------
-%        TKE discretization considerations
-% -------------------------------------------------------------------------------------------------------------
-\subsection{TKE discretization considerations (\protect\key{zdftke})}
+They will be removed in the next release.
+
+% This should be explain better below what this rn_eice parameter is meant for:
+In presence of Sea Ice, the value of this mixing can be modulated by the \np{rn\_eice} namelist parameter.
+This parameter varies from \forcode{0} for no effect to \forcode{4} to suppress the TKE input into the ocean when Sea Ice concentration
+is greater than 25\%.
+
+% from Burchard et al OM 2008 :
+% the most critical process not reproduced by statistical turbulence models is the activity of
+% internal waves and their interaction with turbulence. After the Reynolds decomposition,
+% internal waves are in principle included in the RANS equations, but later partially
+% excluded by the hydrostatic assumption and the model resolution.
+% Thus far, the representation of internal wave mixing in ocean models has been relatively crude
+% (\eg\ Mellor, 1989; Large et al., 1994; Meier, 2001; Axell, 2002; St. Laurent and Garrett, 2002).
+
+% -------------------------------------------------------------------------------------------------------------
+%        GLS Generic Length Scale Scheme
+% -------------------------------------------------------------------------------------------------------------
+\subsection[GLS: Generic Length Scale (\forcode{ln_zdfgls=.true.})]
+{GLS: Generic Length Scale (\protect\np{ln\_zdfgls}\forcode{=.true.})}
+\label{subsec:ZDF_gls}
+
+%--------------------------------------------namzdf_gls---------------------------------------------------------
+
+\begin{listing}
+  \nlst{namzdf_gls}
+  \caption{\texttt{namzdf\_gls}}
+  \label{lst:namzdf_gls}
+\end{listing}
+%--------------------------------------------------------------------------------------------------------------
+
+The Generic Length Scale (GLS) scheme is a turbulent closure scheme based on two prognostic equations:
+one for the turbulent kinetic energy $\bar {e}$, and another for the generic length scale,
+$\psi$ \citep{umlauf.burchard_JMR03, umlauf.burchard_CSR05}.
+This later variable is defined as: $\psi = {C_{0\mu}}^{p} \ {\bar{e}}^{m} \ l^{n}$,
+where the triplet $(p, m, n)$ value given in Tab.\autoref{tab:ZDF_GLS} allows to recover a number of
+well-known turbulent closures ($k$-$kl$ \citep{mellor.yamada_RG82}, $k$-$\epsilon$ \citep{rodi_JGR87},
+$k$-$\omega$ \citep{wilcox_AJ88} among others \citep{umlauf.burchard_JMR03,kantha.carniel_JMR03}).
+The GLS scheme is given by the following set of equations:
+\begin{equation}
+  \label{eq:ZDF_gls_e}
+  \frac{\partial \bar{e}}{\partial t} =
+  \frac{K_m}{\sigma_e e_3 }\;\left[ {\left( \frac{\partial u}{\partial k} \right)^2
+      +\left( \frac{\partial v}{\partial k} \right)^2} \right]
+  -K_\rho \,N^2
+  +\frac{1}{e_3}\,\frac{\partial}{\partial k} \left[ \frac{K_m}{e_3}\,\frac{\partial \bar{e}}{\partial k} \right]
+  - \epsilon
+\end{equation}
+
+\[
+  % \label{eq:ZDF_gls_psi}
+  \begin{split}
+    \frac{\partial \psi}{\partial t} =& \frac{\psi}{\bar{e}} \left\{
+      \frac{C_1\,K_m}{\sigma_{\psi} {e_3}}\;\left[ {\left( \frac{\partial u}{\partial k} \right)^2
+          +\left( \frac{\partial v}{\partial k} \right)^2} \right]
+      - C_3 \,K_\rho\,N^2   - C_2 \,\epsilon \,Fw   \right\}             \\
+    &+\frac{1}{e_3}  \;\frac{\partial }{\partial k}\left[ {\frac{K_m}{e_3 }
+        \;\frac{\partial \psi}{\partial k}} \right]\;
+  \end{split}
+\]
+
+\[
+  % \label{eq:ZDF_gls_kz}
+  \begin{split}
+    K_m    &= C_{\mu} \ \sqrt {\bar{e}} \ l         \\
+    K_\rho &= C_{\mu'}\ \sqrt {\bar{e}} \ l
+  \end{split}
+\]
+
+\[
+  % \label{eq:ZDF_gls_eps}
+  {\epsilon} = C_{0\mu} \,\frac{\bar {e}^{3/2}}{l} \;
+\]
+where $N$ is the local Brunt-Vais\"{a}l\"{a} frequency (see \autoref{subsec:TRA_bn2}) and
+$\epsilon$ the dissipation rate.
+The constants $C_1$, $C_2$, $C_3$, ${\sigma_e}$, ${\sigma_{\psi}}$ and the wall function ($Fw$) depends of
+the choice of the turbulence model.
+Four different turbulent models are pre-defined (\autoref{tab:ZDF_GLS}).
+They are made available through the \np{nn\_clo} namelist parameter.
+
+%--------------------------------------------------TABLE--------------------------------------------------
+\begin{table}[htbp]
+  \centering
+  % \begin{tabular}{cp{70pt}cp{70pt}cp{70pt}cp{70pt}cp{70pt}cp{70pt}c}
+  \begin{tabular}{ccccc}
+    &   $k-kl$   & $k-\epsilon$ & $k-\omega$ &   generic   \\
+    % & \citep{mellor.yamada_RG82} &  \citep{rodi_JGR87}       & \citep{wilcox_AJ88} &                 \\
+    \hline
+    \hline
+    \np{nn\_clo}     & \textbf{0} &   \textbf{1}  &   \textbf{2}   &    \textbf{3}   \\
+    \hline
+    $( p , n , m )$         &   ( 0 , 1 , 1 )   & ( 3 , 1.5 , -1 )   & ( -1 , 0.5 , -1 )    &  ( 2 , 1 , -0.67 )  \\
+    $\sigma_k$      &    2.44         &     1.              &      2.                &      0.8          \\
+    $\sigma_\psi$  &    2.44         &     1.3            &      2.                 &       1.07       \\
+    $C_1$              &      0.9         &     1.44          &      0.555          &       1.           \\
+    $C_2$              &      0.5         &     1.92          &      0.833          &       1.22       \\
+    $C_3$              &      1.           &     1.              &      1.                &       1.           \\
+    $F_{wall}$        &      Yes        &       --             &     --                  &      --          \\
+    \hline
+    \hline
+  \end{tabular}
+  \caption[Set of predefined GLS parameters or equivalently predefined turbulence models available]{
+    Set of predefined GLS parameters, or equivalently predefined turbulence models available with
+    \protect\np{ln\_zdfgls}\forcode{=.true.} and controlled by
+    the \protect\np{nn\_clos} namelist variable in \protect\nam{zdf\_gls}.}
+  \label{tab:ZDF_GLS}
+\end{table}
+%--------------------------------------------------------------------------------------------------------------
+
+In the Mellor-Yamada model, the negativity of $n$ allows to use a wall function to force the convergence of
+the mixing length towards $\kappa z_b$ ($\kappa$ is the Von Karman constant and $z_b$ the rugosity length scale) value near physical boundaries
+(logarithmic boundary layer law).
+$C_{\mu}$ and $C_{\mu'}$ are calculated from stability function proposed by \citet{galperin.kantha.ea_JAS88},
+or by \citet{kantha.clayson_JGR94} or one of the two functions suggested by \citet{canuto.howard.ea_JPO01}
+(\np{nn\_stab\_func}\forcode{=0, 3}, resp.).
+The value of $C_{0\mu}$ depends on the choice of the stability function.
+
+The surface and bottom boundary condition on both $\bar{e}$ and $\psi$ can be calculated thanks to Dirichlet or
+Neumann condition through \np{nn\_bc\_surf} and \np{nn\_bc\_bot}, resp.
+As for TKE closure, the wave effect on the mixing is considered when
+\np{rn\_crban}\forcode{ > 0.} \citep{craig.banner_JPO94, mellor.blumberg_JPO04}.
+The \np{rn\_crban} namelist parameter is $\alpha_{CB}$ in \autoref{eq:ZDF_Esbc} and
+\np{rn\_charn} provides the value of $\beta$ in \autoref{eq:ZDF_Lsbc}.
+
+The $\psi$ equation is known to fail in stably stratified flows, and for this reason
+almost all authors apply a clipping of the length scale as an \textit{ad hoc} remedy.
+With this clipping, the maximum permissible length scale is determined by $l_{max} = c_{lim} \sqrt{2\bar{e}}/ N$.
+A value of $c_{lim} = 0.53$ is often used \citep{galperin.kantha.ea_JAS88}.
+\cite{umlauf.burchard_CSR05} show that the value of the clipping factor is of crucial importance for
+the entrainment depth predicted in stably stratified situations,
+and that its value has to be chosen in accordance with the algebraic model for the turbulent fluxes.
+The clipping is only activated if \np{ln\_length\_lim}\forcode{=.true.},
+and the $c_{lim}$ is set to the \np{rn\_clim\_galp} value.
+
+The time and space discretization of the GLS equations follows the same energetic consideration as for
+the TKE case described in \autoref{subsec:ZDF_tke_ene} \citep{burchard_OM02}.
+Evaluation of the 4 GLS turbulent closure schemes can be found in \citet{warner.sherwood.ea_OM05} in ROMS model and
+ in \citet{reffray.guillaume.ea_GMD15} for the \NEMO\ model.
+
+
+% -------------------------------------------------------------------------------------------------------------
+%        OSM OSMOSIS BL Scheme
+% -------------------------------------------------------------------------------------------------------------
+\subsection[OSM: OSMosis boundary layer scheme (\forcode{ln_zdfosm=.true.})]
+{OSM: OSMosis boundary layer scheme (\protect\np{ln\_zdfosm}\forcode{=.true.})}
+\label{subsec:ZDF_osm}
+%--------------------------------------------namzdf_osm---------------------------------------------------------
+
+\begin{listing}
+  \nlst{namzdf_osm}
+  \caption{\texttt{namzdf\_osm}}
+  \label{lst:namzdf_osm}
+\end{listing}
+%--------------------------------------------------------------------------------------------------------------
+
+The OSMOSIS turbulent closure scheme is based on......   TBC
+
+% -------------------------------------------------------------------------------------------------------------
+%        TKE and GLS discretization considerations
+% -------------------------------------------------------------------------------------------------------------
+\subsection[ Discrete energy conservation for TKE and GLS schemes]
+{Discrete energy conservation for TKE and GLS schemes}
 \label{subsec:ZDF_tke_ene}
 
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 \begin{figure}[!t]
-  \begin{center}
-    \includegraphics[width=1.00\textwidth]{Fig_ZDF_TKE_time_scheme}
-    \caption{
-      \protect\label{fig:TKE_time_scheme}
-      Illustration of the TKE time integration and its links to the momentum and tracer time integration.
-    }
-  \end{center}  
+  \centering
+  \includegraphics[width=\textwidth]{Fig_ZDF_TKE_time_scheme}
+  \caption[Subgrid kinetic energy integration in GLS and TKE schemes]{
+    Illustration of the subgrid kinetic energy integration in GLS and TKE schemes and
+    its links to the momentum and tracer time integration.}
+  \label{fig:ZDF_TKE_time_scheme}
 \end{figure}
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 The production of turbulence by vertical shear (the first term of the right hand side of
-\autoref{eq:zdftke_e}) should balance the loss of kinetic energy associated with the vertical momentum diffusion
-(first line in \autoref{eq:PE_zdf}).
-To do so a special care have to be taken for both the time and space discretization of
-the TKE equation \citep{Burchard_OM02,Marsaleix_al_OM08}.
-
-Let us first address the time stepping issue. \autoref{fig:TKE_time_scheme} shows how
+\autoref{eq:ZDF_tke_e}) and  \autoref{eq:ZDF_gls_e}) should balance the loss of kinetic energy associated with the vertical momentum diffusion
+(first line in \autoref{eq:MB_zdf}).
+To do so a special care has to be taken for both the time and space discretization of
+the kinetic energy equation \citep{burchard_OM02,marsaleix.auclair.ea_OM08}.
+
+Let us first address the time stepping issue. \autoref{fig:ZDF_TKE_time_scheme} shows how
 the two-level Leap-Frog time stepping of the momentum and tracer equations interplays with
-the one-level forward time stepping of TKE equation.
+the one-level forward time stepping of the equation for $\bar{e}$.
 With this framework, the total loss of kinetic energy (in 1D for the demonstration) due to
 the vertical momentum diffusion is obtained by multiplying this quantity by $u^t$ and
-summing the result vertically:   
+summing the result vertically:
 \begin{equation}
-  \label{eq:energ1}
+  \label{eq:ZDF_energ1}
   \begin{split}
     \int_{-H}^{\eta}  u^t \,\partial_z &\left( {K_m}^t \,(\partial_z u)^{t+\rdt}  \right) \,dz   \\
@@ -444 +605 @@
 \end{equation}
 Here, the vertical diffusion of momentum is discretized backward in time with a coefficient, $K_m$,
-known at time $t$ (\autoref{fig:TKE_time_scheme}), as it is required when using the TKE scheme
-(see \autoref{sec:STP_forward_imp}).
-The first term of the right hand side of \autoref{eq:energ1} represents the kinetic energy transfer at
+known at time $t$ (\autoref{fig:ZDF_TKE_time_scheme}), as it is required when using the TKE scheme
+(see \autoref{sec:TD_forward_imp}).
+The first term of the right hand side of \autoref{eq:ZDF_energ1} represents the kinetic energy transfer at
 the surface (atmospheric forcing) and at the bottom (friction effect).
 The second term is always negative.
 It is the dissipation rate of kinetic energy, and thus minus the shear production rate of $\bar{e}$.
-\autoref{eq:energ1} implies that, to be energetically consistent,
+\autoref{eq:ZDF_energ1} implies that, to be energetically consistent,
 the production rate of $\bar{e}$ used to compute $(\bar{e})^t$ (and thus ${K_m}^t$) should be expressed as
 ${K_m}^{t-\rdt}\,(\partial_z u)^{t-\rdt} \,(\partial_z u)^t$
@@ -456 +617 @@
 
 A similar consideration applies on the destruction rate of $\bar{e}$ due to stratification
-(second term of the right hand side of \autoref{eq:zdftke_e}).
+(second term of the right hand side of \autoref{eq:ZDF_tke_e} and \autoref{eq:ZDF_gls_e}).
 This term must balance the input of potential energy resulting from vertical mixing.
-The rate of change of potential energy (in 1D for the demonstration) due vertical mixing is obtained by
-multiplying vertical density diffusion tendency by $g\,z$ and and summing the result vertically:
+The rate of change of potential energy (in 1D for the demonstration) due to vertical mixing is obtained by
+multiplying the vertical density diffusion tendency by $g\,z$ and and summing the result vertically:
 \begin{equation}
-  \label{eq:energ2}
+  \label{eq:ZDF_energ2}
   \begin{split}
     \int_{-H}^{\eta} g\,z\,\partial_z &\left( {K_\rho}^t \,(\partial_k \rho)^{t+\rdt}   \right) \,dz    \\
@@ -470 +631 @@
   \end{split}
 \end{equation}
-where we use $N^2 = -g \,\partial_k \rho / (e_3 \rho)$. 
-The first term of the right hand side of \autoref{eq:energ2} is always zero because
+where we use $N^2 = -g \,\partial_k \rho / (e_3 \rho)$.
+The first term of the right hand side of \autoref{eq:ZDF_energ2} is always zero because
 there is no diffusive flux through the ocean surface and bottom).
 The second term is minus the destruction rate of  $\bar{e}$ due to stratification.
-Therefore \autoref{eq:energ1} implies that, to be energetically consistent,
-the product ${K_\rho}^{t-\rdt}\,(N^2)^t$ should be used in \autoref{eq:zdftke_e}, the TKE equation.
+Therefore \autoref{eq:ZDF_energ1} implies that, to be energetically consistent,
+the product ${K_\rho}^{t-\rdt}\,(N^2)^t$ should be used in \autoref{eq:ZDF_tke_e} and  \autoref{eq:ZDF_gls_e}.
 
 Let us now address the space discretization issue.
 The vertical eddy coefficients are defined at $w$-point whereas the horizontal velocity components are in
-the centre of the side faces of a $t$-box in staggered C-grid (\autoref{fig:cell}).
+the centre of the side faces of a $t$-box in staggered C-grid (\autoref{fig:DOM_cell}).
 A space averaging is thus required to obtain the shear TKE production term.
-By redoing the \autoref{eq:energ1} in the 3D case, it can be shown that the product of eddy coefficient by
+By redoing the \autoref{eq:ZDF_energ1} in the 3D case, it can be shown that the product of eddy coefficient by
 the shear at $t$ and $t-\rdt$ must be performed prior to the averaging.
-Furthermore, the possible time variation of $e_3$ (\key{vvl} case) have to be taken into account.
+Furthermore, the time variation of $e_3$ has be taken into account.
 
 The above energetic considerations leads to the following final discrete form for the TKE equation:
 \begin{equation}
-  \label{eq:zdftke_ene}
+  \label{eq:ZDF_tke_ene}
   \begin{split}
     \frac { (\bar{e})^t - (\bar{e})^{t-\rdt} } {\rdt}  \equiv
@@ -504 +665 @@
   \end{split}
 \end{equation}
-where the last two terms in \autoref{eq:zdftke_ene} (vertical diffusion and Kolmogorov dissipation)
-are time stepped using a backward scheme (see\autoref{sec:STP_forward_imp}).
+where the last two terms in \autoref{eq:ZDF_tke_ene} (vertical diffusion and Kolmogorov dissipation)
+are time stepped using a backward scheme (see\autoref{sec:TD_forward_imp}).
 Note that the Kolmogorov term has been linearized in time in order to render the implicit computation possible.
-The restart of the TKE scheme requires the storage of $\bar {e}$, $K_m$, $K_\rho$ and $l_\epsilon$ as
-they all appear in the right hand side of \autoref{eq:zdftke_ene}.
-For the latter, it is in fact the ratio $\sqrt{\bar{e}}/l_\epsilon$ which is stored. 
-
-% -------------------------------------------------------------------------------------------------------------
-%        GLS Generic Length Scale Scheme 
-% -------------------------------------------------------------------------------------------------------------
-\subsection{GLS: Generic Length Scale (\protect\key{zdfgls})}
-\label{subsec:ZDF_gls}
-
-%--------------------------------------------namzdf_gls---------------------------------------------------------
-
-\nlst{namzdf_gls}
-%--------------------------------------------------------------------------------------------------------------
-
-The Generic Length Scale (GLS) scheme is a turbulent closure scheme based on two prognostic equations:
-one for the turbulent kinetic energy $\bar {e}$, and another for the generic length scale,
-$\psi$ \citep{Umlauf_Burchard_JMS03, Umlauf_Burchard_CSR05}.
-This later variable is defined as: $\psi = {C_{0\mu}}^{p} \ {\bar{e}}^{m} \ l^{n}$, 
-where the triplet $(p, m, n)$ value given in Tab.\autoref{tab:GLS} allows to recover a number of
-well-known turbulent closures ($k$-$kl$ \citep{Mellor_Yamada_1982}, $k$-$\epsilon$ \citep{Rodi_1987},
-$k$-$\omega$ \citep{Wilcox_1988} among others \citep{Umlauf_Burchard_JMS03,Kantha_Carniel_CSR05}). 
-The GLS scheme is given by the following set of equations:
-\begin{equation}
-  \label{eq:zdfgls_e}
-  \frac{\partial \bar{e}}{\partial t} =
-  \frac{K_m}{\sigma_e e_3 }\;\left[ {\left( \frac{\partial u}{\partial k} \right)^2
-      +\left( \frac{\partial v}{\partial k} \right)^2} \right]
-  -K_\rho \,N^2
-  +\frac{1}{e_3}\,\frac{\partial}{\partial k} \left[ \frac{K_m}{e_3}\,\frac{\partial \bar{e}}{\partial k} \right]
-  - \epsilon
-\end{equation}
-
-\[
-  % \label{eq:zdfgls_psi}
-  \begin{split}
-    \frac{\partial \psi}{\partial t} =& \frac{\psi}{\bar{e}} \left\{
-      \frac{C_1\,K_m}{\sigma_{\psi} {e_3}}\;\left[ {\left( \frac{\partial u}{\partial k} \right)^2
-          +\left( \frac{\partial v}{\partial k} \right)^2} \right]
-      - C_3 \,K_\rho\,N^2   - C_2 \,\epsilon \,Fw   \right\}             \\
-    &+\frac{1}{e_3}  \;\frac{\partial }{\partial k}\left[ {\frac{K_m}{e_3 }
-        \;\frac{\partial \psi}{\partial k}} \right]\;
-  \end{split}
-\]
-
-\[
-  % \label{eq:zdfgls_kz}
-  \begin{split}
-    K_m    &= C_{\mu} \ \sqrt {\bar{e}} \ l         \\
-    K_\rho &= C_{\mu'}\ \sqrt {\bar{e}} \ l
-  \end{split}
-\]
-
-\[
-  % \label{eq:zdfgls_eps}
-  {\epsilon} = C_{0\mu} \,\frac{\bar {e}^{3/2}}{l} \;
-\]
-where $N$ is the local Brunt-Vais\"{a}l\"{a} frequency (see \autoref{subsec:TRA_bn2}) and
-$\epsilon$ the dissipation rate. 
-The constants $C_1$, $C_2$, $C_3$, ${\sigma_e}$, ${\sigma_{\psi}}$ and the wall function ($Fw$) depends of
-the choice of the turbulence model.
-Four different turbulent models are pre-defined (Tab.\autoref{tab:GLS}).
-They are made available through the \np{nn\_clo} namelist parameter. 
-
-%--------------------------------------------------TABLE--------------------------------------------------
-\begin{table}[htbp]
-  \begin{center}
-    % \begin{tabular}{cp{70pt}cp{70pt}cp{70pt}cp{70pt}cp{70pt}cp{70pt}c}
-    \begin{tabular}{ccccc}
-      &   $k-kl$   & $k-\epsilon$ & $k-\omega$ &   generic   \\
-      % & \citep{Mellor_Yamada_1982} &  \citep{Rodi_1987}       & \citep{Wilcox_1988} &                 \\
-      \hline
-      \hline
-      \np{nn\_clo}     & \textbf{0} &   \textbf{1}  &   \textbf{2}   &    \textbf{3}   \\
-      \hline
-      $( p , n , m )$          &   ( 0 , 1 , 1 )   & ( 3 , 1.5 , -1 )   & ( -1 , 0.5 , -1 )    &  ( 2 , 1 , -0.67 )  \\
-      $\sigma_k$      &    2.44         &     1.              &      2.                &      0.8          \\
-      $\sigma_\psi$  &    2.44         &     1.3            &      2.                 &       1.07       \\
-      $C_1$              &      0.9         &     1.44          &      0.555          &       1.           \\
-      $C_2$              &      0.5         &     1.92          &      0.833          &       1.22       \\
-      $C_3$              &      1.           &     1.              &      1.                &       1.           \\
-      $F_{wall}$        &      Yes        &       --             &     --                  &      --          \\
-      \hline
-      \hline
-    \end{tabular}
-    \caption{
-      \protect\label{tab:GLS}
-      Set of predefined GLS parameters, or equivalently predefined turbulence models available with
-      \protect\key{zdfgls} and controlled by the \protect\np{nn\_clos} namelist variable in \protect\ngn{namzdf\_gls}.
-    }
-  \end{center}
-\end{table}
-%--------------------------------------------------------------------------------------------------------------
-
-In the Mellor-Yamada model, the negativity of $n$ allows to use a wall function to force the convergence of
-the mixing length towards $K z_b$ ($K$: Kappa and $z_b$: rugosity length) value near physical boundaries
-(logarithmic boundary layer law).
-$C_{\mu}$ and $C_{\mu'}$ are calculated from stability function proposed by \citet{Galperin_al_JAS88},
-or by \citet{Kantha_Clayson_1994} or one of the two functions suggested by \citet{Canuto_2001}
-(\np{nn\_stab\_func}\forcode{ = 0..3}, resp.). 
-The value of $C_{0\mu}$ depends of the choice of the stability function.
-
-The surface and bottom boundary condition on both $\bar{e}$ and $\psi$ can be calculated thanks to Dirichlet or
-Neumann condition through \np{nn\_tkebc\_surf} and \np{nn\_tkebc\_bot}, resp.
-As for TKE closure, the wave effect on the mixing is considered when
-\np{ln\_crban}\forcode{ = .true.} \citep{Craig_Banner_JPO94, Mellor_Blumberg_JPO04}.
-The \np{rn\_crban} namelist parameter is $\alpha_{CB}$ in \autoref{eq:ZDF_Esbc} and
-\np{rn\_charn} provides the value of $\beta$ in \autoref{eq:ZDF_Lsbc}. 
-
-The $\psi$ equation is known to fail in stably stratified flows, and for this reason
-almost all authors apply a clipping of the length scale as an \textit{ad hoc} remedy.
-With this clipping, the maximum permissible length scale is determined by $l_{max} = c_{lim} \sqrt{2\bar{e}}/ N$.
-A value of $c_{lim} = 0.53$ is often used \citep{Galperin_al_JAS88}.
-\cite{Umlauf_Burchard_CSR05} show that the value of the clipping factor is of crucial importance for
-the entrainment depth predicted in stably stratified situations,
-and that its value has to be chosen in accordance with the algebraic model for the turbulent fluxes.
-The clipping is only activated if \np{ln\_length\_lim}\forcode{ = .true.},
-and the $c_{lim}$ is set to the \np{rn\_clim\_galp} value.
-
-The time and space discretization of the GLS equations follows the same energetic consideration as for
-the TKE case described in \autoref{subsec:ZDF_tke_ene} \citep{Burchard_OM02}.
-Examples of performance of the 4 turbulent closure scheme can be found in \citet{Warner_al_OM05}.
-
-% -------------------------------------------------------------------------------------------------------------
-%        OSM OSMOSIS BL Scheme 
-% -------------------------------------------------------------------------------------------------------------
-\subsection{OSM: OSMOSIS boundary layer scheme (\protect\key{zdfosm})}
-\label{subsec:ZDF_osm}
-
-%--------------------------------------------namzdf_osm---------------------------------------------------------
-
-\nlst{namzdf_osm}
-%--------------------------------------------------------------------------------------------------------------
-
-The OSMOSIS turbulent closure scheme is based on......   TBC
+%The restart of the TKE scheme requires the storage of $\bar {e}$, $K_m$, $K_\rho$ and $l_\epsilon$ as
+%they all appear in the right hand side of \autoref{eq:ZDF_tke_ene}.
+%For the latter, it is in fact the ratio $\sqrt{\bar{e}}/l_\epsilon$ which is stored.
 
 % ================================================================
@@ -649 +678 @@
 \label{sec:ZDF_conv}
 
-%--------------------------------------------namzdf--------------------------------------------------------
-
-\nlst{namzdf}
-%--------------------------------------------------------------------------------------------------------------
-
-Static instabilities (\ie light potential densities under heavy ones) may occur at particular ocean grid points.
+Static instabilities (\ie\ light potential densities under heavy ones) may occur at particular ocean grid points.
 In nature, convective processes quickly re-establish the static stability of the water column.
 These processes have been removed from the model via the hydrostatic assumption so they must be parameterized.
@@ -662 +686 @@
 
 % -------------------------------------------------------------------------------------------------------------
-%       Non-Penetrative Convective Adjustment 
-% -------------------------------------------------------------------------------------------------------------
-\subsection[Non-penetrative convective adjmt (\protect\np{ln\_tranpc}\forcode{ = .true.})]
-            {Non-penetrative convective adjustment (\protect\np{ln\_tranpc}\forcode{ = .true.})}
+%       Non-Penetrative Convective Adjustment
+% -------------------------------------------------------------------------------------------------------------
+\subsection[Non-penetrative convective adjustment (\forcode{ln_tranpc=.true.})]
+{Non-penetrative convective adjustment (\protect\np{ln\_tranpc}\forcode{=.true.})}
 \label{subsec:ZDF_npc}
-
-%--------------------------------------------namzdf--------------------------------------------------------
-
-\nlst{namzdf}
-%--------------------------------------------------------------------------------------------------------------
 
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 \begin{figure}[!htb]
-  \begin{center}
-    \includegraphics[width=0.90\textwidth]{Fig_npc}
-    \caption{
-      \protect\label{fig:npc}
-      Example of an unstable density profile treated by the non penetrative convective adjustment algorithm.
-      $1^{st}$ step: the initial profile is checked from the surface to the bottom.
-      It is found to be unstable between levels 3 and 4.
-      They are mixed.
-      The resulting $\rho$ is still larger than $\rho$(5): levels 3 to 5 are mixed.
-      The resulting $\rho$ is still larger than $\rho$(6): levels 3 to 6 are mixed.
-      The $1^{st}$ step ends since the density profile is then stable below the level 3.
-      $2^{nd}$ step: the new $\rho$ profile is checked following the same procedure as in $1^{st}$ step:
-      levels 2 to 5 are mixed.
-      The new density profile is checked.
-      It is found stable: end of algorithm.
-    }
-  \end{center}
+  \centering
+  \includegraphics[width=\textwidth]{Fig_npc}
+  \caption[Unstable density profile treated by the non penetrative convective adjustment algorithm]{
+    Example of an unstable density profile treated by
+    the non penetrative convective adjustment algorithm.
+    $1^{st}$ step: the initial profile is checked from the surface to the bottom.
+    It is found to be unstable between levels 3 and 4.
+    They are mixed.
+    The resulting $\rho$ is still larger than $\rho$(5): levels 3 to 5 are mixed.
+    The resulting $\rho$ is still larger than $\rho$(6): levels 3 to 6 are mixed.
+    The $1^{st}$ step ends since the density profile is then stable below the level 3.
+    $2^{nd}$ step: the new $\rho$ profile is checked following the same procedure as in $1^{st}$ step:
+    levels 2 to 5 are mixed.
+    The new density profile is checked.
+    It is found stable: end of algorithm.}
+  \label{fig:ZDF_npc}
 \end{figure}
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-Options are defined through the \ngn{namzdf} namelist variables.
-The non-penetrative convective adjustment is used when \np{ln\_zdfnpc}\forcode{ = .true.}.
+Options are defined through the \nam{zdf} namelist variables.
+The non-penetrative convective adjustment is used when \np{ln\_zdfnpc}\forcode{=.true.}.
 It is applied at each \np{nn\_npc} time step and mixes downwards instantaneously the statically unstable portion of
 the water column, but only until the density structure becomes neutrally stable
-(\ie until the mixed portion of the water column has \textit{exactly} the density of the water just below)
-\citep{Madec_al_JPO91}.
-The associated algorithm is an iterative process used in the following way (\autoref{fig:npc}):
+(\ie\ until the mixed portion of the water column has \textit{exactly} the density of the water just below)
+\citep{madec.delecluse.ea_JPO91}.
+The associated algorithm is an iterative process used in the following way (\autoref{fig:ZDF_npc}):
 starting from the top of the ocean, the first instability is found.
 Assume in the following that the instability is located between levels $k$ and $k+1$.
@@ -716 +734 @@
 This algorithm is significantly different from mixing statically unstable levels two by two.
 The latter procedure cannot converge with a finite number of iterations for some vertical profiles while
-the algorithm used in \NEMO converges for any profile in a number of iterations which is less than
+the algorithm used in \NEMO\ converges for any profile in a number of iterations which is less than
 the number of vertical levels.
-This property is of paramount importance as pointed out by \citet{Killworth1989}:
+This property is of paramount importance as pointed out by \citet{killworth_iprc89}:
 it avoids the existence of permanent and unrealistic static instabilities at the sea surface.
 This non-penetrative convective algorithm has been proved successful in studies of the deep water formation in
-the north-western Mediterranean Sea \citep{Madec_al_JPO91, Madec_al_DAO91, Madec_Crepon_Bk91}.
+the north-western Mediterranean Sea \citep{madec.delecluse.ea_JPO91, madec.chartier.ea_DAO91, madec.crepon_iprc91}.
 
 The current implementation has been modified in order to deal with any non linear equation of seawater
 (L. Brodeau, personnal communication).
 Two main differences have been introduced compared to the original algorithm:
-$(i)$ the stability is now checked using the Brunt-V\"{a}is\"{a}l\"{a} frequency 
-(not the the difference in potential density); 
+$(i)$ the stability is now checked using the Brunt-V\"{a}is\"{a}l\"{a} frequency
+(not the difference in potential density);
 $(ii)$ when two levels are found unstable, their thermal and haline expansion coefficients are vertically mixed in
 the same way their temperature and salinity has been mixed.
@@ -734 +752 @@
 
 % -------------------------------------------------------------------------------------------------------------
-%       Enhanced Vertical Diffusion 
-% -------------------------------------------------------------------------------------------------------------
-\subsection{Enhanced vertical diffusion (\protect\np{ln\_zdfevd}\forcode{ = .true.})}
+%       Enhanced Vertical Diffusion
+% -------------------------------------------------------------------------------------------------------------
+\subsection[Enhanced vertical diffusion (\forcode{ln_zdfevd=.true.})]
+{Enhanced vertical diffusion (\protect\np{ln\_zdfevd}\forcode{=.true.})}
 \label{subsec:ZDF_evd}
 
-%--------------------------------------------namzdf--------------------------------------------------------
-
-\nlst{namzdf}
-%--------------------------------------------------------------------------------------------------------------
-
-Options are defined through the  \ngn{namzdf} namelist variables.
-The enhanced vertical diffusion parameterisation is used when \np{ln\_zdfevd}\forcode{ = .true.}.
+Options are defined through the  \nam{zdf} namelist variables.
+The enhanced vertical diffusion parameterisation is used when \np{ln\_zdfevd}\forcode{=.true.}.
 In this case, the vertical eddy mixing coefficients are assigned very large values
-(a typical value is $10\;m^2s^{-1})$ in regions where the stratification is unstable
-(\ie when $N^2$ the Brunt-Vais\"{a}l\"{a} frequency is negative) \citep{Lazar_PhD97, Lazar_al_JPO99}.
-This is done either on tracers only (\np{nn\_evdm}\forcode{ = 0}) or
-on both momentum and tracers (\np{nn\_evdm}\forcode{ = 1}).
-
-In practice, where $N^2\leq 10^{-12}$, $A_T^{vT}$ and $A_T^{vS}$, and if \np{nn\_evdm}\forcode{ = 1},
+in regions where the stratification is unstable
+(\ie\ when $N^2$ the Brunt-Vais\"{a}l\"{a} frequency is negative) \citep{lazar_phd97, lazar.madec.ea_JPO99}.
+This is done either on tracers only (\np{nn\_evdm}\forcode{=0}) or
+on both momentum and tracers (\np{nn\_evdm}\forcode{=1}).
+
+In practice, where $N^2\leq 10^{-12}$, $A_T^{vT}$ and $A_T^{vS}$, and if \np{nn\_evdm}\forcode{=1},
 the four neighbouring $A_u^{vm} \;\mbox{and}\;A_v^{vm}$ values also, are set equal to
 the namelist parameter \np{rn\_avevd}.
@@ -759 +773 @@
 the convective adjustment algorithm presented above when mixing both tracers and
 momentum in the case of static instabilities.
-It requires the use of an implicit time stepping on vertical diffusion terms
-(\ie np{ln\_zdfexp}\forcode{ = .false.}).
 
 Note that the stability test is performed on both \textit{before} and \textit{now} values of $N^2$.
 This removes a potential source of divergence of odd and even time step in
-a leapfrog environment \citep{Leclair_PhD2010} (see \autoref{sec:STP_mLF}).
-
-% -------------------------------------------------------------------------------------------------------------
-%       Turbulent Closure Scheme 
-% -------------------------------------------------------------------------------------------------------------
-\subsection[Turbulent closure scheme (\protect\key{zdf}\{tke,gls,osm\})]{Turbulent Closure Scheme (\protect\key{zdftke}, \protect\key{zdfgls} or \protect\key{zdfosm})}
+a leapfrog environment \citep{leclair_phd10} (see \autoref{sec:TD_mLF}).
+
+% -------------------------------------------------------------------------------------------------------------
+%       Turbulent Closure Scheme
+% -------------------------------------------------------------------------------------------------------------
+\subsection{Handling convection with turbulent closure schemes (\forcode{ln_zdf{tke,gls,osm}=.true.})}
 \label{subsec:ZDF_tcs}
 
-The turbulent closure scheme presented in \autoref{subsec:ZDF_tke} and \autoref{subsec:ZDF_gls}
-(\key{zdftke} or \key{zdftke} is defined) in theory solves the problem of statically unstable density profiles.
+
+The turbulent closure schemes presented in \autoref{subsec:ZDF_tke}, \autoref{subsec:ZDF_gls} and
+\autoref{subsec:ZDF_osm} (\ie\ \np{ln\_zdftke} or \np{ln\_zdfgls} or \np{ln\_zdfosm} defined) deal, in theory,
+with statically unstable density profiles.
 In such a case, the term corresponding to the destruction of turbulent kinetic energy through stratification in
-\autoref{eq:zdftke_e} or \autoref{eq:zdfgls_e} becomes a source term, since $N^2$ is negative. 
-It results in large values of $A_T^{vT}$ and  $A_T^{vT}$, and also the four neighbouring $A_u^{vm} {and}\;A_v^{vm}$
-(up to $1\;m^2s^{-1}$).
+\autoref{eq:ZDF_tke_e} or \autoref{eq:ZDF_gls_e} becomes a source term, since $N^2$ is negative.
+It results in large values of $A_T^{vT}$ and  $A_T^{vT}$, and also of the four neighboring values at
+velocity points $A_u^{vm} {and}\;A_v^{vm}$ (up to $1\;m^2s^{-1}$).
 These large values restore the static stability of the water column in a way similar to that of
 the enhanced vertical diffusion parameterisation (\autoref{subsec:ZDF_evd}).
@@ -784 +798 @@
 because the mixing length scale is bounded by the distance to the sea surface.
 It can thus be useful to combine the enhanced vertical diffusion with the turbulent closure scheme,
-\ie setting the \np{ln\_zdfnpc} namelist parameter to true and
-defining the turbulent closure CPP key all together.
-
-The KPP turbulent closure scheme already includes enhanced vertical diffusion in the case of convection,
-as governed by the variables $bvsqcon$ and $difcon$ found in \mdl{zdfkpp},
-therefore \np{ln\_zdfevd}\forcode{ = .false.} should be used with the KPP scheme.
+\ie\ setting the \np{ln\_zdfnpc} namelist parameter to true and
+defining the turbulent closure (\np{ln\_zdftke} or \np{ln\_zdfgls} = \forcode{.true.}) all together.
+
+The OSMOSIS turbulent closure scheme already includes enhanced vertical diffusion in the case of convection,
+%as governed by the variables $bvsqcon$ and $difcon$ found in \mdl{zdfkpp},
+therefore \np{ln\_zdfevd}\forcode{=.false.} should be used with the OSMOSIS scheme.
 % gm%  + one word on non local flux with KPP scheme trakpp.F90 module...
 
@@ -795 +809 @@
 % Double Diffusion Mixing
 % ================================================================
-\section{Double diffusion mixing (\protect\key{zdfddm})}
-\label{sec:ZDF_ddm}
+\section[Double diffusion mixing (\forcode{ln_zdfddm=.true.})]
+{Double diffusion mixing (\protect\np{ln\_zdfddm}\forcode{=.true.})}
+\label{subsec:ZDF_ddm}
+
 
 %-------------------------------------------namzdf_ddm-------------------------------------------------
@@ -803 +819 @@
 %--------------------------------------------------------------------------------------------------------------
 
-Options are defined through the  \ngn{namzdf\_ddm} namelist variables.
+This parameterisation has been introduced in \mdl{zdfddm} module and is controlled by the namelist parameter
+\np{ln\_zdfddm} in \nam{zdf}.
 Double diffusion occurs when relatively warm, salty water overlies cooler, fresher water, or vice versa.
 The former condition leads to salt fingering and the latter to diffusive convection.
 Double-diffusive phenomena contribute to diapycnal mixing in extensive regions of the ocean.
-\citet{Merryfield1999} include a parameterisation of such phenomena in a global ocean model and show that 
+\citet{merryfield.holloway.ea_JPO99} include a parameterisation of such phenomena in a global ocean model and show that
 it leads to relatively minor changes in circulation but exerts significant regional influences on
 temperature and salinity.
-This parameterisation has been introduced in \mdl{zdfddm} module and is controlled by the \key{zdfddm} CPP key.
-
-Diapycnal mixing of S and T are described by diapycnal diffusion coefficients 
+
+
+Diapycnal mixing of S and T are described by diapycnal diffusion coefficients
 \begin{align*}
-  % \label{eq:zdfddm_Kz}
+  % \label{eq:ZDF_ddm_Kz}
   &A^{vT} = A_o^{vT}+A_f^{vT}+A_d^{vT} \\
   &A^{vS} = A_o^{vS}+A_f^{vS}+A_d^{vS}
@@ -826 +843 @@
 (1981):
 \begin{align}
-  \label{eq:zdfddm_f}
+  \label{eq:ZDF_ddm_f}
   A_f^{vS} &=
              \begin{cases}
@@ -832 +849 @@
                0                              &\text{otherwise}
              \end{cases}
-  \\         \label{eq:zdfddm_f_T}
-  A_f^{vT} &= 0.7 \ A_f^{vS} / R_\rho 
+  \\         \label{eq:ZDF_ddm_f_T}
+  A_f^{vT} &= 0.7 \ A_f^{vS} / R_\rho
 \end{align}
 
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 \begin{figure}[!t]
-  \begin{center}
-    \includegraphics[width=0.99\textwidth]{Fig_zdfddm}
-    \caption{
-      \protect\label{fig:zdfddm}
-      From \citet{Merryfield1999} :
-      (a) Diapycnal diffusivities $A_f^{vT}$ and $A_f^{vS}$ for temperature and salt in regions of salt fingering.
-      Heavy curves denote $A^{\ast v} = 10^{-3}~m^2.s^{-1}$ and thin curves $A^{\ast v} = 10^{-4}~m^2.s^{-1}$;
-      (b) diapycnal diffusivities $A_d^{vT}$ and $A_d^{vS}$ for temperature and salt in regions of
-      diffusive convection.
-      Heavy curves denote the Federov parameterisation and thin curves the Kelley parameterisation.
-      The latter is not implemented in \NEMO.
-    }
-  \end{center}
+  \centering
+  \includegraphics[width=\textwidth]{Fig_zdfddm}
+  \caption[Diapycnal diffusivities for temperature and salt in regions of salt fingering and
+  diffusive convection]{
+    From \citet{merryfield.holloway.ea_JPO99}:
+    (a) Diapycnal diffusivities $A_f^{vT}$ and $A_f^{vS}$ for temperature and salt in
+    regions of salt fingering.
+    Heavy curves denote $A^{\ast v} = 10^{-3}~m^2.s^{-1}$ and
+    thin curves $A^{\ast v} = 10^{-4}~m^2.s^{-1}$;
+    (b) diapycnal diffusivities $A_d^{vT}$ and $A_d^{vS}$ for temperature and salt in
+    regions of diffusive convection.
+    Heavy curves denote the Federov parameterisation and thin curves the Kelley parameterisation.
+    The latter is not implemented in \NEMO.}
+  \label{fig:ZDF_ddm}
 \end{figure}
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-The factor 0.7 in \autoref{eq:zdfddm_f_T} reflects the measured ratio $\alpha F_T /\beta F_S \approx  0.7$ of
-buoyancy flux of heat to buoyancy flux of salt (\eg, \citet{McDougall_Taylor_JMR84}).
-Following  \citet{Merryfield1999}, we adopt $R_c = 1.6$, $n = 6$, and $A^{\ast v} = 10^{-4}~m^2.s^{-1}$.
+The factor 0.7 in \autoref{eq:ZDF_ddm_f_T} reflects the measured ratio $\alpha F_T /\beta F_S \approx  0.7$ of
+buoyancy flux of heat to buoyancy flux of salt (\eg, \citet{mcdougall.taylor_JMR84}).
+Following  \citet{merryfield.holloway.ea_JPO99}, we adopt $R_c = 1.6$, $n = 6$, and $A^{\ast v} = 10^{-4}~m^2.s^{-1}$.
 
 To represent mixing of S and T by diffusive layering,  the diapycnal diffusivities suggested by
-Federov (1988) is used: 
+Federov (1988) is used:
 \begin{align}
-  % \label{eq:zdfddm_d}
+  % \label{eq:ZDF_ddm_d}
   A_d^{vT} &=
              \begin{cases}
@@ -869 +887 @@
              \end{cases}
                                        \nonumber \\
-  \label{eq:zdfddm_d_S}
+  \label{eq:ZDF_ddm_d_S}
   A_d^{vS} &=
              \begin{cases}
@@ -878 +896 @@
 \end{align}
 
-The dependencies of \autoref{eq:zdfddm_f} to \autoref{eq:zdfddm_d_S} on $R_\rho$ are illustrated in
-\autoref{fig:zdfddm}.
+The dependencies of \autoref{eq:ZDF_ddm_f} to \autoref{eq:ZDF_ddm_d_S} on $R_\rho$ are illustrated in
+\autoref{fig:ZDF_ddm}.
 Implementing this requires computing $R_\rho$ at each grid point on every time step.
 This is done in \mdl{eosbn2} at the same time as $N^2$ is computed.
@@ -887 +905 @@
 % Bottom Friction
 % ================================================================
-\section{Bottom and top friction (\protect\mdl{zdfbfr})}
-\label{sec:ZDF_bfr}
-
-%--------------------------------------------nambfr--------------------------------------------------------
+ \section[Bottom and top friction (\textit{zdfdrg.F90})]
+ {Bottom and top friction (\protect\mdl{zdfdrg})}
+ \label{sec:ZDF_drg}
+
+%--------------------------------------------namdrg--------------------------------------------------------
 %
-%\nlst{nambfr}
+\begin{listing}
+  \nlst{namdrg}
+  \caption{\texttt{namdrg}}
+  \label{lst:namdrg}
+\end{listing}
+\begin{listing}
+  \nlst{namdrg_top}
+  \caption{\texttt{namdrg\_top}}
+  \label{lst:namdrg_top}
+\end{listing}
+\begin{listing}
+  \nlst{namdrg_bot}
+  \caption{\texttt{namdrg\_bot}}
+  \label{lst:namdrg_bot}
+\end{listing}
+
 %--------------------------------------------------------------------------------------------------------------
 
-Options to define the top and bottom friction are defined through the \ngn{nambfr} namelist variables.
+Options to define the top and bottom friction are defined through the \nam{drg} namelist variables.
 The bottom friction represents the friction generated by the bathymetry.
 The top friction represents the friction generated by the ice shelf/ocean interface.
-As the friction processes at the top and bottom are treated in similar way,
-only the bottom friction is described in detail below.
+As the friction processes at the top and the bottom are treated in and identical way,
+the description below considers mostly the bottom friction case, if not stated otherwise.
 
 
@@ -905 +939 @@
 a condition on the vertical diffusive flux.
 For the bottom boundary layer, one has:
-\[
-  % \label{eq:zdfbfr_flux}
-  A^{vm} \left( \partial {\textbf U}_h / \partial z \right) = {{\cal F}}_h^{\textbf U}
-\]
+ \[
+   % \label{eq:ZDF_bfr_flux}
+   A^{vm} \left( \partial {\textbf U}_h / \partial z \right) = {{\cal F}}_h^{\textbf U}
+ \]
 where ${\cal F}_h^{\textbf U}$ is represents the downward flux of horizontal momentum outside
 the logarithmic turbulent boundary layer (thickness of the order of 1~m in the ocean).
@@ -916 +950 @@
 one needs a vertical diffusion coefficient $A^{vm} = 0.125$~m$^2$s$^{-1}$
 (for a Coriolis frequency $f = 10^{-4}$~m$^2$s$^{-1}$).
-With a background diffusion coefficient $A^{vm} = 10^{-4}$~m$^2$s$^{-1}$, the Ekman layer depth is only 1.4~m. 
+With a background diffusion coefficient $A^{vm} = 10^{-4}$~m$^2$s$^{-1}$, the Ekman layer depth is only 1.4~m.
 When the vertical mixing coefficient is this small, using a flux condition is equivalent to
 entering the viscous forces (either wind stress or bottom friction) as a body force over the depth of the top or
@@ -922 +956 @@
 To illustrate this, consider the equation for $u$ at $k$, the last ocean level:
 \begin{equation}
-  \label{eq:zdfbfr_flux2}
+  \label{eq:ZDF_drg_flux2}
   \frac{\partial u_k}{\partial t} = \frac{1}{e_{3u}} \left[ \frac{A_{uw}^{vm}}{e_{3uw}} \delta_{k+1/2}\;[u] - {\cal F}^u_h \right] \approx - \frac{{\cal F}^u_{h}}{e_{3u}}
 \end{equation}
@@ -935 +969 @@
 
 In the code, the bottom friction is imposed by adding the trend due to the bottom friction to
-the general momentum trend in \mdl{dynbfr}.
+ the general momentum trend in \mdl{dynzdf}.
 For the time-split surface pressure gradient algorithm, the momentum trend due to
 the barotropic component needs to be handled separately.
 For this purpose it is convenient to compute and store coefficients which can be simply combined with
 bottom velocities and geometric values to provide the momentum trend due to bottom friction.
-These coefficients are computed in \mdl{zdfbfr} and generally take the form $c_b^{\textbf U}$ where:
+ These coefficients are computed in \mdl{zdfdrg} and generally take the form $c_b^{\textbf U}$ where:
 \begin{equation}
-  \label{eq:zdfbfr_bdef}
+  \label{eq:ZDF_bfr_bdef}
   \frac{\partial {\textbf U_h}}{\partial t} =
   - \frac{{\cal F}^{\textbf U}_{h}}{e_{3u}} = \frac{c_b^{\textbf U}}{e_{3u}} \;{\textbf U}_h^b
 \end{equation}
 where $\textbf{U}_h^b = (u_b\;,\;v_b)$ is the near-bottom, horizontal, ocean velocity.
+Note than from \NEMO\ 4.0, drag coefficients are only computed at cell centers (\ie\ at T-points) and refer to as $c_b^T$ in the following. These are then linearly interpolated in space to get $c_b^\textbf{U}$ at velocity points.
 
 % -------------------------------------------------------------------------------------------------------------
 %       Linear Bottom Friction
 % -------------------------------------------------------------------------------------------------------------
-\subsection{Linear bottom friction (\protect\np{nn\_botfr}\forcode{ = 0..1})}
-\label{subsec:ZDF_bfr_linear}
-
-The linear bottom friction parameterisation (including the special case of a free-slip condition) assumes that
-the bottom friction is proportional to the interior velocity (\ie the velocity of the last model level):
-\[
-  % \label{eq:zdfbfr_linear}
+ \subsection[Linear top/bottom friction (\forcode{ln_lin=.true.})]
+ {Linear top/bottom friction (\protect\np{ln\_lin}\forcode{=.true.)}}
+ \label{subsec:ZDF_drg_linear}
+
+The linear friction parameterisation (including the special case of a free-slip condition) assumes that
+the friction is proportional to the interior velocity (\ie\ the velocity of the first/last model level):
+\[
+  % \label{eq:ZDF_bfr_linear}
   {\cal F}_h^\textbf{U} = \frac{A^{vm}}{e_3} \; \frac{\partial \textbf{U}_h}{\partial k} = r \; \textbf{U}_h^b
 \]
-where $r$ is a friction coefficient expressed in ms$^{-1}$.
-This coefficient is generally estimated by setting a typical decay time $\tau$ in the deep ocean, 
+where $r$ is a friction coefficient expressed in $m s^{-1}$.
+This coefficient is generally estimated by setting a typical decay time $\tau$ in the deep ocean,
 and setting $r = H / \tau$, where $H$ is the ocean depth.
-Commonly accepted values of $\tau$ are of the order of 100 to 200 days \citep{Weatherly_JMR84}.
+Commonly accepted values of $\tau$ are of the order of 100 to 200 days \citep{weatherly_JMR84}.
 A value $\tau^{-1} = 10^{-7}$~s$^{-1}$ equivalent to 115 days, is usually used in quasi-geostrophic models.
 One may consider the linear friction as an approximation of quadratic friction, $r \approx 2\;C_D\;U_{av}$
-(\citet{Gill1982}, Eq. 9.6.6).
+(\citet{gill_bk82}, Eq. 9.6.6).
 For example, with a drag coefficient $C_D = 0.002$, a typical speed of tidal currents of $U_{av} =0.1$~m\;s$^{-1}$,
 and assuming an ocean depth $H = 4000$~m, the resulting friction coefficient is $r = 4\;10^{-4}$~m\;s$^{-1}$.
 This is the default value used in \NEMO. It corresponds to a decay time scale of 115~days.
-It can be changed by specifying \np{rn\_bfri1} (namelist parameter).
-
-For the linear friction case the coefficients defined in the general expression \autoref{eq:zdfbfr_bdef} are: 
-\[
-  % \label{eq:zdfbfr_linbfr_b}
-  \begin{split}
-    c_b^u &= - r\\
-    c_b^v &= - r\\
-  \end{split}
-\]
-When \np{nn\_botfr}\forcode{ = 1}, the value of $r$ used is \np{rn\_bfri1}.
-Setting \np{nn\_botfr}\forcode{ = 0} is equivalent to setting $r=0$ and
-leads to a free-slip bottom boundary condition.
-These values are assigned in \mdl{zdfbfr}.
-From v3.2 onwards there is support for local enhancement of these values via an externally defined 2D mask array
-(\np{ln\_bfr2d}\forcode{ = .true.}) given in the \ifile{bfr\_coef} input NetCDF file.
+It can be changed by specifying \np{rn\_Uc0} (namelist parameter).
+
+ For the linear friction case the drag coefficient used in the general expression \autoref{eq:ZDF_bfr_bdef} is:
+\[
+  % \label{eq:ZDF_bfr_linbfr_b}
+    c_b^T = - r
+\]
+When \np{ln\_lin} \forcode{= .true.}, the value of $r$ used is \np{rn\_Uc0}*\np{rn\_Cd0}.
+Setting \np{ln\_OFF} \forcode{= .true.} (and \forcode{ln_lin=.true.}) is equivalent to setting $r=0$ and leads to a free-slip boundary condition.
+
+These values are assigned in \mdl{zdfdrg}.
+Note that there is support for local enhancement of these values via an externally defined 2D mask array
+(\np{ln\_boost}\forcode{=.true.}) given in the \ifile{bfr\_coef} input NetCDF file.
 The mask values should vary from 0 to 1.
 Locations with a non-zero mask value will have the friction coefficient increased by
-$mask\_value$*\np{rn\_bfrien}*\np{rn\_bfri1}.
+$mask\_value$ * \np{rn\_boost} * \np{rn\_Cd0}.
 
 % -------------------------------------------------------------------------------------------------------------
 %       Non-Linear Bottom Friction
 % -------------------------------------------------------------------------------------------------------------
-\subsection{Non-linear bottom friction (\protect\np{nn\_botfr}\forcode{ = 2})}
-\label{subsec:ZDF_bfr_nonlinear}
-
-The non-linear bottom friction parameterisation assumes that the bottom friction is quadratic: 
-\[
-  % \label{eq:zdfbfr_nonlinear}
+ \subsection[Non-linear top/bottom friction (\forcode{ln_non_lin=.true.})]
+ {Non-linear top/bottom friction (\protect\np{ln\_non\_lin}\forcode{=.true.})}
+ \label{subsec:ZDF_drg_nonlinear}
+
+The non-linear bottom friction parameterisation assumes that the top/bottom friction is quadratic:
+\[
+  % \label{eq:ZDF_drg_nonlinear}
   {\cal F}_h^\textbf{U} = \frac{A^{vm}}{e_3 }\frac{\partial \textbf {U}_h
   }{\partial k}=C_D \;\sqrt {u_b ^2+v_b ^2+e_b } \;\; \textbf {U}_h^b
 \]
-where $C_D$ is a drag coefficient, and $e_b $ a bottom turbulent kinetic energy due to tides,
+where $C_D$ is a drag coefficient, and $e_b $ a top/bottom turbulent kinetic energy due to tides,
 internal waves breaking and other short time scale currents.
 A typical value of the drag coefficient is $C_D = 10^{-3} $.
-As an example, the CME experiment \citep{Treguier_JGR92} uses $C_D = 10^{-3}$ and
-$e_b = 2.5\;10^{-3}$m$^2$\;s$^{-2}$, while the FRAM experiment \citep{Killworth1992} uses $C_D = 1.4\;10^{-3}$ and
+As an example, the CME experiment \citep{treguier_JGR92} uses $C_D = 10^{-3}$ and
+$e_b = 2.5\;10^{-3}$m$^2$\;s$^{-2}$, while the FRAM experiment \citep{killworth_JPO92} uses $C_D = 1.4\;10^{-3}$ and
 $e_b =2.5\;\;10^{-3}$m$^2$\;s$^{-2}$.
-The CME choices have been set as default values (\np{rn\_bfri2} and \np{rn\_bfeb2} namelist parameters).
-
-As for the linear case, the bottom friction is imposed in the code by adding the trend due to
-the bottom friction to the general momentum trend in \mdl{dynbfr}.
-For the non-linear friction case the terms computed in \mdl{zdfbfr} are:
-\[
-  % \label{eq:zdfbfr_nonlinbfr}
-  \begin{split}
-    c_b^u &= - \; C_D\;\left[ u^2 + \left(\bar{\bar{v}}^{i+1,j}\right)^2 + e_b \right]^{1/2}\\
-    c_b^v &= - \; C_D\;\left[  \left(\bar{\bar{u}}^{i,j+1}\right)^2 + v^2 + e_b \right]^{1/2}\\
-  \end{split}
-\]
-
-The coefficients that control the strength of the non-linear bottom friction are initialised as namelist parameters:
-$C_D$= \np{rn\_bfri2}, and $e_b$ =\np{rn\_bfeb2}.
-Note for applications which treat tides explicitly a low or even zero value of \np{rn\_bfeb2} is recommended.
-From v3.2 onwards a local enhancement of $C_D$ is possible via an externally defined 2D mask array
-(\np{ln\_bfr2d}\forcode{ = .true.}).
-This works in the same way as for the linear bottom friction case with non-zero masked locations increased by
-$mask\_value$*\np{rn\_bfrien}*\np{rn\_bfri2}.
+The CME choices have been set as default values (\np{rn\_Cd0} and \np{rn\_ke0} namelist parameters).
+
+As for the linear case, the friction is imposed in the code by adding the trend due to
+the friction to the general momentum trend in \mdl{dynzdf}.
+For the non-linear friction case the term computed in \mdl{zdfdrg} is:
+\[
+  % \label{eq:ZDF_drg_nonlinbfr}
+    c_b^T = - \; C_D\;\left[ \left(\bar{u_b}^{i}\right)^2 + \left(\bar{v_b}^{j}\right)^2 + e_b \right]^{1/2}
+\]
+
+The coefficients that control the strength of the non-linear friction are initialised as namelist parameters:
+$C_D$= \np{rn\_Cd0}, and $e_b$ =\np{rn\_bfeb2}.
+Note that for applications which consider tides explicitly, a low or even zero value of \np{rn\_bfeb2} is recommended. A local enhancement of $C_D$ is again possible via an externally defined 2D mask array
+(\np{ln\_boost}\forcode{=.true.}).
+This works in the same way as for the linear friction case with non-zero masked locations increased by
+$mask\_value$ * \np{rn\_boost} * \np{rn\_Cd0}.
 
 % -------------------------------------------------------------------------------------------------------------
 %       Bottom Friction Log-layer
 % -------------------------------------------------------------------------------------------------------------
-\subsection[Log-layer btm frict enhncmnt (\protect\np{nn\_botfr}\forcode{ = 2}, \protect\np{ln\_loglayer}\forcode{ = .true.})]
-            {Log-layer bottom friction enhancement (\protect\np{nn\_botfr}\forcode{ = 2}, \protect\np{ln\_loglayer}\forcode{ = .true.})}
-\label{subsec:ZDF_bfr_loglayer}
-
-In the non-linear bottom friction case, the drag coefficient, $C_D$, can be optionally enhanced using
-a "law of the wall" scaling.
-If  \np{ln\_loglayer} = .true., $C_D$ is no longer constant but is related to the thickness of
-the last wet layer in each column by:
-\[
-  C_D = \left ( {\kappa \over {\rm log}\left ( 0.5e_{3t}/rn\_bfrz0 \right ) } \right )^2
-\]
-
-\noindent where $\kappa$ is the von-Karman constant and \np{rn\_bfrz0} is a roughness length provided via
-the namelist.
-
-For stability, the drag coefficient is bounded such that it is kept greater or equal to
-the base \np{rn\_bfri2} value and it is not allowed to exceed the value of an additional namelist parameter:
-\np{rn\_bfri2\_max}, \ie
-\[
-  rn\_bfri2 \leq C_D \leq rn\_bfri2\_max
-\]
-
-\noindent Note also that a log-layer enhancement can also be applied to the top boundary friction if
-under ice-shelf cavities are in use (\np{ln\_isfcav}\forcode{ = .true.}).
-In this case, the relevant namelist parameters are \np{rn\_tfrz0}, \np{rn\_tfri2} and \np{rn\_tfri2\_max}.
-
-% -------------------------------------------------------------------------------------------------------------
-%       Bottom Friction stability
-% -------------------------------------------------------------------------------------------------------------
-\subsection{Bottom friction stability considerations}
-\label{subsec:ZDF_bfr_stability}
-
-Some care needs to exercised over the choice of parameters to ensure that the implementation of
-bottom friction does not induce numerical instability.
-For the purposes of stability analysis, an approximation to \autoref{eq:zdfbfr_flux2} is:
+ \subsection[Log-layer top/bottom friction (\forcode{ln_loglayer=.true.})]
+ {Log-layer top/bottom friction (\protect\np{ln\_loglayer}\forcode{=.true.})}
+ \label{subsec:ZDF_drg_loglayer}
+
+In the non-linear friction case, the drag coefficient, $C_D$, can be optionally enhanced using
+a "law of the wall" scaling. This assumes that the model vertical resolution can capture the logarithmic layer which typically occur for layers thinner than 1 m or so.
+If  \np{ln\_loglayer} \forcode{= .true.}, $C_D$ is no longer constant but is related to the distance to the wall (or equivalently to the half of the top/bottom layer thickness):
+\[
+  C_D = \left ( {\kappa \over {\mathrm log}\left ( 0.5 \; e_{3b} / rn\_{z0} \right ) } \right )^2
+\]
+
+\noindent where $\kappa$ is the von-Karman constant and \np{rn\_z0} is a roughness length provided via the namelist.
+
+The drag coefficient is bounded such that it is kept greater or equal to
+the base \np{rn\_Cd0} value which occurs where layer thicknesses become large and presumably logarithmic layers are not resolved at all. For stability reason, it is also not allowed to exceed the value of an additional namelist parameter:
+\np{rn\_Cdmax}, \ie
+\[
+  rn\_Cd0 \leq C_D \leq rn\_Cdmax
+\]
+
+\noindent The log-layer enhancement can also be applied to the top boundary friction if
+under ice-shelf cavities are activated (\np{ln\_isfcav}\forcode{=.true.}).
+%In this case, the relevant namelist parameters are \np{rn\_tfrz0}, \np{rn\_tfri2} and \np{rn\_tfri2\_max}.
+
+% -------------------------------------------------------------------------------------------------------------
+%       Explicit bottom Friction
+% -------------------------------------------------------------------------------------------------------------
+ \subsection{Explicit top/bottom friction (\forcode{ln_drgimp=.false.})}
+ \label{subsec:ZDF_drg_stability}
+
+Setting \np{ln\_drgimp} \forcode{= .false.} means that bottom friction is treated explicitly in time, which has the advantage of simplifying the interaction with the split-explicit free surface (see \autoref{subsec:ZDF_drg_ts}). The latter does indeed require the knowledge of bottom stresses in the course of the barotropic sub-iteration, which becomes less straightforward in the implicit case. In the explicit case, top/bottom stresses can be computed using \textit{before} velocities and inserted in the overall momentum tendency budget. This reads:
+
+At the top (below an ice shelf cavity):
+\[
+  \left.{\left( {\frac{A^{vm} }{e_3 }\ \frac{\partial \textbf{U}_h}{\partial k}} \right)} \right|_{t}
+  = c_{t}^{\textbf{U}}\textbf{u}^{n-1}_{t}
+\]
+
+At the bottom (above the sea floor):
+\[
+  \left.{\left( {\frac{A^{vm} }{e_3 }\ \frac{\partial \textbf{U}_h}{\partial k}} \right)} \right|_{b}
+  = c_{b}^{\textbf{U}}\textbf{u}^{n-1}_{b}
+\]
+
+Since this is conditionally stable, some care needs to exercised over the choice of parameters to ensure that the implementation of explicit top/bottom friction does not induce numerical instability.
+For the purposes of stability analysis, an approximation to \autoref{eq:ZDF_drg_flux2} is:
 \begin{equation}
-  \label{eq:Eqn_bfrstab}
+  \label{eq:ZDF_Eqn_drgstab}
   \begin{split}
     \Delta u &= -\frac{{{\cal F}_h}^u}{e_{3u}}\;2 \rdt    \\
@@ -1074 +1115 @@
   \end{split}
 \end{equation}
-\noindent where linear bottom friction and a leapfrog timestep have been assumed.
-To ensure that the bottom friction cannot reverse the direction of flow it is necessary to have:
-\[
-  |\Delta u| < \;|u| 
-\]
-\noindent which, using \autoref{eq:Eqn_bfrstab}, gives:
+\noindent where linear friction and a leapfrog timestep have been assumed.
+To ensure that the friction cannot reverse the direction of flow it is necessary to have:
+\[
+  |\Delta u| < \;|u|
+\]
+\noindent which, using \autoref{eq:ZDF_Eqn_drgstab}, gives:
 \[
   r\frac{2\rdt}{e_{3u}} < 1 \qquad  \Rightarrow \qquad r < \frac{e_{3u}}{2\rdt}\\
@@ -1092 +1133 @@
 For example, if $|u| = 1$ m.s$^{-1}$, $rdt = 1800$ s, $r = 10^{-3}$ then $e_{3u}$ should be greater than 3.6 m.
 For most applications, with physically sensible parameters these restrictions should not be of concern.
-But caution may be necessary if attempts are made to locally enhance the bottom friction parameters. 
-To ensure stability limits are imposed on the bottom friction coefficients both
+But caution may be necessary if attempts are made to locally enhance the bottom friction parameters.
+To ensure stability limits are imposed on the top/bottom friction coefficients both
 during initialisation and at each time step.
-Checks at initialisation are made in \mdl{zdfbfr} (assuming a 1 m.s$^{-1}$ velocity in the non-linear case).
+Checks at initialisation are made in \mdl{zdfdrg} (assuming a 1 m.s$^{-1}$ velocity in the non-linear case).
 The number of breaches of the stability criterion are reported as well as
 the minimum and maximum values that have been set.
-The criterion is also checked at each time step, using the actual velocity, in \mdl{dynbfr}.
-Values of the bottom friction coefficient are reduced as necessary to ensure stability;
+The criterion is also checked at each time step, using the actual velocity, in \mdl{dynzdf}.
+Values of the friction coefficient are reduced as necessary to ensure stability;
 these changes are not reported.
 
-Limits on the bottom friction coefficient are not imposed if the user has elected to
-handle the bottom friction implicitly (see \autoref{subsec:ZDF_bfr_imp}).
+Limits on the top/bottom friction coefficient are not imposed if the user has elected to
+handle the friction implicitly (see \autoref{subsec:ZDF_drg_imp}).
 The number of potential breaches of the explicit stability criterion are still reported for information purposes.
 
@@ -1109 +1150 @@
 %       Implicit Bottom Friction
 % -------------------------------------------------------------------------------------------------------------
-\subsection{Implicit bottom friction (\protect\np{ln\_bfrimp}\forcode{ = .true.})}
-\label{subsec:ZDF_bfr_imp}
+ \subsection[Implicit top/bottom friction (\forcode{ln_drgimp=.true.})]
+ {Implicit top/bottom friction (\protect\np{ln\_drgimp}\forcode{=.true.})}
+ \label{subsec:ZDF_drg_imp}
 
 An optional implicit form of bottom friction has been implemented to improve model stability.
-We recommend this option for shelf sea and coastal ocean applications, especially for split-explicit time splitting.
-This option can be invoked by setting \np{ln\_bfrimp} to \forcode{.true.} in the \textit{nambfr} namelist.
-This option requires \np{ln\_zdfexp} to be \forcode{.false.} in the \textit{namzdf} namelist. 
-
-This implementation is realised in \mdl{dynzdf\_imp} and \mdl{dynspg\_ts}. In \mdl{dynzdf\_imp},
-the bottom boundary condition is implemented implicitly.
-
-\[
-  % \label{eq:dynzdf_bfr}
-  \left.{\left( {\frac{A^{vm} }{e_3 }\ \frac{\partial \textbf{U}_h}{\partial k}} \right)} \right|_{mbk}
-  = \binom{c_{b}^{u}u^{n+1}_{mbk}}{c_{b}^{v}v^{n+1}_{mbk}}
-\]
-
-where $mbk$ is the layer number of the bottom wet layer.
-Superscript $n+1$ means the velocity used in the friction formula is to be calculated, so, it is implicit.
-
-If split-explicit time splitting is used, care must be taken to avoid the double counting of the bottom friction in
-the 2-D barotropic momentum equations.
-As NEMO only updates the barotropic pressure gradient and Coriolis' forcing terms in the 2-D barotropic calculation,
-we need to remove the bottom friction induced by these two terms which has been included in the 3-D momentum trend 
-and update it with the latest value.
-On the other hand, the bottom friction contributed by the other terms
-(\eg the advection term, viscosity term) has been included in the 3-D momentum equations and
-should not be added in the 2-D barotropic mode.
-
-The implementation of the implicit bottom friction in \mdl{dynspg\_ts} is done in two steps as the following:
-
-\[
-  % \label{eq:dynspg_ts_bfr1}
-  \frac{\textbf{U}_{med}-\textbf{U}^{m-1}}{2\Delta t}=-g\nabla\eta-f\textbf{k}\times\textbf{U}^{m}+c_{b}
-  \left(\textbf{U}_{med}-\textbf{U}^{m-1}\right)
-\]
-\[
-  \frac{\textbf{U}^{m+1}-\textbf{U}_{med}}{2\Delta t}=\textbf{T}+
-  \left(g\nabla\eta^{'}+f\textbf{k}\times\textbf{U}^{'}\right)-
-  2\Delta t_{bc}c_{b}\left(g\nabla\eta^{'}+f\textbf{k}\times\textbf{u}_{b}\right)
-\]
-
-where $\textbf{T}$ is the vertical integrated 3-D momentum trend.
-We assume the leap-frog time-stepping is used here.
-$\Delta t$ is the barotropic mode time step and $\Delta t_{bc}$ is the baroclinic mode time step.
-$c_{b}$ is the friction coefficient.
-$\eta$ is the sea surface level calculated in the barotropic loops while $\eta^{'}$ is the sea surface level used in
-the 3-D baroclinic mode.
-$\textbf{u}_{b}$ is the bottom layer horizontal velocity.
-
-% -------------------------------------------------------------------------------------------------------------
-%       Bottom Friction with split-explicit time splitting
-% -------------------------------------------------------------------------------------------------------------
-\subsection[Bottom friction w/ split-explicit time splitting (\protect\np{ln\_bfrimp})]
-            {Bottom friction with split-explicit time splitting (\protect\np{ln\_bfrimp})}
-\label{subsec:ZDF_bfr_ts}
-
-When calculating the momentum trend due to bottom friction in \mdl{dynbfr},
-the bottom velocity at the before time step is used.
-This velocity includes both the baroclinic and barotropic components which is appropriate when
-using either the explicit or filtered surface pressure gradient algorithms
-(\key{dynspg\_exp} or \key{dynspg\_flt}).
-Extra attention is required, however, when using split-explicit time stepping (\key{dynspg\_ts}).
-In this case the free surface equation is solved with a small time step \np{rn\_rdt}/\np{nn\_baro},
-while the three dimensional prognostic variables are solved with the longer time step of \np{rn\_rdt} seconds.
-The trend in the barotropic momentum due to bottom friction appropriate to this method is that given by
-the selected parameterisation (\ie linear or non-linear bottom friction) computed with
-the evolving velocities at each barotropic timestep. 
-
-In the case of non-linear bottom friction, we have elected to partially linearise the problem by
-keeping the coefficients fixed throughout the barotropic time-stepping to those computed in
-\mdl{zdfbfr} using the now timestep.
-This decision allows an efficient use of the $c_b^{\vect{U}}$ coefficients to:
-
+We recommend this option for shelf sea and coastal ocean applications. %, especially for split-explicit time splitting.
+This option can be invoked by setting \np{ln\_drgimp} to \forcode{.true.} in the \nam{drg} namelist.
+%This option requires \np{ln\_zdfexp} to be \forcode{.false.} in the \nam{zdf} namelist.
+
+This implementation is performed in \mdl{dynzdf} where the following boundary conditions are set while solving the fully implicit diffusion step:
+
+At the top (below an ice shelf cavity):
+\[
+  % \label{eq:ZDF_dynZDF__drg_top}
+  \left.{\left( {\frac{A^{vm} }{e_3 }\ \frac{\partial \textbf{U}_h}{\partial k}} \right)} \right|_{t}
+  = c_{t}^{\textbf{U}}\textbf{u}^{n+1}_{t}
+\]
+
+At the bottom (above the sea floor):
+\[
+  % \label{eq:ZDF_dynZDF__drg_bot}
+  \left.{\left( {\frac{A^{vm} }{e_3 }\ \frac{\partial \textbf{U}_h}{\partial k}} \right)} \right|_{b}
+  = c_{b}^{\textbf{U}}\textbf{u}^{n+1}_{b}
+\]
+
+where $t$ and $b$ refers to top and bottom layers respectively.
+Superscript $n+1$ means the velocity used in the friction formula is to be calculated, so it is implicit.
+
+% -------------------------------------------------------------------------------------------------------------
+%       Bottom Friction with split-explicit free surface
+% -------------------------------------------------------------------------------------------------------------
+ \subsection[Bottom friction with split-explicit free surface]
+ {Bottom friction with split-explicit free surface}
+ \label{subsec:ZDF_drg_ts}
+
+With split-explicit free surface, the sub-stepping of barotropic equations needs the knowledge of top/bottom stresses. An obvious way to satisfy this is to take them as constant over the course of the barotropic integration and equal to the value used to update the baroclinic momentum trend. Provided \np{ln\_drgimp}\forcode{= .false.} and a centred or \textit{leap-frog} like integration of barotropic equations is used (\ie\ \forcode{ln_bt_fw=.false.}, cf \autoref{subsec:DYN_spg_ts}), this does ensure that barotropic and baroclinic dynamics feel the same stresses during one leapfrog time step. However, if \np{ln\_drgimp}\forcode{= .true.},  stresses depend on the \textit{after} value of the velocities which themselves depend on the barotropic iteration result. This cyclic dependency makes difficult obtaining consistent stresses in 2d and 3d dynamics. Part of this mismatch is then removed when setting the final barotropic component of 3d velocities to the time splitting estimate. This last step can be seen as a necessary evil but should be minimized since it interferes with the adjustment to the boundary conditions.
+
+The strategy to handle top/bottom stresses with split-explicit free surface in \NEMO\ is as follows:
 \begin{enumerate}
-\item On entry to \rou{dyn\_spg\_ts}, remove the contribution of the before barotropic velocity to
-  the bottom friction component of the vertically integrated momentum trend.
-  Note the same stability check that is carried out on the bottom friction coefficient in \mdl{dynbfr} has to
-  be applied here to ensure that the trend removed matches that which was added in \mdl{dynbfr}.
-\item At each barotropic step, compute the contribution of the current barotropic velocity to
-  the trend due to bottom friction.
-  Add this contribution to the vertically integrated momentum trend.
-  This contribution is handled implicitly which eliminates the need to impose a stability criteria on
-  the values of the bottom friction coefficient within the barotropic loop. 
+\item To extend the stability of the barotropic sub-stepping, bottom stresses are refreshed at each sub-iteration. The baroclinic part of the flow entering the stresses is frozen at the initial time of the barotropic iteration. In case of non-linear friction, the drag coefficient is also constant.
+\item In case of an implicit drag, specific computations are performed in \mdl{dynzdf} which renders the overall scheme mixed explicit/implicit: the barotropic components of 3d velocities are removed before seeking for the implicit vertical diffusion result. Top/bottom stresses due to the barotropic components are explicitly accounted for thanks to the updated values of barotropic velocities. Then the implicit solution of 3d velocities is obtained. Lastly, the residual barotropic component is replaced by the time split estimate.
 \end{enumerate}
 
-Note that the use of an implicit formulation within the barotropic loop for the bottom friction trend means that
-any limiting of the bottom friction coefficient in \mdl{dynbfr} does not adversely affect the solution when
-using split-explicit time splitting.
-This is because the major contribution to bottom friction is likely to come from the barotropic component which
-uses the unrestricted value of the coefficient.
-However, if the limiting is thought to be having a major effect
-(a more likely prospect in coastal and shelf seas applications) then
-the fully implicit form of the bottom friction should be used (see \autoref{subsec:ZDF_bfr_imp})
-which can be selected by setting \np{ln\_bfrimp} $=$ \forcode{.true.}.
-
-Otherwise, the implicit formulation takes the form:
-\[
-  % \label{eq:zdfbfr_implicitts}
-  \bar{U}^{t+ \rdt} = \; \left [ \bar{U}^{t-\rdt}\; + 2 \rdt\;RHS \right ] / \left [ 1 - 2 \rdt \;c_b^{u} / H_e \right ]
-\]
-where $\bar U$ is the barotropic velocity, $H_e$ is the full depth (including sea surface height), 
-$c_b^u$ is the bottom friction coefficient as calculated in \rou{zdf\_bfr} and
-$RHS$ represents all the components to the vertically integrated momentum trend except for
-that due to bottom friction.
-
-% ================================================================
-% Tidal Mixing
-% ================================================================
-\section{Tidal mixing (\protect\key{zdftmx})}
-\label{sec:ZDF_tmx}
-
-%--------------------------------------------namzdf_tmx--------------------------------------------------
+Note that other strategies are possible, like considering vertical diffusion step in advance, \ie\ prior barotropic integration.
+
+
+% ================================================================
+% Internal wave-driven mixing
+% ================================================================
+\section[Internal wave-driven mixing (\forcode{ln_zdfiwm=.true.})]
+{Internal wave-driven mixing (\protect\np{ln\_zdfiwm}\forcode{=.true.})}
+\label{subsec:ZDF_tmx_new}
+
+%--------------------------------------------namzdf_iwm------------------------------------------
 %
-%\nlst{namzdf_tmx}
+\begin{listing}
+  \nlst{namzdf_iwm}
+  \caption{\texttt{namzdf\_iwm}}
+  \label{lst:namzdf_iwm}
+\end{listing}
 %--------------------------------------------------------------------------------------------------------------
 
-
-% -------------------------------------------------------------------------------------------------------------
-%        Bottom intensified tidal mixing 
-% -------------------------------------------------------------------------------------------------------------
-\subsection{Bottom intensified tidal mixing}
-\label{subsec:ZDF_tmx_bottom}
-
-Options are defined through the  \ngn{namzdf\_tmx} namelist variables.
-The parameterization of tidal mixing follows the general formulation for the vertical eddy diffusivity proposed by
-\citet{St_Laurent_al_GRL02} and first introduced in an OGCM by \citep{Simmons_al_OM04}. 
-In this formulation an additional vertical diffusivity resulting from internal tide breaking,
-$A^{vT}_{tides}$ is expressed as a function of $E(x,y)$,
-the energy transfer from barotropic tides to baroclinic tides:
-\begin{equation}
-  \label{eq:Ktides}
-  A^{vT}_{tides} =  q \,\Gamma \,\frac{ E(x,y) \, F(z) }{ \rho \, N^2 }
-\end{equation}
-where $\Gamma$ is the mixing efficiency, $N$ the Brunt-Vais\"{a}l\"{a} frequency (see \autoref{subsec:TRA_bn2}),
-$\rho$ the density, $q$ the tidal dissipation efficiency, and $F(z)$ the vertical structure function. 
-
-The mixing efficiency of turbulence is set by $\Gamma$ (\np{rn\_me} namelist parameter) and
-is usually taken to be the canonical value of $\Gamma = 0.2$ (Osborn 1980). 
-The tidal dissipation efficiency is given by the parameter $q$ (\np{rn\_tfe} namelist parameter)
-represents the part of the internal wave energy flux $E(x, y)$ that is dissipated locally,
-with the remaining $1-q$ radiating away as low mode internal waves and
-contributing to the background internal wave field.
-A value of $q=1/3$ is typically used \citet{St_Laurent_al_GRL02}.
-The vertical structure function $F(z)$ models the distribution of the turbulent mixing in the vertical.
-It is implemented as a simple exponential decaying upward away from the bottom,
-with a vertical scale of $h_o$ (\np{rn\_htmx} namelist parameter,
-with a typical value of $500\,m$) \citep{St_Laurent_Nash_DSR04}, 
-\[
-  % \label{eq:Fz}
-  F(i,j,k) = \frac{ e^{ -\frac{H+z}{h_o} } }{ h_o \left( 1- e^{ -\frac{H}{h_o} } \right) }
-\]
-and is normalized so that vertical integral over the water column is unity. 
-
-The associated vertical viscosity is calculated from the vertical diffusivity assuming a Prandtl number of 1,
-\ie $A^{vm}_{tides}=A^{vT}_{tides}$.
-In the limit of $N \rightarrow 0$ (or becoming negative), the vertical diffusivity is capped at $300\,cm^2/s$ and
-impose a lower limit on $N^2$ of \np{rn\_n2min} usually set to $10^{-8} s^{-2}$.
-These bounds are usually rarely encountered.
-
-The internal wave energy map, $E(x, y)$ in \autoref{eq:Ktides}, is derived from a barotropic model of
-the tides utilizing a parameterization of the conversion of barotropic tidal energy into internal waves.
-The essential goal of the parameterization is to represent the momentum exchange between the barotropic tides and
-the unrepresented internal waves induced by the tidal flow over rough topography in a stratified ocean.
-In the current version of \NEMO, the map is built from the output of
-the barotropic global ocean tide model MOG2D-G \citep{Carrere_Lyard_GRL03}.
-This model provides the dissipation associated with internal wave energy for the M2 and K1 tides component
-(\autoref{fig:ZDF_M2_K1_tmx}).
-The S2 dissipation is simply approximated as being $1/4$ of the M2 one.
-The internal wave energy is thus : $E(x, y) = 1.25 E_{M2} + E_{K1}$.
-Its global mean value is $1.1$ TW,
-in agreement with independent estimates \citep{Egbert_Ray_Nat00, Egbert_Ray_JGR01}. 
-
-%>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-\begin{figure}[!t]
-  \begin{center}
-    \includegraphics[width=0.90\textwidth]{Fig_ZDF_M2_K1_tmx}
-    \caption{
-      \protect\label{fig:ZDF_M2_K1_tmx}
-      (a) M2 and (b) K1 internal wave drag energy from \citet{Carrere_Lyard_GRL03} ($W/m^2$).
-    }
-  \end{center}
-\end{figure}
-%>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
- 
-% -------------------------------------------------------------------------------------------------------------
-%        Indonesian area specific treatment 
-% -------------------------------------------------------------------------------------------------------------
-\subsection{Indonesian area specific treatment (\protect\np{ln\_zdftmx\_itf})}
-\label{subsec:ZDF_tmx_itf}
-
-When the Indonesian Through Flow (ITF) area is included in the model domain,
-a specific treatment of tidal induced mixing in this area can be used.
-It is activated through the namelist logical \np{ln\_tmx\_itf}, and the user must provide an input NetCDF file,
-\ifile{mask\_itf}, which contains a mask array defining the ITF area where the specific treatment is applied.
-
-When \np{ln\_tmx\_itf}\forcode{ = .true.}, the two key parameters $q$ and $F(z)$ are adjusted following
-the parameterisation developed by \citet{Koch-Larrouy_al_GRL07}:
-
-First, the Indonesian archipelago is a complex geographic region with a series of
-large, deep, semi-enclosed basins connected via numerous narrow straits.
-Once generated, internal tides remain confined within this semi-enclosed area and hardly radiate away.
-Therefore all the internal tides energy is consumed within this area.
-So it is assumed that $q = 1$, \ie all the energy generated is available for mixing.
-Note that for test purposed, the ITF tidal dissipation efficiency is a namelist parameter (\np{rn\_tfe\_itf}).
-A value of $1$ or close to is this recommended for this parameter.
-
-Second, the vertical structure function, $F(z)$, is no more associated with a bottom intensification of the mixing,
-but with a maximum of energy available within the thermocline.
-\citet{Koch-Larrouy_al_GRL07} have suggested that the vertical distribution of
-the energy dissipation proportional to $N^2$ below the core of the thermocline and to $N$ above. 
-The resulting $F(z)$ is:
-\[
-  % \label{eq:Fz_itf}
-  F(i,j,k) \sim     \left\{
-    \begin{aligned}
-      \frac{q\,\Gamma E(i,j) } {\rho N \, \int N     dz}    \qquad \text{when $\partial_z N < 0$} \\
-      \frac{q\,\Gamma E(i,j) } {\rho     \, \int N^2 dz}    \qquad \text{when $\partial_z N > 0$}
-    \end{aligned}
-  \right.
-\]
-
-Averaged over the ITF area, the resulting tidal mixing coefficient is $1.5\,cm^2/s$, 
-which agrees with the independent estimates inferred from observations.
-Introduced in a regional OGCM, the parameterization improves the water mass characteristics in
-the different Indonesian seas, suggesting that the horizontal and vertical distributions of
-the mixing are adequately prescribed \citep{Koch-Larrouy_al_GRL07, Koch-Larrouy_al_OD08a, Koch-Larrouy_al_OD08b}.
-Note also that such a parameterisation has a significant impact on the behaviour of
-global coupled GCMs \citep{Koch-Larrouy_al_CD10}.
-
-% ================================================================
-% Internal wave-driven mixing
-% ================================================================
-\section{Internal wave-driven mixing (\protect\key{zdftmx\_new})}
-\label{sec:ZDF_tmx_new}
-
-%--------------------------------------------namzdf_tmx_new------------------------------------------
-%
-%\nlst{namzdf_tmx_new}
-%--------------------------------------------------------------------------------------------------------------
-
 The parameterization of mixing induced by breaking internal waves is a generalization of
-the approach originally proposed by \citet{St_Laurent_al_GRL02}.
+the approach originally proposed by \citet{st-laurent.simmons.ea_GRL02}.
 A three-dimensional field of internal wave energy dissipation $\epsilon(x,y,z)$ is first constructed,
-and the resulting diffusivity is obtained as 
-\[
-  % \label{eq:Kwave}
+and the resulting diffusivity is obtained as
+\[
+  % \label{eq:ZDF_Kwave}
   A^{vT}_{wave} =  R_f \,\frac{ \epsilon }{ \rho \, N^2 }
 \]
 where $R_f$ is the mixing efficiency and $\epsilon$ is a specified three dimensional distribution of
 the energy available for mixing.
-If the \np{ln\_mevar} namelist parameter is set to false, the mixing efficiency is taken as constant and
-equal to 1/6 \citep{Osborn_JPO80}.
+If the \np{ln\_mevar} namelist parameter is set to \forcode{.false.}, the mixing efficiency is taken as constant and
+equal to 1/6 \citep{osborn_JPO80}.
 In the opposite (recommended) case, $R_f$ is instead a function of
 the turbulence intensity parameter $Re_b = \frac{ \epsilon}{\nu \, N^2}$,
-with $\nu$ the molecular viscosity of seawater, following the model of \cite{Bouffard_Boegman_DAO2013} and
-the implementation of \cite{de_lavergne_JPO2016_efficiency}.
+with $\nu$ the molecular viscosity of seawater, following the model of \cite{bouffard.boegman_DAO13} and
+the implementation of \cite{de-lavergne.madec.ea_JPO16}.
 Note that $A^{vT}_{wave}$ is bounded by $10^{-2}\,m^2/s$, a limit that is often reached when
 the mixing efficiency is constant.
 
-In addition to the mixing efficiency, the ratio of salt to heat diffusivities can chosen to vary 
-as a function of $Re_b$ by setting the \np{ln\_tsdiff} parameter to true, a recommended choice. 
-This parameterization of differential mixing, due to \cite{Jackson_Rehmann_JPO2014},
-is implemented as in \cite{de_lavergne_JPO2016_efficiency}.
+In addition to the mixing efficiency, the ratio of salt to heat diffusivities can chosen to vary
+as a function of $Re_b$ by setting the \np{ln\_tsdiff} parameter to \forcode{.true.}, a recommended choice.
+This parameterization of differential mixing, due to \cite{jackson.rehmann_JPO14},
+is implemented as in \cite{de-lavergne.madec.ea_JPO16}.
 
 The three-dimensional distribution of the energy available for mixing, $\epsilon(i,j,k)$,
 is constructed from three static maps of column-integrated internal wave energy dissipation,
-$E_{cri}(i,j)$, $E_{pyc}(i,j)$, and $E_{bot}(i,j)$, combined to three corresponding vertical structures
-(de Lavergne et al., in prep):
+$E_{cri}(i,j)$, $E_{pyc}(i,j)$, and $E_{bot}(i,j)$, combined to three corresponding vertical structures:
+
 \begin{align*}
   F_{cri}(i,j,k) &\propto e^{-h_{ab} / h_{cri} }\\
-  F_{pyc}(i,j,k) &\propto N^{n\_p}\\
+  F_{pyc}(i,j,k) &\propto N^{n_p}\\
   F_{bot}(i,j,k) &\propto N^2 \, e^{- h_{wkb} / h_{bot} }
-\end{align*} 
+\end{align*}
 In the above formula, $h_{ab}$ denotes the height above bottom,
 $h_{wkb}$ denotes the WKB-stretched height above bottom, defined by
@@ -1388 +1250 @@
   h_{wkb} = H \, \frac{ \int_{-H}^{z} N \, dz' } { \int_{-H}^{\eta} N \, dz'  } \; ,
 \]
-The $n_p$ parameter (given by \np{nn\_zpyc} in \ngn{namzdf\_tmx\_new} namelist)
+The $n_p$ parameter (given by \np{nn\_zpyc} in \nam{zdf\_iwm} namelist)
 controls the stratification-dependence of the pycnocline-intensified dissipation.
-It can take values of 1 (recommended) or 2.
+It can take values of $1$ (recommended) or $2$.
 Finally, the vertical structures $F_{cri}$ and $F_{bot}$ require the specification of
 the decay scales $h_{cri}(i,j)$ and $h_{bot}(i,j)$, which are defined by two additional input maps.
 $h_{cri}$ is related to the large-scale topography of the ocean (etopo2) and
 $h_{bot}$ is a function of the energy flux $E_{bot}$, the characteristic horizontal scale of
-the abyssal hill topography \citep{Goff_JGR2010} and the latitude.
+the abyssal hill topography \citep{goff_JGR10} and the latitude.
+%
+% Jc: input files names ?
+
+% ================================================================
+% surface wave-induced mixing
+% ================================================================
+\section[Surface wave-induced mixing (\forcode{ln_zdfswm=.true.})]
+{Surface wave-induced mixing (\protect\np{ln\_zdfswm}\forcode{=.true.})}
+\label{subsec:ZDF_swm}
+
+Surface waves produce an enhanced mixing through wave-turbulence interaction.
+In addition to breaking waves induced turbulence (\autoref{subsec:ZDF_tke}),
+the influence of non-breaking waves can be accounted introducing
+wave-induced viscosity and diffusivity as a function of the wave number spectrum.
+Following \citet{qiao.yuan.ea_OD10}, a formulation of wave-induced mixing coefficient
+is provided  as a function of wave amplitude, Stokes Drift and wave-number:
+
+\begin{equation}
+  \label{eq:ZDF_Bv}
+  B_{v} = \alpha {A} {U}_{st} {exp(3kz)}
+\end{equation}
+
+Where $B_{v}$ is the wave-induced mixing coefficient, $A$ is the wave amplitude,
+${U}_{st}$ is the Stokes Drift velocity, $k$ is the wave number and $\alpha$
+is a constant which should be determined by observations or
+numerical experiments and is set to be 1.
+
+The coefficient $B_{v}$ is then directly added to the vertical viscosity
+and diffusivity coefficients.
+
+In order to account for this contribution set: \forcode{ln_zdfswm=.true.},
+then wave interaction has to be activated through \forcode{ln_wave=.true.},
+the Stokes Drift can be evaluated by setting \forcode{ln_sdw=.true.}
+(see \autoref{subsec:SBC_wave_sdw})
+and the needed wave fields can be provided either in forcing or coupled mode
+(for more information on wave parameters and settings see \autoref{sec:SBC_wave})
+
+% ================================================================
+% Adaptive-implicit vertical advection
+% ================================================================
+\section[Adaptive-implicit vertical advection (\forcode{ln_zad_Aimp=.true.})]
+{Adaptive-implicit vertical advection(\protect\np{ln\_zad\_Aimp}\forcode{=.true.})}
+\label{subsec:ZDF_aimp}
+
+The adaptive-implicit vertical advection option in NEMO is based on the work of
+\citep{shchepetkin_OM15}.  In common with most ocean models, the timestep used with NEMO
+needs to satisfy multiple criteria associated with different physical processes in order
+to maintain numerical stability. \citep{shchepetkin_OM15} pointed out that the vertical
+CFL criterion is commonly the most limiting. \citep{lemarie.debreu.ea_OM15} examined the
+constraints for a range of time and space discretizations and provide the CFL stability
+criteria for a range of advection schemes. The values for the Leap-Frog with Robert
+asselin filter time-stepping (as used in NEMO) are reproduced in
+\autoref{tab:ZDF_zad_Aimp_CFLcrit}. Treating the vertical advection implicitly can avoid these
+restrictions but at the cost of large dispersive errors and, possibly, large numerical
+viscosity. The adaptive-implicit vertical advection option provides a targetted use of the
+implicit scheme only when and where potential breaches of the vertical CFL condition
+occur. In many practical applications these events may occur remote from the main area of
+interest or due to short-lived conditions such that the extra numerical diffusion or
+viscosity does not greatly affect the overall solution. With such applications, setting:
+\forcode{ln_zad_Aimp=.true.} should allow much longer model timesteps to be used whilst
+retaining the accuracy of the high order explicit schemes over most of the domain.
+
+\begin{table}[htbp]
+  \centering
+  % \begin{tabular}{cp{70pt}cp{70pt}cp{70pt}cp{70pt}}
+  \begin{tabular}{r|ccc}
+    \hline
+    spatial discretization  & 2$^nd$ order centered & 3$^rd$ order upwind & 4$^th$ order compact \\
+    advective CFL criterion &                 0.904 &              0.472  &                0.522 \\
+    \hline
+  \end{tabular}
+  \caption[Advective CFL criteria for the leapfrog with Robert Asselin filter time-stepping]{
+    The advective CFL criteria for a range of spatial discretizations for
+    the leapfrog with Robert Asselin filter time-stepping
+    ($\nu=0.1$) as given in \citep{lemarie.debreu.ea_OM15}.}
+  \label{tab:ZDF_zad_Aimp_CFLcrit}
+\end{table}
+
+In particular, the advection scheme remains explicit everywhere except where and when
+local vertical velocities exceed a threshold set just below the explicit stability limit.
+Once the threshold is reached a tapered transition towards an implicit scheme is used by
+partitioning the vertical velocity into a part that can be treated explicitly and any
+excess that must be treated implicitly. The partitioning is achieved via a Courant-number
+dependent weighting algorithm as described in \citep{shchepetkin_OM15}.
+
+The local cell Courant number ($Cu$) used for this partitioning is:
+
+\begin{equation}
+  \label{eq:ZDF_Eqn_zad_Aimp_Courant}
+  \begin{split}
+    Cu &= {2 \rdt \over e^n_{3t_{ijk}}} \bigg (\big [ \texttt{Max}(w^n_{ijk},0.0) - \texttt{Min}(w^n_{ijk+1},0.0) \big ]    \\
+       &\phantom{=} +\big [ \texttt{Max}(e_{{2_u}ij}e^n_{{3_{u}}ijk}u^n_{ijk},0.0) - \texttt{Min}(e_{{2_u}i-1j}e^n_{{3_{u}}i-1jk}u^n_{i-1jk},0.0) \big ]
+                     \big / e_{{1_t}ij}e_{{2_t}ij}            \\
+       &\phantom{=} +\big [ \texttt{Max}(e_{{1_v}ij}e^n_{{3_{v}}ijk}v^n_{ijk},0.0) - \texttt{Min}(e_{{1_v}ij-1}e^n_{{3_{v}}ij-1k}v^n_{ij-1k},0.0) \big ]
+                     \big / e_{{1_t}ij}e_{{2_t}ij} \bigg )    \\
+  \end{split}
+\end{equation}
+
+\noindent and the tapering algorithm follows \citep{shchepetkin_OM15} as:
+
+\begin{align}
+  \label{eq:ZDF_Eqn_zad_Aimp_partition}
+Cu_{min} &= 0.15 \nonumber \\
+Cu_{max} &= 0.3  \nonumber \\
+Cu_{cut} &= 2Cu_{max} - Cu_{min} \nonumber \\
+Fcu    &= 4Cu_{max}*(Cu_{max}-Cu_{min}) \nonumber \\
+\cf &=
+     \begin{cases}
+        0.0                                                        &\text{if $Cu \leq Cu_{min}$} \\
+        (Cu - Cu_{min})^2 / (Fcu +  (Cu - Cu_{min})^2)             &\text{else if $Cu < Cu_{cut}$} \\
+        (Cu - Cu_{max}) / Cu                                       &\text{else}
+     \end{cases}
+\end{align}
+
+\begin{figure}[!t]
+  \centering
+  \includegraphics[width=\textwidth]{Fig_ZDF_zad_Aimp_coeff}
+  \caption[Partitioning coefficient used to partition vertical velocities into parts]{
+    The value of the partitioning coefficient (\cf) used to partition vertical velocities into
+    parts to be treated implicitly and explicitly for a range of typical Courant numbers
+    (\forcode{ln_zad_Aimp=.true.}).}
+  \label{fig:ZDF_zad_Aimp_coeff}
+\end{figure}
+
+\noindent The partitioning coefficient is used to determine the part of the vertical
+velocity that must be handled implicitly ($w_i$) and to subtract this from the total
+vertical velocity ($w_n$) to leave that which can continue to be handled explicitly:
+
+\begin{align}
+  \label{eq:ZDF_Eqn_zad_Aimp_partition2}
+    w_{i_{ijk}} &= \cf_{ijk} w_{n_{ijk}}     \nonumber \\
+    w_{n_{ijk}} &= (1-\cf_{ijk}) w_{n_{ijk}}
+\end{align}
+
+\noindent Note that the coefficient is such that the treatment is never fully implicit;
+the three cases from \autoref{eq:ZDF_Eqn_zad_Aimp_partition} can be considered as:
+fully-explicit; mixed explicit/implicit and mostly-implicit.  With the settings shown the
+coefficient (\cf) varies as shown in \autoref{fig:ZDF_zad_Aimp_coeff}. Note with these values
+the $Cu_{cut}$ boundary between the mixed implicit-explicit treatment and 'mostly
+implicit' is 0.45 which is just below the stability limited given in
+\autoref{tab:ZDF_zad_Aimp_CFLcrit}  for a 3rd order scheme.
+
+The $w_i$ component is added to the implicit solvers for the vertical mixing in
+\mdl{dynzdf} and \mdl{trazdf} in a similar way to \citep{shchepetkin_OM15}.  This is
+sufficient for the flux-limited advection scheme (\forcode{ln_traadv_mus}) but further
+intervention is required when using the flux-corrected scheme (\forcode{ln_traadv_fct}).
+For these schemes the implicit upstream fluxes must be added to both the monotonic guess
+and to the higher order solution when calculating the antidiffusive fluxes. The implicit
+vertical fluxes are then removed since they are added by the implicit solver later on.
+
+The adaptive-implicit vertical advection option is new to NEMO at v4.0 and has yet to be
+used in a wide range of simulations. The following test simulation, however, does illustrate
+the potential benefits and will hopefully encourage further testing and feedback from users:
+
+\begin{figure}[!t]
+  \centering
+  \includegraphics[width=\textwidth]{Fig_ZDF_zad_Aimp_overflow_frames}
+  \caption[OVERFLOW: time-series of temperature vertical cross-sections]{
+    A time-series of temperature vertical cross-sections for the OVERFLOW test case.
+    These results are for the default settings with \forcode{nn_rdt=10.0} and
+    without adaptive implicit vertical advection (\forcode{ln_zad_Aimp=.false.}).}
+  \label{fig:ZDF_zad_Aimp_overflow_frames}
+\end{figure}
+
+\subsection{Adaptive-implicit vertical advection in the OVERFLOW test-case}
+
+The \href{https://forge.ipsl.jussieu.fr/nemo/chrome/site/doc/NEMO/guide/html/test\_cases.html\#overflow}{OVERFLOW test case}
+provides a simple illustration of the adaptive-implicit advection in action. The example here differs from the basic test case
+by only a few extra physics choices namely:
+
+\begin{verbatim}
+     ln_dynldf_OFF = .false.
+     ln_dynldf_lap = .true.
+     ln_dynldf_hor = .true.
+     ln_zdfnpc     = .true.
+     ln_traadv_fct = .true.
+        nn_fct_h   =  2
+        nn_fct_v   =  2
+\end{verbatim}
+
+\noindent which were chosen to provide a slightly more stable and less noisy solution. The
+result when using the default value of \forcode{nn_rdt=10.} without adaptive-implicit
+vertical velocity is illustrated in \autoref{fig:ZDF_zad_Aimp_overflow_frames}. The mass of
+cold water, initially sitting on the shelf, moves down the slope and forms a
+bottom-trapped, dense plume. Even with these extra physics choices the model is close to
+stability limits and attempts with \forcode{nn_rdt=30.} will fail after about 5.5 hours
+with excessively high horizontal velocities. This time-scale corresponds with the time the
+plume reaches the steepest part of the topography and, although detected as a horizontal
+CFL breach, the instability originates from a breach of the vertical CFL limit. This is a good
+candidate, therefore, for use of the adaptive-implicit vertical advection scheme.
+
+The results with \forcode{ln_zad_Aimp=.true.} and a variety of model timesteps
+are shown in \autoref{fig:ZDF_zad_Aimp_overflow_all_rdt} (together with the equivalent
+frames from the base run).  In this simple example the use of the adaptive-implicit
+vertcal advection scheme has enabled a 12x increase in the model timestep without
+significantly altering the solution (although at this extreme the plume is more diffuse
+and has not travelled so far).  Notably, the solution with and without the scheme is
+slightly different even with \forcode{nn_rdt=10.}; suggesting that the base run was
+close enough to instability to trigger the scheme despite completing successfully.
+To assist in diagnosing how active the scheme is, in both location and time, the 3D
+implicit and explicit components of the vertical velocity are available via XIOS as
+\texttt{wimp} and \texttt{wexp} respectively.  Likewise, the partitioning coefficient
+(\cf) is also available as \texttt{wi\_cff}. For a quick oversight of
+the schemes activity the global maximum values of the absolute implicit component
+of the vertical velocity and the partitioning coefficient are written to the netCDF
+version of the run statistics file (\texttt{run.stat.nc}) if this is active (see
+\autoref{sec:MISC_opt} for activation details).
+
+\autoref{fig:ZDF_zad_Aimp_maxCf} shows examples of the maximum partitioning coefficient for
+the various overflow tests.  Note that the adaptive-implicit vertical advection scheme is
+active even in the base run with \forcode{nn_rdt=10.0s} adding to the evidence that the
+test case is close to stability limits even with this value. At the larger timesteps, the
+vertical velocity is treated mostly implicitly at some location throughout the run. The
+oscillatory nature of this measure appears to be linked to the progress of the plume front
+as each cusp is associated with the location of the maximum shifting to the adjacent cell.
+This is illustrated in \autoref{fig:ZDF_zad_Aimp_maxCf_loc} where the i- and k- locations of the
+maximum have been overlaid for the base run case.
+
+\medskip
+\noindent Only limited tests have been performed in more realistic configurations. In the
+ORCA2\_ICE\_PISCES reference configuration the scheme does activate and passes
+restartability and reproducibility tests but it is unable to improve the model's stability
+enough to allow an increase in the model time-step. A view of the time-series of maximum
+partitioning coefficient (not shown here)  suggests that the default time-step of 5400s is
+already pushing at stability limits, especially in the initial start-up phase. The
+time-series does not, however, exhibit any of the 'cuspiness' found with the overflow
+tests.
+
+\medskip
+\noindent A short test with an eORCA1 configuration promises more since a test using a
+time-step of 3600s remains stable with \forcode{ln_zad_Aimp=.true.} whereas the
+time-step is limited to 2700s without.
+
+\begin{figure}[!t]
+  \centering
+  \includegraphics[width=\textwidth]{Fig_ZDF_zad_Aimp_overflow_all_rdt}
+  \caption[OVERFLOW: sample temperature vertical cross-sections from mid- and end-run]{
+    Sample temperature vertical cross-sections from mid- and end-run using
+    different values for \forcode{nn_rdt} and with or without adaptive implicit vertical advection.
+    Without the adaptive implicit vertical advection
+    only the run with the shortest timestep is able to run to completion.
+    Note also that the colour-scale has been chosen to confirm that
+    temperatures remain within the original range of 10$^o$ to 20$^o$.}
+  \label{fig:ZDF_zad_Aimp_overflow_all_rdt}
+\end{figure}
+
+\begin{figure}[!t]
+  \centering
+  \includegraphics[width=\textwidth]{Fig_ZDF_zad_Aimp_maxCf}
+  \caption[OVERFLOW: maximum partitioning coefficient during a series of test runs]{
+    The maximum partitioning coefficient during a series of test runs with
+    increasing model timestep length.
+    At the larger timesteps,
+    the vertical velocity is treated mostly implicitly at some location throughout the run.}
+  \label{fig:ZDF_zad_Aimp_maxCf}
+\end{figure}
+
+\begin{figure}[!t]
+  \centering
+  \includegraphics[width=\textwidth]{Fig_ZDF_zad_Aimp_maxCf_loc}
+  \caption[OVERFLOW: maximum partitioning coefficient for the case overlaid]{
+    The maximum partitioning coefficient for the \forcode{nn_rdt=10.0} case overlaid with
+    information on the gridcell i- and k-locations of the maximum value.}
+  \label{fig:ZDF_zad_Aimp_maxCf_loc}
+\end{figure}
 
 % ================================================================

@@ -1 @@
-*.aux
-*.bbl
-*.blg
-*.dvi
-*.fdb*
-*.fls
-*.idx
-*.ilg
-*.ind
-*.log
-*.maf
-*.mtc*
-*.out
-*.pdf
-*.toc
-_minted-*
+figures