Changeset 14526 for NEMO/trunk

Timestamp:

2021-02-22T17:37:38+01:00 (3 years ago)

Author:

nicolasmartin

Message:

Modify \nlst LaTeX macro for better efficienty
Only one line is needed now to include the highlighted source code, the caption and the cross-reference

\newcommand{\nlst}[1]{
   \begin{listing}
      \newmintedfile{fortran}{../../../namelists/#1}
      \caption{\forcode{&#1}}
      \label{lst:#1}
   \end{listing}
}

Location:

NEMO/trunk/doc/latex

Files:

• NEMO/subfiles/apdx_DOMAINcfg.tex (modified) (2 diffs)
• NEMO/subfiles/apdx_triads.tex (modified) (1 diff)
• NEMO/subfiles/chap_ASM.tex (modified) (1 diff)
• NEMO/subfiles/chap_DIA.tex (modified) (5 diffs)
• NEMO/subfiles/chap_DIU.tex (modified) (1 diff)
• NEMO/subfiles/chap_DOM.tex (modified) (2 diffs)
• NEMO/subfiles/chap_DYN.tex (modified) (6 diffs)
• NEMO/subfiles/chap_LBC.tex (modified) (4 diffs)
• NEMO/subfiles/chap_LDF.tex (modified) (2 diffs)
• NEMO/subfiles/chap_OBS.tex (modified) (2 diffs)
• NEMO/subfiles/chap_SBC.tex (modified) (13 diffs)
• NEMO/subfiles/chap_STO.tex (modified) (1 diff)
• NEMO/subfiles/chap_TRA.tex (modified) (7 diffs)
• NEMO/subfiles/chap_ZDF.tex (modified) (10 diffs)
• NEMO/subfiles/chap_cfgs.tex (modified) (1 diff)
• NEMO/subfiles/chap_misc.tex (modified) (3 diffs)
• NEMO/subfiles/chap_model_basics_zstar.tex (modified) (1 diff)
• NEMO/subfiles/chap_time_domain.tex (modified) (12 diffs)
• global/highlighting.tex (modified) (1 diff)

NEMO/trunk/doc/latex/NEMO/subfiles/apdx_DOMAINcfg.tex

@@ -42 +42 @@
 
 \begin{listing}
-%  \nlst{namdom_domcfg}
   \begin{forlines}
 !-----------------------------------------------------------------------
@@ -409 +408 @@
 
 \begin{listing}
-%  \nlst{namzgr_sco_domcfg}
   \caption{\forcode{&namzgr_sco_domcfg}}
   \label{lst:namzgr_sco_domcfg}

NEMO/trunk/doc/latex/NEMO/subfiles/apdx_triads.tex

@@ -2 +2 @@
 
 \begin{document}
-
-%% Local cmds
-\newcommand{\rML}[1][i]{\ensuremath{_{\mathrm{ML}\,#1}}}
-\newcommand{\rMLt}[1][i]{\tilde{r}_{\mathrm{ML}\,#1}}
-%% Move to ../../global/new_cmds.tex to avoid error with \listoffigures
-%\newcommand{\triad}[6][]{\ensuremath{{}_{#2}^{#3}{\mathbb{#4}_{#1}}_{#5}^{\,#6}}
-\newcommand{\triadd}[5]{\ensuremath{{}_{#1}^{#2}{\mathbb{#3}}_{#4}^{\,#5}}}
-\newcommand{\triadt}[5]{\ensuremath{{}_{#1}^{#2}{\tilde{\mathbb{#3}}}_{#4}^{\,#5}}}
-\newcommand{\rtriad}[2][]{\ensuremath{\triad[#1]{i}{k}{#2}{i_p}{k_p}}}
-\newcommand{\rtriadt}[1]{\ensuremath{\triadt{i}{k}{#1}{i_p}{k_p}}}
 
 \chapter{Iso-Neutral Diffusion and Eddy Advection using Triads}

NEMO/trunk/doc/latex/NEMO/subfiles/chap_ASM.tex

@@ -148 +148 @@
 the ORCA2 grid.
 
-\begin{listing}
-  \nlst{nam_asminc}
-  \caption{\forcode{&nam_asminc}}
-  \label{lst:nam_asminc}
-\end{listing}
+\nlst{nam_asminc}
 
 The header of an assimilation increments file produced using the NetCDF tool

NEMO/trunk/doc/latex/NEMO/subfiles/chap_DIA.tex

@@ -1331 +1331 @@
 setting the \np{ln_nc4zip}{ln\_nc4zip} logical to false in the \nam{nc4}{nc4} namelist:
 
-\begin{listing}
-  \nlst{namnc4}
-  \caption{\forcode{&namnc4}}
-  \label{lst:namnc4}
-\end{listing}
+\nlst{namnc4}
 
 If \key{netcdf4} has not been defined, these namelist parameters are not read.
@@ -1429 +1425 @@
 \label{sec:DIA_trd}
 
-\begin{listing}
-  \nlst{namtrd}
-  \caption{\forcode{&namtrd}}
-  \label{lst:namtrd}
-\end{listing}
+\nlst{namtrd}
 
 Each trend of the dynamics and/or temperature and salinity time evolution equations can be send to
@@ -1468 +1460 @@
 \label{sec:DIA_FLO}
 
-\begin{listing}
-  \nlst{namflo}
-  \caption{\forcode{&namflo}}
-  \label{lst:namflo}
-\end{listing}
+\nlst{namflo}
 
 The on-line computation of floats advected either by the three dimensional velocity field or constraint to
@@ -1571 +1559 @@
 \label{sec:DIA_diag_dct}
 
-\begin{listing}
-  \nlst{nam_diadct}
-  \caption{\forcode{&nam_diadct}}
-  \label{lst:nam_diadct}
-\end{listing}
+\nlst{nam_diadct}
 
 A module is available to compute the transport of volume, heat and salt through sections.
@@ -1943 +1927 @@
 the Indo-Pacific mask been deduced from the sum of the Indian and Pacific mask (\autoref{fig:DIA_mask_subasins}).
 
-\begin{listing}
 %  \nlst{namptr}
-  \caption{\forcode{&namptr}}
-  \label{lst:namptr}
-\end{listing}
 
 %% =================================================================================================
 \subsection{25 hour mean output for tidal models}
 
-\begin{listing}
-  \nlst{nam_dia25h}
-  \caption{\forcode{&nam_dia25h}}
-  \label{lst:nam_dia25h}
-\end{listing}
+\nlst{nam_dia25h}
 
 A module is available to compute a crudely detided M2 signal by obtaining a 25 hour mean.

NEMO/trunk/doc/latex/NEMO/subfiles/chap_DIU.tex

@@ -43 +43 @@
 Both the cool skin and warm layer models are controlled through the namelist \nam{diu}{diu}:
 
-\begin{listing}
-  \nlst{namdiu}
-  \caption{\forcode{&namdiu}}
-  \label{lst:namdiu}
-\end{listing}
+\nlst{namdiu}
 
 This namelist contains only two variables:
+
 \begin{description}
 \item [{\np{ln_diurnal}{ln\_diurnal}}] A logical switch for turning on/off both the cool skin and warm layer.

NEMO/trunk/doc/latex/NEMO/subfiles/chap_DOM.tex

@@ -456 +456 @@
 \label{subsec:DOM_zgr}
 
-\begin{listing}
-  \nlst{namdom}
-  \caption{\forcode{&namdom}}
-  \label{lst:namdom}
-\end{listing}
+\nlst{namdom}
 
 In the vertical, the model mesh is determined by four things:
@@ -670 +666 @@
 \label{sec:DOM_DTA_tsd}
 
-\begin{listing}
-  \nlst{namtsd}
-  \caption{\forcode{&namtsd}}
-  \label{lst:namtsd}
-\end{listing}
+\nlst{namtsd}
 
 Basic initial state options are defined in \nam{tsd}{tsd}.

NEMO/trunk/doc/latex/NEMO/subfiles/chap_DYN.tex

@@ -168 +168 @@
 \label{sec:DYN_adv_cor_vect}
 
-\begin{listing}
-  \nlst{namdyn_adv}
-  \caption{\forcode{&namdyn_adv}}
-  \label{lst:namdyn_adv}
-\end{listing}
+\nlst{namdyn_adv}
 
 The vector invariant form of the momentum equations is the one most often used in
@@ -187 +183 @@
 \label{subsec:DYN_vor}
 
-\begin{listing}
-  \nlst{namdyn_vor}
-  \caption{\forcode{&namdyn_vor}}
-  \label{lst:namdyn_vor}
-\end{listing}
+\nlst{namdyn_vor}
 
 Options are defined through the \nam{dyn_vor}{dyn\_vor} namelist variables.
@@ -538 +530 @@
 \label{sec:DYN_hpg}
 
-\begin{listing}
-  \nlst{namdyn_hpg}
-  \caption{\forcode{&namdyn_hpg}}
-  \label{lst:namdyn_hpg}
-\end{listing}
+\nlst{namdyn_hpg}
 
 Options are defined through the \nam{dyn_hpg}{dyn\_hpg} namelist variables.
@@ -745 +733 @@
 \label{sec:DYN_spg}
 
-\begin{listing}
-  \nlst{namdyn_spg}
-  \caption{\forcode{&namdyn_spg}}
-  \label{lst:namdyn_spg}
-\end{listing}
+\nlst{namdyn_spg}
 
 Options are defined through the \nam{dyn_spg}{dyn\_spg} namelist variables.
@@ -1062 +1046 @@
 \label{sec:DYN_ldf}
 
-\begin{listing}
-  \nlst{namdyn_ldf}
-  \caption{\forcode{&namdyn_ldf}}
-  \label{lst:namdyn_ldf}
-\end{listing}
+\nlst{namdyn_ldf}
 
 Options are defined through the \nam{dyn_ldf}{dyn\_ldf} namelist variables.
@@ -1266 +1246 @@
 by setting $\mathrm{ln\_wd\_dl} = \mathrm{.true.}$ and $\mathrm{ln\_wd\_il} = \mathrm{.false.}$.
 
-\begin{listing}
-  \nlst{namwad}
-  \caption{\forcode{&namwad}}
-  \label{lst:namwad}
-\end{listing}
+\nlst{namwad}
 
 The following terminology is used. The depth of the topography (positive downwards)

NEMO/trunk/doc/latex/NEMO/subfiles/chap_LBC.tex

@@ -30 +30 @@
 \label{sec:LBC_coast}
 
-\begin{listing}
-  \nlst{namlbc}
-  \caption{\forcode{&namlbc}}
-  \label{lst:namlbc}
-\end{listing}
+\nlst{namlbc}
 
 %The lateral ocean boundary conditions contiguous to coastlines are Neumann conditions for heat and salt
@@ -230 +226 @@
 \label{sec:LBC_mpp}
 
-\begin{listing}
-  \nlst{nammpp}
-  \caption{\forcode{&nammpp}}
-  \label{lst:nammpp}
-\end{listing}
+\nlst{nammpp}
 
 For massively parallel processing (mpp), a domain decomposition method is used.
@@ -339 +331 @@
 \label{sec:LBC_bdy}
 
-\begin{listing}
-  \nlst{nambdy}
-  \caption{\forcode{&nambdy}}
-  \label{lst:nambdy}
-\end{listing}
-
-\begin{listing}
-  \nlst{nambdy_dta}
-  \caption{\forcode{&nambdy_dta}}
-  \label{lst:nambdy_dta}
-\end{listing}
+\nlst{nambdy}
+
+\nlst{nambdy_dta}
 
 Options are defined through the \nam{bdy}{bdy} and \nam{bdy_dta}{bdy\_dta} namelist variables.
@@ -657 +641 @@
 \label{subsec:LBC_bdy_tides}
 
-\begin{listing}
-  \nlst{nambdy_tide}
-  \caption{\forcode{&nambdy_tide}}
-  \label{lst:nambdy_tide}
-\end{listing}
+\nlst{nambdy_tide}
 
 Tidal forcing at open boundaries requires the activation of surface

NEMO/trunk/doc/latex/NEMO/subfiles/chap_LDF.tex

@@ -469 +469 @@
 \label{sec:LDF_eiv}
 
-\begin{listing}
-  \nlst{namtra_eiv}
-  \caption{\forcode{&namtra_eiv}}
-  \label{lst:namtra_eiv}
-\end{listing}
+\nlst{namtra_eiv}
 
 %%gm  from Triad appendix  : to be incorporated....
@@ -532 +528 @@
 \label{sec:LDF_mle}
 
-\begin{listing}
-  \nlst{namtra_mle}
-  \caption{\forcode{&namtra_mle}}
-  \label{lst:namtra_mle}
-\end{listing}
+\nlst{namtra_mle}
 
 If  \np[=.true.]{ln_mle}{ln\_mle} in \nam{tra_mle}{tra\_mle} namelist, a parameterization of the mixing due to unresolved mixed layer instabilities is activated (\citet{fox-kemper.ferrari.ea_JPO08}). Additional transport is computed in \rou{ldf\_mle\_trp} and added to the eulerian transport in \rou{tra\_adv} as done for eddy induced advection.

NEMO/trunk/doc/latex/NEMO/subfiles/chap_OBS.tex

@@ -124 +124 @@
 the observation files that may be used with the observation operator.
 
-\begin{listing}
-  \nlst{namobs}
-  \caption{\forcode{&namobs}}
-  \label{lst:namobs}
-\end{listing}
+\nlst{namobs}
 
 The observation operator code uses the feedback observation file format for all data types.
@@ -913 +909 @@
 
 \begin{listing}
-%  \nlst{namsao}
   \begin{forlines}
 !----------------------------------------------------------------------

NEMO/trunk/doc/latex/NEMO/subfiles/chap_SBC.tex

@@ -25 +25 @@
 \clearpage
 
-\begin{listing}
-  \nlst{namsbc}
-  \caption{\forcode{&namsbc}}
-  \label{lst:namsbc}
-\end{listing}
+\nlst{namsbc}
 
 The ocean needs seven fields as surface boundary condition:
@@ -438 +434 @@
 \label{subsec:SBC_SAS}
 
-\begin{listing}
-  \nlst{namsbc_sas}
-  \caption{\forcode{&namsbc_sas}}
-  \label{lst:namsbc_sas}
-\end{listing}
+\nlst{namsbc_sas}
 
 In some circumstances, it may be useful to avoid calculating the 3D temperature,
@@ -503 +495 @@
 % parameterization'' (i.e NCAR, COARE, ECMWF...)
 
-\begin{listing}
-  \nlst{namsbc_flx}
-  \caption{\forcode{&namsbc_flx}}
-  \label{lst:namsbc_flx}
-\end{listing}
+\nlst{namsbc_flx}
 
 In the flux formulation (\np[=.true.]{ln_flx}{ln\_flx}),
@@ -525 +513 @@
 % L. Brodeau, December 2019... %
 
-\begin{listing}
-  \nlst{namsbc_blk}
-  \caption{\forcode{&namsbc_blk}}
-  \label{lst:namsbc_blk}
-\end{listing}
+\nlst{namsbc_blk}
 
 If the bulk formulation is selected (\np[=.true.]{ln_blk}{ln\_blk}), the air-sea
@@ -884 +868 @@
 \label{sec:SBC_cpl}
 
-\begin{listing}
-  \nlst{namsbc_cpl}
-  \caption{\forcode{&namsbc_cpl}}
-  \label{lst:namsbc_cpl}
-\end{listing}
+\nlst{namsbc_cpl}
 
 In the coupled formulation of the surface boundary condition,
@@ -920 +900 @@
 \label{sec:SBC_apr}
 
-\begin{listing}
-  \nlst{namsbc_apr}
-  \caption{\forcode{&namsbc_apr}}
-  \label{lst:namsbc_apr}
-\end{listing}
+\nlst{namsbc_apr}
 
 The optional atmospheric pressure can be used to force ocean and ice dynamics
@@ -956 +932 @@
 \label{sec:SBC_TDE}
 
-\begin{listing}
-  \nlst{nam_tide}
-  \caption{\forcode{&nam_tide}}
-  \label{lst:nam_tide}
-\end{listing}
+\nlst{nam_tide}
 
 \subsection{Tidal constituents}
@@ -1043 +1015 @@
 \label{sec:SBC_rnf}
 
-\begin{listing}
-  \nlst{namsbc_rnf}
-  \caption{\forcode{&namsbc_rnf}}
-  \label{lst:namsbc_rnf}
-\end{listing}
+\nlst{namsbc_rnf}
 
 %River runoff generally enters the ocean at a nonzero depth rather than through the surface.
@@ -1181 +1149 @@
 \label{sec:SBC_isf}
 
-\begin{listing}
-  \nlst{namisf}
-  \caption{\forcode{&namisf}}
-  \label{lst:namisf}
-\end{listing}
+\nlst{namisf}
 
 The namelist variable in \nam{isf}{isf}, \np{ln_isf}{ln\_isf}, controls the ice shelf interactions:
@@ -1491 +1455 @@
 \label{sec:SBC_ICB_icebergs}
 
-\begin{listing}
-  \nlst{namberg}
-  \caption{\forcode{&namberg}}
-  \label{lst:namberg}
-\end{listing}
+\nlst{namberg}
 
 Icebergs are modelled as lagrangian particles in \NEMO\ \citep{marsh.ivchenko.ea_GMD15}.
@@ -1564 +1524 @@
 \label{sec:SBC_wave}
 
-\begin{listing}
-  \nlst{namsbc_wave}
-  \caption{\forcode{&namsbc_wave}}
-  \label{lst:namsbc_wave}
-\end{listing}
+\nlst{namsbc_wave}
 
 Ocean waves represent the interface between the ocean and the atmosphere, so \NEMO\ is extended to incorporate
@@ -1818 +1774 @@
 \label{subsec:SBC_ssr}
 
-\begin{listing}
-  \nlst{namsbc_ssr}
-  \caption{\forcode{&namsbc_ssr}}
-  \label{lst:namsbc_ssr}
-\end{listing}
+\nlst{namsbc_ssr}
 
 Options are defined through the \nam{sbc_ssr}{sbc\_ssr} namelist variables.
@@ -1927 +1879 @@
 \label{subsec:SBC_fwb}
 
-\begin{listing}
-  \nlst{namsbc_fwb}
-  \caption{\forcode{&namsbc_fwb}}
-  \label{lst:namsbc_fwb}
-\end{listing}
+\nlst{namsbc_fwb}
 
 For global ocean simulations, it can be useful to introduce a control of the

NEMO/trunk/doc/latex/NEMO/subfiles/chap_STO.tex

@@ -181 +181 @@
 (only the subset for equation of state stochastic parametrisation is listed below):
 
-\begin{listing}
-  \nlst{namsto}
-  \caption{\forcode{&namsto}}
-  \label{lst:namsto}
-\end{listing}
+\nlst{namsto}
 
 The variables of stochastic paramtetrisation itself (based on the global 2° experiments as in \cite{brankart_OM13} are:

NEMO/trunk/doc/latex/NEMO/subfiles/chap_TRA.tex

@@ -76 +76 @@
 \label{sec:TRA_adv}
 
-\begin{listing}
-  \nlst{namtra_adv}
-  \caption{\forcode{&namtra_adv}}
-  \label{lst:namtra_adv}
-\end{listing}
+\nlst{namtra_adv}
 
 When considered (\ie\ when \np{ln_traadv_OFF}{ln\_traadv\_OFF} is not set to \forcode{.true.}),
@@ -456 +452 @@
 \label{sec:TRA_ldf}
 
-\begin{listing}
-  \nlst{namtra_ldf}
-  \caption{\forcode{&namtra_ldf}}
-  \label{lst:namtra_ldf}
-\end{listing}
+\nlst{namtra_ldf}
 
 Options are defined through the \nam{tra_ldf}{tra\_ldf} namelist variables.
@@ -772 +764 @@
 \label{subsec:TRA_qsr}
 
-\begin{listing}
-  \nlst{namtra_qsr}
-  \caption{\forcode{&namtra_qsr}}
-  \label{lst:namtra_qsr}
-\end{listing}
+\nlst{namtra_qsr}
 
 Options are defined through the \nam{tra_qsr}{tra\_qsr} namelist variables.
@@ -894 +882 @@
 \label{subsec:TRA_bbc}
 
-\begin{listing}
-  \nlst{nambbc}
-  \caption{\forcode{&nambbc}}
-  \label{lst:nambbc}
-\end{listing}
+\nlst{nambbc}
 
 \begin{figure}
@@ -935 +919 @@
 \label{sec:TRA_bbl}
 
-\begin{listing}
-  \nlst{nambbl}
-  \caption{\forcode{&nambbl}}
-  \label{lst:nambbl}
-\end{listing}
+\nlst{nambbl}
 
 Options are defined through the \nam{bbl}{bbl} namelist variables.
@@ -1097 +1077 @@
 \label{sec:TRA_dmp}
 
-\begin{listing}
-  \nlst{namtra_dmp}
-  \caption{\forcode{&namtra_dmp}}
-  \label{lst:namtra_dmp}
-\end{listing}
+\nlst{namtra_dmp}
 
 In some applications it can be useful to add a Newtonian damping term into
@@ -1188 +1164 @@
 \label{sec:TRA_eosbn2}
 
-\begin{listing}
-  \nlst{nameos}
-  \caption{\forcode{&nameos}}
-  \label{lst:nameos}
-\end{listing}
+\nlst{nameos}
 
 %% =================================================================================================

NEMO/trunk/doc/latex/NEMO/subfiles/chap_ZDF.tex

@@ -2 +2 @@
 
 \begin{document}
-
-%% Custom aliases
-\newcommand{\cf}{\ensuremath{C\kern-0.14em f}}
 
 \chapter{Vertical Ocean Physics (ZDF)}
@@ -56 +53 @@
 %and thus of the formulation used (see \autoref{chap:TD}).
 
-\begin{listing}
-  \nlst{namzdf}
-  \caption{\forcode{&namzdf}}
-  \label{lst:namzdf}
-\end{listing}
+\nlst{namzdf}
 
 %% =================================================================================================
@@ -86 +79 @@
 \label{subsec:ZDF_ric}
 
-\begin{listing}
-  \nlst{namzdf_ric}
-  \caption{\forcode{&namzdf_ric}}
-  \label{lst:namzdf_ric}
-\end{listing}
+\nlst{namzdf_ric}
 
 When \np[=.true.]{ln_zdfric}{ln\_zdfric}, a local Richardson number dependent formulation for the vertical momentum and
@@ -142 +131 @@
 \label{subsec:ZDF_tke}
 
-\begin{listing}
-  \nlst{namzdf_tke}
-  \caption{\forcode{&namzdf_tke}}
-  \label{lst:namzdf_tke}
-\end{listing}
+\nlst{namzdf_tke}
 
 The vertical eddy viscosity and diffusivity coefficients are computed from a TKE turbulent closure model based on
@@ -420 +405 @@
 \label{subsec:ZDF_gls}
 
-\begin{listing}
-  \nlst{namzdf_gls}
-  \caption{\forcode{&namzdf_gls}}
-  \label{lst:namzdf_gls}
-\end{listing}
+\nlst{namzdf_gls}
 
 The Generic Length Scale (GLS) scheme is a turbulent closure scheme based on two prognostic equations:
@@ -539 +520 @@
 \label{subsec:ZDF_osm}
 
-\begin{listing}
-  \nlst{namzdf_osm}
-  \caption{\forcode{&namzdf_osm}}
-  \label{lst:namzdf_osm}
-\end{listing}
+\nlst{namzdf_osm}
 
 %--------------------------------------------------------------------------------------------------------------
@@ -1078 +1055 @@
 \label{sec:ZDF_drg}
 
-\begin{listing}
-  \nlst{namdrg}
-  \caption{\forcode{&namdrg}}
-  \label{lst:namdrg}
-\end{listing}
-\begin{listing}
-  \nlst{namdrg_top}
-  \caption{\forcode{&namdrg_top}}
-  \label{lst:namdrg_top}
-\end{listing}
-\begin{listing}
-  \nlst{namdrg_bot}
-  \caption{\forcode{&namdrg_bot}}
-  \label{lst:namdrg_bot}
-\end{listing}
+\nlst{namdrg}
+
+\nlst{namdrg_top}
+
+\nlst{namdrg_bot}
 
 Options to define the top and bottom friction are defined through the \nam{drg}{drg} namelist variables.
@@ -1346 +1313 @@
 \label{subsec:ZDF_tmx_new}
 
-\begin{listing}
-  \nlst{namzdf_iwm}
-  \caption{\forcode{&namzdf_iwm}}
-  \label{lst:namzdf_iwm}
-\end{listing}
+\nlst{namzdf_iwm}
 
 The parameterization of mixing induced by breaking internal waves is a generalization of
@@ -1562 +1525 @@
 by only a few extra physics choices namely:
 
-\begin{verbatim}
+\begin{forlines}
      ln_dynldf_OFF = .false.
      ln_dynldf_lap = .true.
@@ -1570 +1533 @@
         nn_fct_h   =  2
         nn_fct_v   =  2
-\end{verbatim}
+\end{forlines}
 
 \noindent which were chosen to provide a slightly more stable and less noisy solution. The

NEMO/trunk/doc/latex/NEMO/subfiles/chap_cfgs.tex

@@ -35 +35 @@
 Configuration is defined manually through the \nam{cfg}{cfg} namelist variables.
 
-\begin{listing}
-  \nlst{namcfg}
-  \caption{\forcode{&namcfg}}
-  \label{lst:namcfg}
-\end{listing}
+\nlst{namcfg}
 
 %% =================================================================================================

NEMO/trunk/doc/latex/NEMO/subfiles/chap_misc.tex

@@ -12 +12 @@
 {\footnotesize
   \begin{tabularx}{\textwidth}{l||X|X}
-    Release & Author(s) & Modifications \\
+    Release     & Author(s)            & Modifications                      \\
     \hline
-    {\em   X.X} & {\em Pierre Mathiot} & {update of the closed sea section}
-    {\em   4.0} & {\em ...} & {\em ...} \\
-    {\em   3.6} & {\em ...} & {\em ...} \\
-    {\em   3.4} & {\em ...} & {\em ...} \\
-    {\em <=3.4} & {\em ...} & {\em ...}
+    {\em   X.X} & {\em Pierre Mathiot} & {Update of the closed sea section} \\
+    {\em   4.0} & {\em ...           } & {\em ...                         } \\
+    {\em   3.6} & {\em ...           } & {\em ...                         } \\
+    {\em   3.4} & {\em ...           } & {\em ...                         } \\
+    {\em <=3.4} & {\em ...           } & {\em ...                         }
   \end{tabularx}
 }
@@ -112 +112 @@
 \label{sec:MISC_closea}
 
-\begin{listing}
-  \nlst{namclo}
-  \caption{\forcode{&namclo}}
-  \label{lst:namclo}
-\end{listing}
+\nlst{namclo}
 
 Some configurations include inland seas and lakes as ocean
@@ -330 +326 @@
 \label{sec:MISC_opt}
 
-\begin{listing}
-  \nlst{namctl}
-  \caption{\forcode{&namctl}}
-  \label{lst:namctl}
-\end{listing}
+\nlst{namctl}
 
 Options are defined through the  \nam{ctl}{ctl} namelist variables.

NEMO/trunk/doc/latex/NEMO/subfiles/chap_model_basics_zstar.tex

@@ -83 +83 @@
 
 %\nlst{nam_dynspg}
+
 Options are defined through the \nam{_dynspg}{\_dynspg} namelist variables.
 The surface pressure gradient term is related to the representation of the free surface (\autoref{sec:MB_hor_pg}).

NEMO/trunk/doc/latex/NEMO/subfiles/chap_time_domain.tex

@@ -12 +12 @@
 {\footnotesize
   \begin{tabularx}{0.5\textwidth}{l||X|X}
-    Release          & Author(s)                                       &
+    Release          & Author(s)                                       & 
     Modifications                                                      \\
     \hline
-    {\em        4.0} & {\em J\'{e}r\^{o}me Chanut \newline Tim Graham} &
+    {\em        4.0} & {\em J\'{e}r\^{o}me Chanut \newline Tim Graham} & 
     {\em Review \newline Update                                      } \\
-    {\em        3.6} & {\em Christian \'{E}th\'{e}                   } &
+    {\em        3.6} & {\em Christian \'{E}th\'{e}                   } & 
     {\em Update                                                      } \\
-    {\em $\leq$ 3.4} & {\em Gurvan Madec                             } &
+    {\em $\leq$ 3.4} & {\em Gurvan Madec                             } & 
     {\em First version                                               } \\
   \end{tabularx}
@@ -44 +44 @@
 
 The time stepping used in \NEMO\ is a three level scheme that can be represented as follows:
+
 \begin{equation}
   \label{eq:TD}
   x^{t + \rdt} = x^{t - \rdt} + 2 \, \rdt \ \text{RHS}_x^{t - \rdt, \, t, \, t + \rdt}
 \end{equation}
+
 where $x$ stands for $u$, $v$, $T$ or $S$;
 RHS is the \textbf{R}ight-\textbf{H}and-\textbf{S}ide of the corresponding time evolution equation;
@@ -97 +99 @@
 first designed by \citet{robert_JMSJ66} and more comprehensively studied by \citet{asselin_MWR72},
 is a kind of laplacian diffusion in time that mixes odd and even time steps:
+
 \begin{equation}
   \label{eq:TD_asselin}
   x_F^t = x^t + \gamma \, \lt[ x_F^{t - \rdt} - 2 x^t + x^{t + \rdt} \rt]
 \end{equation}
+
 where the subscript $F$ denotes filtered values and $\gamma$ is the Asselin coefficient.
 $\gamma$ is initialized as \np{rn_atfp}{rn\_atfp} (namelist parameter).
@@ -132 +136 @@
 The conditions for stability of second and fourth order horizontal diffusion schemes are
 \citep{griffies_bk04}:
+
 \begin{equation}
   \label{eq:TD_euler_stability}
@@ -140 +145 @@
   \end{cases}
 \end{equation}
+
 where $e$ is the smallest grid size in the two horizontal directions and
 $A^h$ is the mixing coefficient.
@@ -151 +157 @@
 To overcome the stability constraint, a backward (or implicit) time differencing scheme is used.
 This scheme is unconditionally stable but diffusive and can be written as follows:
+
 \begin{equation}
   \label{eq:TD_imp}
@@ -168 +175 @@
 where RHS is the right hand side of the equation except for the vertical diffusion term.
 We rewrite \autoref{eq:TD_imp} as:
+
 \begin{equation}
   \label{eq:TD_imp_mat}
   -c(k + 1) \; T^{t + 1}(k + 1) + d(k) \; T^{t + 1}(k) - \; c(k) \; T^{t + 1}(k - 1) \equiv b(k)
 \end{equation}
+
 where
+
 \[
   c(k) = A_w^{vT} (k) \, / \, e_{3w} (k) \text{,} \quad
@@ -239 +249 @@
 $Q$ is redistributed over several time step.
 In the modified LF-RA environment, these two formulations have been replaced by:
+
 \begin{gather}
   \label{eq:TD_forcing}
@@ -246 +257 @@
                     - \gamma \, \rdt \, \lt( Q^{t + \rdt / 2} - Q^{t - \rdt / 2} \rt)
 \end{gather}
+
 The change in the forcing formulation given by \autoref{eq:TD_forcing}
 (see \autoref{fig:TD_MLF_forcing}) has a significant effect:
@@ -290 +302 @@
 \label{sec:TD_rst}
 
-\begin{listing}
-  \nlst{namrun}
-  \caption{\forcode{&namrun}}
-  \label{lst:namrun}
-\end{listing}
+\nlst{namrun}
 
 The first time step of this three level scheme when starting from initial conditions is
@@ -375 +383 @@
   %
 \end{flalign*}
+
 \begin{flalign*}
   \allowdisplaybreaks
@@ -387 +396 @@
   %
 \end{flalign*}
+
 \begin{flalign*}
   \allowdisplaybreaks

NEMO/trunk/doc/latex/global/highlighting.tex

@@ -29 +29 @@
 
 %% Namelists inclusion
-\newcommand{\nlst}[1]{\forfile{../../../namelists/#1}}
-%\newcommand{\nlst}[1]{
-%   \begin{listing}
-%      \newmintedfile{fortran}{../../../namelists/#1}
-%      \caption{\forcode{&#1}}
-%      \label{lst:#1}
-%   \end{listing}
-%}
+\newcommand{\nlst}[1]{
+   \begin{listing}
+      \newmintedfile{fortran}{../../../namelists/#1}
+      \caption{\forcode{&#1}}
+      \label{lst:#1}
+   \end{listing}
+}