merge concluded

01_download.tex

@@ -59,19 +59,10 @@ To install \texttt{g++} run:
 \noindent
 \exahype\ itself does not depend on Fortran but you may prefer to write parts of your \exahype\ code in Fortran. In this case, you obviously need an additional Fortran compiler. Typically, \texttt{gfortran} comes with \texttt{build-essential} package. If you want an Intel \texttt{ifort}, you need to install from source.
 
-\subsection*{Shared memory support: TBB (or OpenMP)}
+\subsection*{Shared memory support: TBB}
 \vspace{0.3cm}
-\exahype\ currently supports shared memory parallelisation through Intel’s Threading Building Blocks (TBB) or OpenMP. OpenMP support comes along with both Intel and GCC compilers. To check which version of OpenMP is supported by your GCC compiler you can type the following:
-\begin{code}
-> echo |cpp -fopenmp -dM |grep -i open
-\end{code}
-You should get otuput similar to the one shown below:
-\begin{code}
-#define _OPENMP 201511
-\end{code}
-the numbers following \texttt{\_OPENMP} variable are in the following format \texttt{yyyymm}, where \texttt{yyyy} represents the year and \texttt{mm} the mont of the release. You can go to \url{https://www.openmp.org/specifications/} to discover the mapping between the date and the actual version of the standard.\\
-\noindent
-We recommend using the TBB variant, though. The reason for that is, that it is typically one step ahead of the OpenMP support. TBB is open source and works both with GCC and Intel compilers. At least TBB 2017 is required. You can clone TBB from the official repository by typing the following into your terminal:
+\exahype\ currently supports shared memory parallelisation through Intel’s Threading Building Blocks (TBB). 
+TBB is open source and works both with GCC and Intel compilers. At least TBB 2017 is required. You can clone TBB from the official repository by typing the following into your terminal:
 \begin{code}
 > cd <my-path>
 > git clone https://github.com/intel/tbb.git

02a_Demonstrators-Workflow.tex

@@ -23,13 +23,14 @@ the \exahype\ engine is actually built. You can always check / reconstruct these
 The high-level overview of the \exahype\ workflow has been visualised in Figure \ref{fig:workflow}.
 
 \afterpage{\clearpage}
-\begin{sidewaysfigure}
+%\begin{landscape}
+\begin{figure}
 \centering
 \includegraphics[width=.8\textwidth]{tikz/demonstrators-workflow.pdf}
 \includegraphics[width=.8\textwidth]{tikz/demonstrators-legend.pdf}
 \caption[Sketch (tikz): High-level overview of \exahype\ workflow]{High-level overview of \exahype\ workflow and files generated by the application. \label{fig:workflow}}
-\end{sidewaysfigure}
-
+\end{figure}
+%\end{landscape}
 \newpage
 \subsection{Configuration file}
 

guidebook.tex

@@ -99,7 +99,7 @@ agreement No 671698.
 \noindent
 This particular document was generated on \today\ at \currenttime. \\
 
-\noindent Copyright \copyright\ 2018 The \exahype\ consortium
+\noindent Copyright \copyright\ 2019 The \exahype\ consortium
 (see page \pageref{sec:list-of-authors} for a detailled list of authors)
 \\
 
@@ -132,16 +132,14 @@ This particular document was generated on \today\ at \currenttime. \\
 
 %----------------------------------------------------------------------------------------
 
-  \part{\exahype\ installation and demonstrator applications}
+  \part{\exahype\ installation and Demonstrators}
   \input{01_download}
-
-  \input{02_demonstrators}
-  \pagebreak
-  \input{02a_Demonstrators-Workflow}
-  \input{02b_Euler-FiniteVolumes}
   \input{03_documentation}
   %removed for now since this structure is no longer correct
   %\input{04_development-process}
+    \input{02_demonstrators}
+    \input{02a_Demonstrators-Workflow}
+  \input{02b_Euler-FiniteVolumes}
   
   \part{Developing new \exahype\ applications}
   \input{10_setup-experiment} 
@@ -149,6 +147,8 @@ This particular document was generated on \today\ at \currenttime. \\
   \input{11_swe.tex}
   \input{12_coupling-limiter.tex}
   \input{13_adaptive-mesh-refinement.tex}
+  
+  \part{Advanced Features}
   \input{14_advanced.tex}
   \input{15_fortran.tex}
   \input{16_complicated-domains.tex}

x0_lists.tex

@@ -21,42 +21,45 @@
 \item Tobias Weinzierl (Durham University)
 \item Vasco Varduhn (TUM, Munich)
 \item Anne Reinarz (TUM, Munich)
+\item Olga Glogowska (TUM, Munich)
 \end{itemize}
 
-\subsection{Detailed contributions}
-
-The editing on the guidebook is managed within the version control software \texttt{git}.
-That makes it in principle easy to track individual changes and to quantify the amount
-each author contributed. However, be \emph{warned} that there is not a unique way of
-measuring authorship. We tested two methods which results are given in table
-\ref{tbl:xAuthorsMethod1} and \ref{tbl:xAuthorsMethod2}, respectively. The most
-useful number is probably the total number of lines changed (\texttt{loc}). This does
-not tell anything about the originality, quality or information density of these edits.
-The number of commits (\texttt{coms}) is an estimate how frequently edits were
-made.
-The number of changed files (\texttt{fils}) is a first attemp to measure the number of
-added figures, especially in method II. Method I contains a neat overview about when
-respective authors made their first and last commit -- note that several authors joined
-the project later while others left it already, this reflects also in these numbers.
-
-\begin{table}
-\makebox[\textwidth][c]{ % centering overwidth table
-\begin{small}
-% Regenerate this file with the scripts in the directory stats/
-\input{stats/stats-gitquick.tex}
-\end{small}
-} % end of center overwidth table
-\caption{Authors contributions measured with method I.}\label{tbl:xAuthorsMethod1}
-\end{table}
-
-\begin{table}
-\begin{small}
-% Regenerate this file with the scripts in the directory stats/
-% http://www.tex.ac.uk/FAQ-verbfile.html
-\verbatiminput{stats/stats-gitfame.txt}
-\end{small}
-\caption{Authors contributions measured with method II.}\label{tbl:xAuthorsMethod2}
-\end{table}
+
+%Hopelessly out of date
+% \subsection{Detailed contributions}
+% 
+% The editing on the guidebook is managed within the version control software \texttt{git}.
+% That makes it in principle easy to track individual changes and to quantify the amount
+% each author contributed. However, be \emph{warned} that there is not a unique way of
+% measuring authorship. We tested two methods which results are given in table
+% \ref{tbl:xAuthorsMethod1} and \ref{tbl:xAuthorsMethod2}, respectively. The most
+% useful number is probably the total number of lines changed (\texttt{loc}). This does
+% not tell anything about the originality, quality or information density of these edits.
+% The number of commits (\texttt{coms}) is an estimate how frequently edits were
+% made.
+% The number of changed files (\texttt{fils}) is a first attemp to measure the number of
+% added figures, especially in method II. Method I contains a neat overview about when
+% respective authors made their first and last commit -- note that several authors joined
+% the project later while others left it already, this reflects also in these numbers.
+% 
+% \begin{table}
+% \makebox[\textwidth][c]{ % centering overwidth table
+% \begin{small}
+% % Regenerate this file with the scripts in the directory stats/
+% \input{stats/stats-gitquick.tex}
+% \end{small}
+% } % end of center overwidth table
+% \caption{Authors contributions measured with method I.}\label{tbl:xAuthorsMethod1}
+% \end{table}
+% 
+% \begin{table}
+% \begin{small}
+% % Regenerate this file with the scripts in the directory stats/
+% % http://www.tex.ac.uk/FAQ-verbfile.html
+% \verbatiminput{stats/stats-gitfame.txt}
+% \end{small}
+% \caption{Authors contributions measured with method II.}\label{tbl:xAuthorsMethod2}
+% \end{table}
 
 \clearpage