From 2e56a9a562605df2d226b9a7a08f63e952bec3dc Mon Sep 17 00:00:00 2001
From: Beatrix Becker <beatrix.becker@iws.uni-stuttgart.de>
Date: Thu, 20 Dec 2018 16:10:42 +0100
Subject: [PATCH] [handbook] correct quick installation and cleanup
---
doc/handbook/0_dumux-handbook.tex | 5 ++---
doc/handbook/2_quickinstall.tex | 6 +++---
doc/handbook/6_temporaldiscretizations.tex | 4 ++--
doc/handbook/installDumux.sh | 18 ++----------------
4 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/doc/handbook/0_dumux-handbook.tex b/doc/handbook/0_dumux-handbook.tex
index d238f6e34d..9de687ab3a 100644
--- a/doc/handbook/0_dumux-handbook.tex
+++ b/doc/handbook/0_dumux-handbook.tex
@@ -115,9 +115,8 @@ Universit\"at Stuttgart, Paffenwaldring 61, D-70569 Stuttgart, Germany}\\
In this chapter we provide a quick start guide to
your first \Dumux experience, including an install script with all necessary instructions
on how to very quickly install the latest release version of \Dumux.
-You should have a recent working Linux environment and no \Dune core modules should be installed.
-If you need more information or
-have \Dune already installed, please have a look at the detailed installation
+You should have a recent working Linux environment.
+If you need more information, please have a look at the detailed installation
instructions in the next chapter \ref{detailed-install}.
\input{2_quickinstall}
diff --git a/doc/handbook/2_quickinstall.tex b/doc/handbook/2_quickinstall.tex
index b6c71a337f..668f22ca4e 100644
--- a/doc/handbook/2_quickinstall.tex
+++ b/doc/handbook/2_quickinstall.tex
@@ -28,9 +28,9 @@ will compile and run a simple one-phase ground water flow example and will visua
The test script can be obtained by copying the following lines into a text file named \texttt{test\_dumux.sh}
that has to be located in the same directory as the installation script.
\begin{lstlisting}[style=DumuxCode]
-cd DUMUX/dumux/build-cmake/test/porousmediumflow/1p/implicit/stationary
-make -B test_1p_compressible_stationary_tpfa
-./test_1p_compressible_stationary_tpfa params.input
+cd DUMUX/dumux/build-cmake/test/porousmediumflow/1p/implicit/isothermal
+make -B test_1p_tpfa
+./test_1p_tpfa params.input
paraview *pvd
\end{lstlisting}
The script \texttt{test\_dumux.sh} can be executed by typing into the terminal: \texttt{./test\_dumux.sh}.
diff --git a/doc/handbook/6_temporaldiscretizations.tex b/doc/handbook/6_temporaldiscretizations.tex
index e0a5542b8b..fd424205bd 100644
--- a/doc/handbook/6_temporaldiscretizations.tex
+++ b/doc/handbook/6_temporaldiscretizations.tex
@@ -1,4 +1,4 @@
-\section{Temporal Discretization and Algorithms}
+\section{Temporal Discretization and Solution Strategies}
%TODO: Intro sentences
\subsection{Temporal discretization}
@@ -44,7 +44,7 @@ if the time step size $\Delta t_{k+1}$ is below a certain limit that depends
on the specific balance equation, whereas the implicit method \eqref{eq:impliciteuler}
is unconditionally stable.
-\subsection{Algorithms to solve equations}
+\subsection{Solution strategies to solve equations}
The governing equations of each model can be solved monolithically or sequentially.
The basic idea of the sequential algorithm is to reformulate the
equations of multi-phase flow into one equation for
diff --git a/doc/handbook/installDumux.sh b/doc/handbook/installDumux.sh
index 0e84314ccc..60295e5089 100644
--- a/doc/handbook/installDumux.sh
+++ b/doc/handbook/installDumux.sh
@@ -10,25 +10,11 @@ Make sure to be connected to the internet."
echo "*************************************************"
# the core modules
for MOD in common geometry grid localfunctions istl; do
- if [ ! -d "dune-$MOD" ]; then
- git clone -b releases/2.6 https://gitlab.dune-project.org/core/dune-$MOD.git
- else
- echo "Skip cloning dune-$MOD because the folder already exists."
- cd dune-$MOD
- git checkout releases/2.6
- cd ..
- fi
+ git clone -b releases/2.6 https://gitlab.dune-project.org/core/dune-$MOD.git
done
# dumux
-if [ ! -d "dumux" ]; then
- git clone -b releases/3.0 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux.git
-else
- echo "Skip cloning dumux because the folder already exists."
- cd dumux
- git checkout releases/3.0
- cd ..
-fi
+git clone -b releases/3.0 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux.git
if [ $? -ne 0 ]; then
echo "*************************************************"
--
GitLab