Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • fluiddyn/fluiddyn_papers
1 result
Show changes
Commits on Source (2)
wrap = 89
number = true
end_of_line = "lf"
NAME = main NAME = main
$(NAME).pdf: figures $(NAME).pdf: figures
cd input && latexmk -halt-on-error -f -shell-escape -pdf $(NAME).tex && mv $(NAME).pdf ../$(NAME).pdf cd input && latexmk -halt-on-error -f -shell-escape -pdf $(NAME).tex && rsync $(NAME).pdf ../$(NAME).pdf
figures: figures:
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
figures: figures:
python py/make_figures.py SAVE pdm run python py/make_figures.py SAVE
clean: clean:
rm -f tmp/*.tex rm -f tmp/*.tex
cd input && rm -f *.aux *.fdb_latexmk *.fls *.log *.bak* *.bbl *.blg *.out *Notes.bib cd input && rm -f *.aux *.fdb_latexmk *.fls *.log *.bak* *.bbl *.blg *.out *Notes.bib
cleantmp: cleantmp:
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
clean: clean:
rm -f tmp/*.tex rm -f tmp/*.tex
cd input && rm -f *.aux *.fdb_latexmk *.fls *.log *.bak* *.bbl *.blg *.out *Notes.bib cd input && rm -f *.aux *.fdb_latexmk *.fls *.log *.bak* *.bbl *.blg *.out *Notes.bib
cleantmp: cleantmp:
rm -rf tmp/* rm -rf tmp
cleanpdf: cleanpdf:
rm -f $(NAME).pdf input/$(NAME).pdf rm -f $(NAME).pdf input/$(NAME).pdf
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
cleanall: clean cleantmp cleanpdf cleanall: clean cleantmp cleanpdf
format: format:
cd input && formattex *.tex -i -v cd input && pdm run formattex *.tex -i -v
black: black:
...@@ -23,4 +23,6 @@ ...@@ -23,4 +23,6 @@
black: black:
black -l 82 py pdm run black -l 82 py
install-deps: sync
...@@ -26,2 +28,6 @@ ...@@ -26,2 +28,6 @@
all: format $(NAME).pdf sync:
pdm sync --clean
lock:
pdm lock
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
## How to build the document? ## How to build the document?
1. One needs to download the dataset which is now available in [MyCore 1. One needs to download the dataset which is now available in
CNRS](https://mycore.core-cloud.net/index.php/s/rpiQSLSoauNCVQE). [MyCore CNRS](https://mycore.core-cloud.net/index.php/s/rpiQSLSoauNCVQE).
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
1. One needs to define the environment variable `STRAT_TURB_TORO2022` with the 2. One needs to define the environment variable `STRAT_TURB_TORO2022` with the path
path towards the dataset directory. towards the dataset directory.
Something like this can be added in your `~/.bashrc` file: Something like this can be added in your `~/.bashrc` file:
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
export STRAT_TURB_TORO2022=/data/MyCore/2022strat-turb-toro export STRAT_TURB_TORO2022=/data/MyCore/2022strat-turb-toro
``` ```
1. Install a virtual env with `pdm sync --clean` and activate it. 3. Install a virtual env with `pdm sync --clean` and activate it.
...@@ -18,5 +18,5 @@ ...@@ -18,5 +18,5 @@
1. The command `make` should produce all Latex tables, figures and finally the 4. The command `make` should produce all Latex tables, figures and finally the main pdf
main pdf file `article.pdf`. file `article.pdf`.
Note also than the Latex code can be formatted with the command `make format`. Note also than the Latex code can be formatted with the command `make format`.
...@@ -21,3 +21,2 @@ ...@@ -21,3 +21,2 @@
Note also than the Latex code can be formatted with the command `make format`. Note also than the Latex code can be formatted with the command `make format`.
NAME = article NAME = article
$(NAME).pdf: figures $(NAME).pdf: figures
cd input && latexmk -f -shell-escape -pdf $(NAME).tex && rsync $(NAME).pdf ../$(NAME).pdf cd input && latexmk -halt-on-error -f -shell-escape -pdf $(NAME).tex && rsync $(NAME).pdf ../$(NAME).pdf
figures: figures:
pdm run python py/make_figures.py SAVE pdm run python py/make_figures.py SAVE
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
cd input && rm -f *.aux *.fdb_latexmk *.fls *.log *.bak* *.bbl *.blg *.out *Notes.bib cd input && rm -f *.aux *.fdb_latexmk *.fls *.log *.bak* *.bbl *.blg *.out *Notes.bib
cleantmp: cleantmp:
rm -rf tmp/* rm -rf tmp
cleanpdf: cleanpdf:
rm -f $(NAME).pdf input/$(NAME).pdf rm -f $(NAME).pdf input/$(NAME).pdf
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
## How to build the document? ## How to build the document?
1. One needs to download the dataset which is now available in [MyCore 1. One needs to download the dataset which is now available in
CNRS](https://mycore.core-cloud.net/index.php/s/rpiQSLSoauNCVQE). [MyCore CNRS](https://mycore.core-cloud.net/index.php/s/rpiQSLSoauNCVQE).
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
1. One needs to define the environment variable `STRAT_TURB_TORO2022` with the 2. One needs to define the environment variable `STRAT_TURB_TORO2022` with the path
path towards the dataset directory. towards the dataset directory.
Something like this can be added in your `~/.bashrc` file: Something like this can be added in your `~/.bashrc` file:
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
export STRAT_TURB_TORO2022=/data/MyCore/2022strat-turb-toro export STRAT_TURB_TORO2022=/data/MyCore/2022strat-turb-toro
``` ```
1. Install a virtual env with `pdm sync --clean` and activate it. 3. Install a virtual env with `pdm sync --clean` and activate it.
...@@ -18,5 +18,5 @@ ...@@ -18,5 +18,5 @@
1. The command `make` should produce all Latex tables, figures and finally the 4. The command `make` should produce all Latex tables, figures and finally the main pdf
main pdf file `article.pdf`. file `article.pdf`.
Note also than the Latex code can be formatted with the command `make format`. Note also than the Latex code can be formatted with the command `make format`.
...@@ -21,3 +21,2 @@ ...@@ -21,3 +21,2 @@
Note also than the Latex code can be formatted with the command `make format`. Note also than the Latex code can be formatted with the command `make format`.
NAME = article NAME = article
$(NAME).pdf: figures $(NAME).pdf: figures
cd input && latexmk -f -shell-escape -pdf $(NAME).tex && rsync $(NAME).pdf ../$(NAME).pdf cd input && latexmk -halt-on-error -f -shell-escape -pdf $(NAME).tex && rsync $(NAME).pdf ../$(NAME).pdf
figures: figures:
pdm run python py/make_figures.py SAVE pdm run python py/make_figures.py SAVE
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
## How to build the document? ## How to build the document?
1. One needs to download the dataset which is now available in [MyCore 1. One needs to download the dataset which is now available in
CNRS](https://mycore.core-cloud.net/index.php/s/rpiQSLSoauNCVQE). [MyCore CNRS](https://mycore.core-cloud.net/index.php/s/rpiQSLSoauNCVQE).
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
1. One needs to define the environment variable `STRAT_TURB_TORO2022` with the 2. One needs to define the environment variable `STRAT_TURB_TORO2022` with the path
path towards the dataset directory. towards the dataset directory.
Something like this can be added in your `~/.bashrc` file: Something like this can be added in your `~/.bashrc` file:
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
export STRAT_TURB_TORO2022=/data/MyCore/2022strat-turb-toro export STRAT_TURB_TORO2022=/data/MyCore/2022strat-turb-toro
``` ```
1. Install a virtual env with `pdm sync --clean` and activate it. 3. Install a virtual env with `pdm sync --clean` and activate it.
...@@ -18,6 +18,6 @@ ...@@ -18,6 +18,6 @@
1. The command `make` should produce all Latex tables, figures and finally the 4. The command `make` should produce all Latex tables, figures and finally the main pdf
main pdf file `article.pdf`. file `article.pdf`.
Note also than the Latex code can be formatted with the command `make format`. Note also than the Latex code can be formatted with the command `make format`.
......
NAME = article NAME = article
$(NAME).pdf: figures $(NAME).pdf: figures
cd input && latexmk -shell-escape -pdf $(NAME).tex && rsync $(NAME).pdf ../$(NAME).pdf cd input && latexmk -halt-on-error -f -shell-escape -pdf $(NAME).tex && rsync $(NAME).pdf ../$(NAME).pdf
figures: figures:
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
figures: figures:
python py/make_figures.py SAVE pdm run python py/make_figures.py SAVE
clean: clean:
rm -f tmp/*.tex rm -f tmp/*.tex
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
cleanall: clean cleantmp cleanpdf cleanall: clean cleantmp cleanpdf
format: format:
cd input && formattex *.tex -i -v cd input && pdm run formattex *.tex -i -v
black: black:
...@@ -23,3 +23,11 @@ ...@@ -23,3 +23,11 @@
black: black:
black -l 82 py pdm run black -l 82 py
install-deps: sync
sync:
pdm sync --clean
lock:
pdm lock
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
## How to build the document? ## How to build the document?
1. One needs to download the dataset which is now available in [MyCore 1. One needs to download the dataset which is now available in
CNRS](https://mycore.core-cloud.net/index.php/s/rpiQSLSoauNCVQE). [MyCore CNRS](https://mycore.core-cloud.net/index.php/s/rpiQSLSoauNCVQE).
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
1. One needs to define the environment variable `STRAT_TURB_TORO2022` with the 2. One needs to define the environment variable `STRAT_TURB_TORO2022` with the path
path towards the dataset directory. towards the dataset directory.
Something like this can be added in your `~/.bashrc` file: Something like this can be added in your `~/.bashrc` file:
...@@ -14,8 +14,10 @@ ...@@ -14,8 +14,10 @@
export STRAT_TURB_TORO2022=/data/MyCore/2022strat-turb-toro export STRAT_TURB_TORO2022=/data/MyCore/2022strat-turb-toro
``` ```
1. The command `make` should produce all Latex tables, figures and finally the 3. Install a virtual env with `pdm sync --clean` and activate it.
main pdf file `article.pdf`.
4. The command `make` should produce all Latex tables, figures and finally the main pdf
file `article.pdf`.
Note also than the Latex code can be formatted with the command `make format`. Note also than the Latex code can be formatted with the command `make format`.
......
...@@ -134,10 +134,10 @@ ...@@ -134,10 +134,10 @@
\begin{document} \begin{document}
\title{Regimes in stratified turbulence forced in vertical vorticity analyzed \title{Regimes in stratified turbulence forced in vertical vorticity analyzed from a
from a new comprehensive open dataset} new comprehensive open dataset}
\author{Pierre Augier} \author{Pierre Augier}
\affiliation{Laboratoire des Ecoulements G\'eophysiques et Industriels, Universit\'e \affiliation{Laboratoire des Ecoulements G\'eophysiques et Industriels, Universit\'e
Grenoble Alpes, CNRS, Grenoble-INP, F-38000 Grenoble, France} Grenoble Alpes, CNRS, Grenoble-INP, F-38000 Grenoble, France}
\author{Vincent Reneuve} \author{Vincent Reneuve}
...@@ -139,10 +139,10 @@ ...@@ -139,10 +139,10 @@
\author{Pierre Augier} \author{Pierre Augier}
\affiliation{Laboratoire des Ecoulements G\'eophysiques et Industriels, Universit\'e \affiliation{Laboratoire des Ecoulements G\'eophysiques et Industriels, Universit\'e
Grenoble Alpes, CNRS, Grenoble-INP, F-38000 Grenoble, France} Grenoble Alpes, CNRS, Grenoble-INP, F-38000 Grenoble, France}
\author{Vincent Reneuve} \author{Vincent Reneuve}
\affiliation{Universit\'{e} C\^{o}te d'Azur, Observatoire de la C\^{o}te \affiliation{Universit\'{e} C\^{o}te d'Azur, Observatoire de la C\^{o}te d'Azur, CNRS,
d'Azur, CNRS, Laboratoire Lagrange, Nice, France.} Laboratoire Lagrange, Nice, France.}
\author{Jason Reneuve} \author{Jason Reneuve}
\affiliation{Laboratoire des Ecoulements G\'eophysiques et Industriels, Universit\'e \affiliation{Laboratoire des Ecoulements G\'eophysiques et Industriels, Universit\'e
Grenoble Alpes, CNRS, Grenoble-INP, F-38000 Grenoble, France} Grenoble Alpes, CNRS, Grenoble-INP, F-38000 Grenoble, France}
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
hyperdiffusive terms are added, with fourth-order viscosity $\nu_4$ and diffusivity hyperdiffusive terms are added, with fourth-order viscosity $\nu_4$ and diffusivity
$\kappa_4$ computed so that dissipative scales are well resolved. $\kappa_4$ computed so that dissipative scales are well resolved.
\begin{equation} \begin{equation}
\nu_4 = \kappa_4 = P ^{1 / 3} {\kmax} ^ {-10 / 3}, \nu_4 = \kappa_4 = P ^{1 / 3} {\kmax} ^ {-10 / 3},
\end{equation} \end{equation}
where $\kmax$ is the largest wavenumber taken into account truncation. The effect of where $\kmax$ is the largest wavenumber taken into account truncation. The effect of
hyperdiffusion can be quantified with the ratio $\epsKK/\epsK$ where is hyperdiffusion can be quantified with the ratio $\epsKK/\epsK$ where is
...@@ -307,7 +307,8 @@ ...@@ -307,7 +307,8 @@
Note that the variations for $\Ivelo$ between simulations are rather associated with Note that the variations for $\Ivelo$ between simulations are rather associated with
lacks of statistics (simulations not long enough) than with too coarse resolutions. lacks of statistics (simulations not long enough) than with too coarse resolutions.
\begin{figure}% [H] \begin{figure}
% [H]
\centerline{ \centerline{
\includegraphics[width=0.98\textwidth]{% \includegraphics[width=0.98\textwidth]{%
../tmp/fig_spectra_1couple} ../tmp/fig_spectra_1couple}
...@@ -577,8 +578,6 @@ ...@@ -577,8 +578,6 @@
Figure~\ref{fig:seb-O} ... Figure~\ref{fig:seb-O} ...
\begin{figure} \begin{figure}
\centerline{ \centerline{
\includegraphics[width=0.48\textwidth]{% \includegraphics[width=0.48\textwidth]{%
...@@ -632,7 +631,8 @@ ...@@ -632,7 +631,8 @@
Figure~\ref{fig:seb-P} ... Figure~\ref{fig:seb-P} ...
\begin{figure}% [H] \begin{figure}
% [H]
\centerline{ \centerline{
\includegraphics[width=0.98\textwidth]{% \includegraphics[width=0.98\textwidth]{%
../tmp/fig_spectra_1strat} ../tmp/fig_spectra_1strat}
...@@ -643,7 +643,8 @@ ...@@ -643,7 +643,8 @@
Figure~\ref{fig:spectra-1strat} ... Figure~\ref{fig:spectra-1strat} ...
\begin{figure}% [H] \begin{figure}
% [H]
\centerline{ \centerline{
\includegraphics[width=0.98\textwidth]{% \includegraphics[width=0.98\textwidth]{%
../tmp/fig_spectra_1R} ../tmp/fig_spectra_1R}
...@@ -660,12 +661,12 @@ ...@@ -660,12 +661,12 @@
mechanism... mechanism...
\begin{acknowledgments} \begin{acknowledgments}
This project has received funding from the European Research Council (ERC) This project has received funding from the European Research Council (ERC) under the
under the European Union's Horizon 2020 research and innovation program (Grant European Union's Horizon 2020 research and innovation program (Grant No. 647018-WATU).
No. 647018-WATU). It was also partially supported by the Simons Foundation It was also partially supported by the Simons Foundation through the Simons
through the Simons collaboration on wave turbulence. Part of this work was collaboration on wave turbulence. Part of this work was performed using resources
performed using resources provided by \href{https://www.cines.fr/}{CINES} under provided by \href{https://www.cines.fr/}{CINES} under GENCI allocation number
GENCI allocation number A0080107567. A0080107567.
\end{acknowledgments} \end{acknowledgments}
%\appendix\section{A great appendix} %\appendix\section{A great appendix}
......
This diff is collapsed.
formattex