diff --git a/doc/handbook/0_dumux-handbook.tex b/doc/handbook/0_dumux-handbook.tex index b6a8b2c0134e41e071293d32bc97d9dd89b28ac3..bcebcb0e0ac912dd3bb17b5033f75a7151135928 100644 --- a/doc/handbook/0_dumux-handbook.tex +++ b/doc/handbook/0_dumux-handbook.tex @@ -42,8 +42,8 @@ % Dune and Dumux logo \newcommand{\Dune}{{DUNE}\xspace} \newcommand{\Dumux}{\texorpdfstring{Du\-Mu$^\text{x}$\xspace}{DuMuX\xspace}} -\newcommand{\DumuxVersion}{3.5} -\newcommand{\DumuxOldVersion}{3.4} +\newcommand{\DumuxVersion}{3.6} +\newcommand{\DumuxOldVersion}{3.5} \definecolor{dumuxYellow}{HTML}{E19417} \definecolor{dumuxBlue}{HTML}{0C73CF} \newcommand{\DuneVersion}{2.8} diff --git a/doc/handbook/3_detailedinstall.tex b/doc/handbook/3_detailedinstall.tex index 7142775f59cef0d4ec8404db8d6219b0a4317946..1eceebbcb8a8a3d83a753e2454283c2e66a34cbc 100644 --- a/doc/handbook/3_detailedinstall.tex +++ b/doc/handbook/3_detailedinstall.tex @@ -239,7 +239,7 @@ depending on which modules of \Dune and which external libraries you use. \section{Backwards Compatibility} \label{sec:backwardscompatibility} -Dumux Releases are split into major (e.g. 2.0, 3.0) and minor (e.g. 3.1, 3.2, 3.3, 3.4, 3.5) releases. +Dumux Releases are split into major (e.g. 2.0, 3.0) and minor (e.g. 3.1, 3.2, ..., \DumuxVersion) releases. Major releases are not required to maintain backwards compatibility but would provide a detailed guide on updating dependent modules. For each minor release, maintaining backwards compatibility is strongly encouraged and recommended. diff --git a/doc/handbook/4_course.tex b/doc/handbook/4_course.tex index 0962d8570aca2703483b7526a88b85e487b69ebd..a24689ef64379c1413a88c53cf55a797745cff88 100644 --- a/doc/handbook/4_course.tex +++ b/doc/handbook/4_course.tex @@ -18,10 +18,13 @@ such that you can see how a model is developed in \Dumux. As a teaser, we've what I've downloaded."}, you question. The \Dumux course material is available online: \url{https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course}. \par -In order to download this repository, which acts as an additional module to -the \Dumux base, you can download an installation script with the following command: +In order to use this repository, which acts as an additional module to +the \Dumux base, you can excecute the following commands to download and execute the corresponding installation script: \begin{lstlisting}[style=Bash,escapechar=\%] -$ wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/releases/%\DumuxVersion%/scripts/install.sh +$ wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/raw/releases/%\DumuxVersion%/bin/installdumux.py +$ python3 installdumux.py --dumux-version %\DumuxVersion% --dune-version %\DuneVersion% +$ python3 dumux/bin/installexternal.py course +$ ./dune-common/bin/dunecontrol --opts=./dumux/cmake.opts all \end{lstlisting} This script will install \texttt{dumux}, it's Dune dependencies, and the \texttt{dumux-course} repository. Within the directory \texttt{dumux-course} there are a series of exercises