Changeset 11558 for NEMO/trunk/doc/latex/NEMO/subfiles/apdx_triads.tex

Timestamp:

2019-09-17T17:04:06+02:00 (5 years ago)

Author:

nicolasmartin

Message:

Review all figure envs + activation of listoflistings

1. Figure env:
   • Replace center sub-env with only \centering cmd
   • Add alternate caption for \listoffigures (shorter one between square brackets, i.e. \caption[]{})
   • Place \label outside of \caption and remove useless \protect

2. Namelist listings
   • Put \nlst with the namelist inlcusion in a listing float env with caption and label
   • Remove namelist duplicates

-- This line, and those below, will be ignored--
M subfiles/apdx_triads.tex
M subfiles/chap_model_basics_zstar.tex
M subfiles/chap_SBC.tex
M subfiles/apdx_DOMAINcfg.tex
M subfiles/apdx_s_coord.tex
M subfiles/chap_DOM.tex
M subfiles/chap_ASM.tex
M subfiles/chap_DIU.tex
M subfiles/chap_cfgs.tex
M subfiles/chap_ZDF.tex
M subfiles/chap_OBS.tex
M subfiles/chap_model_basics.tex
M subfiles/chap_time_domain.tex
M subfiles/apdx_algos.tex
M subfiles/chap_TRA.tex
M subfiles/chap_DYN.tex
M subfiles/chap_misc.tex
M subfiles/chap_DIA.tex
M subfiles/apdx_invariants.tex
M subfiles/chap_LBC.tex
M subfiles/apdx_diff_opers.tex
M subfiles/chap_STO.tex
M subfiles/chap_LDF.tex

File:

• NEMO/trunk/doc/latex/NEMO/subfiles/apdx_triads.tex (modified) (6 diffs)

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

@@ -26 +26 @@
 %-----------------------------------------nam_traldf------------------------------------------------------
 
-\nlst{namtra_ldf}
 %---------------------------------------------------------------------------------------------------------
 
@@ -202 +201 @@
 % >>>>>>>>>>>>>>>>>>>>>>>>>>>>
 \begin{figure}[tb]
-  \begin{center}
-    \includegraphics[width=\textwidth]{Fig_GRIFF_triad_fluxes}
-    \caption{
-      \protect\label{fig:TRIADS_ISO_triad}
-      (a) Arrangement of triads $S_i$ and tracer gradients to
-      give lateral tracer flux from box $i,k$ to $i+1,k$
-      (b) Triads $S'_i$ and tracer gradients to give vertical tracer flux from
-      box $i,k$ to $i,k+1$.
-    }
-  \end{center}
+  \centering
+  \includegraphics[width=\textwidth]{Fig_GRIFF_triad_fluxes}
+  \caption[Triads arrangement and tracer gradients to give lateral and vertical tracer fluxes]{
+    (a) Arrangement of triads $S_i$ and tracer gradients to
+    give lateral tracer flux from box $i,k$ to $i+1,k$
+    (b) Triads $S'_i$ and tracer gradients to give vertical tracer flux from
+    box $i,k$ to $i,k+1$.}
+  \label{fig:TRIADS_ISO_triad}
 \end{figure}
 % >>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -266 +263 @@
 % >>>>>>>>>>>>>>>>>>>>>>>>>>>>
 \begin{figure}[tb]
-  \begin{center}
-    \includegraphics[width=\textwidth]{Fig_GRIFF_qcells}
-    \caption{
-      \protect\label{fig:TRIADS_qcells}
-      Triad notation for quarter cells. $T$-cells are inside boxes,
-      while the  $i+\fractext{1}{2},k$ $u$-cell is shaded in green and
-      the $i,k+\fractext{1}{2}$ $w$-cell is shaded in pink.
-    }
-  \end{center}
+  \centering
+  \includegraphics[width=\textwidth]{Fig_GRIFF_qcells}
+  \caption[Triad notation for quarter cells]{
+    Triad notation for quarter cells.
+    $T$-cells are inside boxes,
+    while the $i+\fractext{1}{2},k$ $u$-cell is shaded in green and
+    the $i,k+\fractext{1}{2}$ $w$-cell is shaded in pink.}
+  \label{fig:TRIADS_qcells}
 \end{figure}
 % >>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -659 +655 @@
 % >>>>>>>>>>>>>>>>>>>>>>>>>>>>
 \begin{figure}[h]
-  \begin{center}
-    \includegraphics[width=\textwidth]{Fig_GRIFF_bdry_triads}
-    \caption{
-      \protect\label{fig:TRIADS_bdry_triads}
-      (a) Uppermost model layer $k=1$ with $i,1$ and $i+1,1$ tracer points (black dots),
-      and $i+1/2,1$ $u$-point (blue square).
-      Triad slopes \triad{i}{1}{R}{1/2}{-1/2} (magenta) and \triad{i+1}{1}{R}{-1/2}{-1/2} (blue) poking through
-      the ocean surface are masked (faded in figure).
-      However, the lateral $_{11}$ contributions towards \triad[u]{i}{1}{F}{1/2}{-1/2} and
-      \triad[u]{i+1}{1}{F}{-1/2}{-1/2} (yellow line) are still applied,
-      giving diapycnal diffusive fluxes.
-      \newline
-      (b) Both near bottom triad slopes \triad{i}{k}{R}{1/2}{1/2} and
-      \triad{i+1}{k}{R}{-1/2}{1/2} are masked when either of the $i,k+1$ or $i+1,k+1$ tracer points is masked,
-      \ie\ the $i,k+1$ $u$-point is masked.
-      The associated lateral fluxes (grey-black dashed line) are masked if
-      \protect\np{ln\_botmix\_triad}\forcode{ = .false.}, but left unmasked,
-      giving bottom mixing, if \protect\np{ln\_botmix\_triad}\forcode{ = .true.}
-    }
-  \end{center}
+  \centering
+  \includegraphics[width=\textwidth]{Fig_GRIFF_bdry_triads}
+  \caption[Boundary triads]{
+    (a) Uppermost model layer $k=1$ with $i,1$ and $i+1,1$ tracer points (black dots),
+    and $i+1/2,1$ $u$-point (blue square).
+    Triad slopes \triad{i}{1}{R}{1/2}{-1/2} (magenta) and
+    \triad{i+1}{1}{R}{-1/2}{-1/2} (blue) poking through the ocean surface are masked
+    (faded in figure).
+    However,
+    the lateral $_{11}$ contributions towards \triad[u]{i}{1}{F}{1/2}{-1/2} and
+    \triad[u]{i+1}{1}{F}{-1/2}{-1/2} (yellow line) are still applied,
+    giving diapycnal diffusive fluxes.
+    \newline
+    (b) Both near bottom triad slopes \triad{i}{k}{R}{1/2}{1/2} and
+    \triad{i+1}{k}{R}{-1/2}{1/2} are masked when
+    either of the $i,k+1$ or $i+1,k+1$ tracer points is masked,
+    \ie\ the $i,k+1$ $u$-point is masked.
+    The associated lateral fluxes (grey-black dashed line) are masked if
+    \protect\np{ln\_botmix\_triad}\forcode{ = .false.}, but left unmasked,
+    giving bottom mixing, if \protect\np{ln\_botmix\_triad}\forcode{ = .true.}}
+  \label{fig:TRIADS_bdry_triads}
 \end{figure}
 % >>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -811 +808 @@
 % >>>>>>>>>>>>>>>>>>>>>>>>>>>>
 \begin{figure}[h]
-%  \fcapside {
-  \caption{
-    \protect\label{fig:TRIADS_MLB_triad}
+  \centering
+  \includegraphics[width=\textwidth]{Fig_GRIFF_MLB_triads}
+  \caption[Definition of mixed-layer depth and calculation of linearly tapered triads]{
     Definition of mixed-layer depth and calculation of linearly tapered triads.
-    The figure shows a water column at a given $i,j$ (simplified to $i$), with the ocean surface at the top.
+    The figure shows a water column at a given $i,j$ (simplified to $i$),
+    with the ocean surface at the top.
     Tracer points are denoted by bullets, and black lines the edges of the tracer cells;
     $k$ increases upwards.
     \newline
-    \hspace{5 em}
-    We define the mixed-layer by setting the vertical index of the tracer point immediately below the mixed layer,
-    $k_{\mathrm{ML}}$, as the maximum $k$ (shallowest tracer point) such that
+    We define the mixed-layer by setting the vertical index of the tracer point immediately below
+    the mixed layer, $k_{\mathrm{ML}}$, as the maximum $k$ (shallowest tracer point) such that
     ${\rho_0}_{i,k}>{\rho_0}_{i,k_{10}}+\Delta\rho_c$,
     where $i,k_{10}$ is the tracer gridbox within which the depth reaches 10~m.
@@ -830 +827 @@
     Triads with different $i_p,k_p$, denoted by different colours,
     (\eg\ the green triad $i_p=1/2,k_p=-1/2$) are tapered to the appropriate basal triad.}
-  % }
-  \includegraphics[width=\textwidth]{Fig_GRIFF_MLB_triads}
+  \label{fig:TRIADS_MLB_triad}
 \end{figure}
 % >>>>>>>>>>>>>>>>>>>>>>>>>>>>