Commit dcd4b4d7 authored by Timo Koch's avatar Timo Koch
Browse files

[cleanup] Remove trailing whitespace

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15066 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 6f459b4b
......@@ -45,7 +45,7 @@ def isFuzzyEqualText(text1, text2, absolute, relative):
for number1, number2 in zip(list1, list2):
number1 = float(number1)
number2 = float(number2)
if (abs(number1 - number2) > absolute
if (abs(number1 - number2) > absolute
and (number2 == 0.0 or abs(abs(number1 / number2) - 1.0) > relative)):
if (abs(number1 - number2) > abs(maximum1 - maximum2)):
maximum1 = float(number1)
......
......@@ -92,5 +92,5 @@ if [ "$NOT_EQUAL" = "true" ]; then
fi
# SUCCESS!!!!!!
echo "Result and reference result are identical"
echo "Result and reference result are identical"
exit 0
......@@ -95,7 +95,7 @@
%Cube Right Back Upper
%X-Y rectangle Z = 1
%X-Y rectangle Z = 1
\draw[] (1,1,1) -- (0,1,1);
\draw[] (0,1,1) -- (0,0,1);
\draw[] (0,0,1) -- (1,0,1);
......@@ -134,7 +134,7 @@
%Cube Left Back Upper
%X-Y rectangle Z = 1
%X-Y rectangle Z = 1
\draw[] (-1,1,1) -- (0,1,1);
\draw[] (0,1,1) -- (0,0,1);
\draw[] (0,0,1) -- (-1,0,1);
......@@ -253,7 +253,7 @@
%Cube Right Back Lower
%X-Y rectangle Z = -1
%X-Y rectangle Z = -1
\draw[dashed] (1,1,-1) -- (0,1,-1);
\draw[dashed] (0,1,-1) -- (0,0,-1);
\draw[dashed] (0,0,-1) -- (1,0,-1);
......@@ -292,7 +292,7 @@
%Cube Left Back Lower
%X-Y rectangle Z = -1
%X-Y rectangle Z = -1
\draw[dashed] (-1,1,-1) -- (0,1,-1);
\draw[dashed] (0,1,-1) -- (0,0,-1);
\draw[dashed] (0,0,-1) -- (-1,0,-1);
......
......@@ -122,7 +122,7 @@
%Y-Z rectangle X = 0-0.5
\draw[] (0-0.5,-1,2) -- (0-0.5,-1,1);
\draw[dashed] (0-0.5,-1,1) -- (0-0.5,0,1);
\draw[dashed] (0-0.5,0,1) -- (0-0.5,0,2);
\draw[dashed] (0-0.5,0,1) -- (0-0.5,0,2);
\draw[] (0-0.5,0,2) -- (0-0.5,-1,2);
%X-Y rectangle Z = 1
......@@ -314,7 +314,7 @@
%Y-Z rectangle X = 1
\draw[] (0+1,-1,2) -- (0+1,-1,1);
\draw[dashed] (0+1,-1,1) -- (0+1,0,1);
\draw[dashed] (0+1,0,1) -- (0+1,0,2);
\draw[dashed] (0+1,0,1) -- (0+1,0,2);
\draw[] (0+1,0,2) -- (0+1,-1,2);
%X-Y rectangle Z = 1
......
......@@ -113,7 +113,7 @@
%Y-Z rectangle X = 0-0.5
\draw[] (0-0.5,-1,2) -- (0-0.5,-1,1);
\draw[dashed] (0-0.5,-1,1) -- (0-0.5,0,1);
\draw[dashed] (0-0.5,0,1) -- (0-0.5,0,2);
\draw[dashed] (0-0.5,0,1) -- (0-0.5,0,2);
\draw[] (0-0.5,0,2) -- (0-0.5,-1,2);
%X-Y rectangle Z = 1
......@@ -293,7 +293,7 @@
%Y-Z rectangle X = 1
\draw[] (0+1,-1,2) -- (0+1,-1,1);
\draw[dashed] (0+1,-1,1) -- (0+1,0,1);
\draw[dashed] (0+1,0,1) -- (0+1,0,2);
\draw[dashed] (0+1,0,1) -- (0+1,0,2);
\draw[] (0+1,0,2) -- (0+1,-1,2);
%X-Y rectangle Z = 1
......
......@@ -150,7 +150,7 @@
%Cube Left Back Lower
%X-Y rectangle Z = -1
%X-Y rectangle Z = -1
\draw[dashed] (-1,1,-1) -- (0,1,-1);
\draw[dashed] (0,1,-1) -- (0,0,-1);
\draw[dashed] (0,0,-1) -- (-1,0,-1);
......
......@@ -141,7 +141,7 @@
%Cube Right Back Lower
%X-Y rectangle Z = -1
%X-Y rectangle Z = -1
\draw[dashed] (1,1,-1) -- (0,1,-1);
\draw[dashed] (0,1,-1) -- (0,0,-1);
\draw[dashed] (0,0,-1) -- (1,0,-1);
......
......@@ -108,7 +108,7 @@
%Cube Right Back Lower
%X-Y rectangle Z = -1
%X-Y rectangle Z = -1
\draw[dashed] (1,1,-1) -- (0,1,-1);
\draw[dashed] (0,1,-1) -- (0,0,-1);
\draw[dashed] (0,0,-1) -- (1,0,-1);
......
......@@ -143,7 +143,7 @@
%Cube Left Back Lower
%X-Y rectangle Z = -1
%X-Y rectangle Z = -1
\draw[dashed] (-1,1,-1) -- (0,1,-1);
\draw[dashed] (0,1,-1) -- (0,0,-1);
\draw[dashed] (0,0,-1) -- (-1,0,-1);
......
......@@ -4,8 +4,8 @@
*
*\brief List of currently useable run-time parameters
*
* The listed run-time parameters are in general available,
* but we point out that a certain model might not be able
* to use every parameter!
* The listed run-time parameters are in general available,
* but we point out that a certain model might not be able
* to use every parameter!
* \htmlinclude parameters.html
*/
......@@ -84,7 +84,7 @@
*/
/*!
* \ingroup fluidmatrixinteractions
* \defgroup fluidmatrixinteractionsparams Parameters for Fluid-Matrix Interactions
* \defgroup fluidmatrixinteractionsparams Parameters for Fluid-Matrix Interactions
*/
/*!
* \ingroup Material
......@@ -119,7 +119,7 @@
*/
/*!
* \ingroup ImplicitModels
* \defgroup TwoPModel Two-phase
* \defgroup TwoPModel Two-phase
*
* \copydetails Dumux::TwoPModel
*/
......@@ -245,19 +245,19 @@
*/
/*!
* \ingroup ImplicitModels
* \defgroup ElasticBoxModel Linear elastic
* \defgroup ElasticBoxModel Linear elastic
*
* \copydetails Dumux::ElasticModel
*/
/*!
* \ingroup ImplicitModels
* \defgroup ElOnePTwoCBoxModel One-phase two component linear elastic
* \defgroup ElOnePTwoCBoxModel One-phase two component linear elastic
*
* \copydetails Dumux::ElOnePTwoCModel
*/
/*!
* \ingroup ImplicitModels
* \defgroup ElTwoPBoxModel Two-phase immiscible linear elastic
* \defgroup ElTwoPBoxModel Two-phase immiscible linear elastic
*
* \copydetails Dumux::ElTwoPModel
*/
......
......@@ -37,10 +37,10 @@ manuelle Zeilenumbruche hinzu
\end{itemize}
\subsubsection{subsubsection}
tafsasf mskmf safijsafaSF SAKFMAÖLSFMLDSF
tafsasf mskmf safijsafaSF SAKFMAÖLSFMLDSF
\paragraph{paragraph}
tafsasf mskmf safijsafaSF SAKFMAÖLSFMLDSF
tafsasf mskmf safijsafaSF SAKFMAÖLSFMLDSF
\section{Open Questions}
\begin{itemize}
......
......@@ -39,7 +39,7 @@
\usetikzlibrary{arrows,backgrounds,decorations.pathmorphing,patterns,positioning,fit,shapes}
% for listing of c++ code
\lstset{language=C++, basicstyle=\ttfamily,
\lstset{language=C++, basicstyle=\ttfamily,
% keywordstyle=\color{black}\bfseries,
tabsize=4, stringstyle=\ttfamily,
% commentstyle=\it,
......@@ -125,7 +125,7 @@
% a new counter
% you can give a label to it and thus reference it
% syntax: \numberThis{printedTextToBeLabeled}{label}
% syntax: \numberThis{printedTextToBeLabeled}{label}
% if you wanted a \newline after a numbered thing, you could just add a empty line after ``\label{#2}''
\newcounter{thingCounter}
\renewcommand{\thethingCounter}{\arabic{thingCounter}}
......
......@@ -4,9 +4,9 @@ This chapter tries to be a useful collection of tips and tricks that can be hand
when working with \Dumux. One of the most prominent ideas for developing
\Dune / \Dumux is that reinventing the wheel in terms of FEM code should
be avoided. We try to follow this idea also in the day-to-day work by
stating the \emph{tell us dogma}: ``If you found something useful,
stating the \emph{tell us dogma}: ``If you found something useful,
handy or for other reasons helping when working with \Dumux: put it into
this chapter.'' or inform other developers and write to
this chapter.'' or inform other developers and write to
\subsection{\Dumux - General Remarks}
......@@ -21,7 +21,7 @@ development requests at \url{http://www.dumux.org/flyspray/}.
\paragraph{Dashboard}
The testing-dashboard is a tool to constantly check the \Dumux problems for compiling
or running correctly. It is a useful tool to check the impacts of your commits
and for quality management. The dashboard is available at
and for quality management. The dashboard is available at
\url{http://www.dumux.org/dashboard.php}.
\paragraph{The \Dumux Mailing List:}
......@@ -41,7 +41,7 @@ to the commit mailing list:
\paragraph{Checking Your Commits:}
\Dumux is developed with the help of Subversion (\texttt{svn}).
This means that at some point you will commit your new and/or advanced features
to the repository. In the following some additional guidelines are shown which are
to the repository. In the following some additional guidelines are shown which are
are good practice. Especially if you plan on committing to the stable part of
\Dumux you must follow these steps.
\begin{itemize}
......@@ -59,21 +59,21 @@ are good practice. Especially if you plan on committing to the stable part of
\item check the testing-dashboard (see above), whether everything is still working
\end{itemize}
\paragraph{Naming conventions}
\paragraph{Naming conventions}
General guidelines for naming conventions are specified in Section \ref{guidelines}.
However, in order to avoid ambiguity a list of proposed names for variables, types,
functions etc is provided where users and mainly \Dumux developers can refer for
standards (check \texttt{dumux-devel/\allowbreak doc/\allowbreak naminglist/\allowbreak naming-conventions.odt}).
\paragraph{Errors Messages Related to the Property System}
The property system is a powerful tool and internally does some template and macro magic.
The property system is a powerful tool and internally does some template and macro magic.
The price for it are sometimes unintuitive compiler error messages. For example if the
definition of a property could not be found, the error is:
\begin{lstlisting}[style=DumuxCode,numbers=none]
error: no type named 'p' in 'struct Dumux::Properties::GetProperty<Dumux::Properties::TTag::TestProblem, Dumux::Properties::PTag::Scalar, Dumux::Properties::TTag::TestProblem, -1000>'
\end{lstlisting}
\noindent So check whether you did not misspelled any name related to the property system in the
\noindent So check whether you did not misspelled any name related to the property system in the
line of the error message and whether you really declared the type tag you use there.\\
Further check, if the \texttt{Problem} property was defined and spelled correctly.
......@@ -86,18 +86,18 @@ $ svn diff > PATCHFILE
\end{lstlisting}
\noindent which creates a text file containing all your changes to the files
in the current folder or its subdirectories.
Other developers can now simply apply this patch by
Other developers can now simply apply this patch by
\begin{lstlisting}[style=Bash]
$ path -p0 < PATCHFILE
\end{lstlisting}
\paragraph{Using \Dune Debug Streams}
\Dune provides a helpful feature, for keeping your debug-output organized.
In stead of juggling with a bazillion \texttt{std::cout <<} statements or keeping some debug-precompiler statements organized, which are generally and strongly discouraged see \ref{guidelines} in order not to get
flooded away by your output \Dune gives you a nice tool by the so called debug streams.
\Dune provides a helpful feature, for keeping your debug-output organized.
In stead of juggling with a bazillion \texttt{std::cout <<} statements or keeping some debug-precompiler statements organized, which are generally and strongly discouraged see \ref{guidelines} in order not to get
flooded away by your output \Dune gives you a nice tool by the so called debug streams.
These are streams like \texttt{cout} but they can be switched on and off for the whole project.
Maybe if you are really in the dark you want to see all your debug information. Another time you may only want to be warned if something is going seriously wrong during a simulation.
These are streams like \texttt{cout} but they can be switched on and off for the whole project.
Maybe if you are really in the dark you want to see all your debug information. Another time you may only want to be warned if something is going seriously wrong during a simulation.
This can be achieved by setting the debug streams to desired values. There are five levels:
\begin{verbatim}
5 - grave (dgrave)
......@@ -119,7 +119,7 @@ which are used like\\
\lstinline{dataFile << "# This was written from "<< __FILE__ << ", line " << __LINE__ << "\n";}\\
which translates into a line in the output file reading\\
\lstinline{# This was written from [..]/dumux/dumux/io/outputToFile.hh, line 261}\\
This can also be very useful, if you want to have information about where some warning or debug information was issued.
This can also be very useful, if you want to have information about where some warning or debug information was issued.
\paragraph{Option Files optim.opts and debug.opts}
\Dune and \Dumux are built with the help of \texttt{dunecontrol}, as explained on page \pageref{buildIt}.
......@@ -127,7 +127,7 @@ A lot of options need to be specified for that, which is done in option files. \
\texttt{debug.opts} and \texttt{optim.opts}. These two files differ in the way \Dune and \Dumux are compiled:
either for debugging or for fast simulation. Switching between these two states can lead to a speedup of factor up to ten!
Programs that are compiled with optimization can hardly be debugged because the debugger gets confused.
Debugging with the optimization options active will lead to erratic behavior while debugging.
Debugging with the optimization options active will lead to erratic behavior while debugging.
You can modify the files and add third-party dependencies or additional compiler flags.
......@@ -154,7 +154,7 @@ The basic svn commands are:
\item \texttt{svn commit} upload changes to the repository (only with meaningful
commit messages)
\end{itemize}
The above shows you the necessary steps if you use the command line. There are also other tools providing a graphical
The above shows you the necessary steps if you use the command line. There are also other tools providing a graphical
user interface for using svn like kdesvn or eclipse.
\paragraph{Properties/Attributes}
......
......@@ -280,15 +280,15 @@
owner = {faigle},
review = {3phase model derivation finite element discretizattion Beschreibung
des sequenziellen numerischen L\"osungsschemas verwendete ELLAM methode
Trangenstein + pC
assumpt: no mass transfer between water and gas/oil (black oil)
rho_w = const
s(p, ...) und nicht s(p+pc, ...)},
timestamp = {2011.11.29}
}
......
......@@ -44,9 +44,9 @@
*
* Example:
*
* \code
* // -> retrieves scalar value UpwindWeight, default
* // is taken from the property UpwindWeight
* \code
* // -> retrieves scalar value UpwindWeight, default
* // is taken from the property UpwindWeight
* GET_PARAM(TypeTag, Scalar, UpwindWeight);
* \endcode
*/
......@@ -65,7 +65,7 @@
*
* Example:
*
* \code
* \code
* // -> retrieves Boolean value Newton.WriteConvergence, default
* // is taken from the property NewtonWriteConvergence
* GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, WriteConvergence);
......@@ -83,7 +83,7 @@
*
* Example:
*
* \code
* \code
* // -> retrieves global integer value NumberOfCellsX
* GET_RUNTIME_PARAM(TypeTag, int, NumberOfCellsX);
* \endcode
......@@ -100,7 +100,7 @@
*
* Example:
*
* \code
* \code
* // -> retrieves global integer value "NumberOfCellsX" which is
* // located in the parameter group "Grid"
* GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, NumberOfCellsX);
......@@ -191,7 +191,7 @@ void print(std::ostream &os = std::cout)
os << "# Run-time specified parameters:" << std::endl;
rt.report(os);
if (hasDeprecatedKeys_<TypeTag>(tree))
if (hasDeprecatedKeys_<TypeTag>(tree))
{
os << "# DEPRECATED run-time specified parameters:" << std::endl;
drt.report(os);
......
......@@ -18,7 +18,7 @@
*****************************************************************************/
/*!
* \file
*
*
* \brief This file provides the infrastructure to use quad-precision
* floating point values in the numerical models.
*/
......
......@@ -364,19 +364,19 @@ int start_(int argc,
if (ParameterTree::tree().hasKey("ParameterFile"))
{
// set the name to the one provided by the user
parameterFileName = GET_RUNTIME_PARAM(TypeTag, std::string, ParameterFile); // otherwise we read from the command line
parameterFileName = GET_RUNTIME_PARAM(TypeTag, std::string, ParameterFile); // otherwise we read from the command line
}
else
else
{
// set the name to the default ./<programname>.input
parameterFileName = argv[0];
parameterFileName += ".input";
}
// open and check whether the parameter file exists.
std::ifstream parameterFile(parameterFileName.c_str());
if (not parameterFile.is_open()) {
// if the name of the file has been specified,
// if the name of the file has been specified,
// this must be an error. Otherwise proceed.
if (ParameterTree::tree().hasKey("ParameterFile"))
{
......@@ -387,7 +387,7 @@ int start_(int argc,
return 1;
}
}
else
else
{
// read parameters from the file without overwriting
Dune::ParameterTreeParser::readINITree(parameterFileName,
......@@ -397,7 +397,7 @@ int start_(int argc,
parameterFile.close();
bool printProps = false;
if (ParameterTree::tree().hasKey("PrintProperties")
if (ParameterTree::tree().hasKey("PrintProperties")
|| ParameterTree::tree().hasKey("TimeManager.PrintProperties"))
printProps = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, TimeManager, PrintProperties);
......@@ -408,7 +408,7 @@ int start_(int argc,
// deal with the restart stuff
bool restart = false;
Scalar restartTime = 0;
if (ParameterTree::tree().hasKey("Restart")
if (ParameterTree::tree().hasKey("Restart")
|| ParameterTree::tree().hasKey("TimeManager.Restart")) {
restart = true;
restartTime = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, Restart);
......@@ -416,7 +416,7 @@ int start_(int argc,
// read the PrintParams parameter
bool printParams = true;
if (ParameterTree::tree().hasKey("PrintParameters")
if (ParameterTree::tree().hasKey("PrintParameters")
|| ParameterTree::tree().hasKey("TimeManager.PrintParameters"))
printParams = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, TimeManager, PrintParameters);
......@@ -433,7 +433,7 @@ int start_(int argc,
// read the initial time step and the end time
double tEnd;
double dt;
try { tEnd = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, TEnd); }
catch (...) {
std::string usageMessage = "\n\t -> Mandatory parameter 'TimeManager.TEnd'"
......
......@@ -231,14 +231,14 @@ public:
{ return velocityGrad_; }
/*!
* \brief Return the dynamic eddy viscosity
* \brief Return the dynamic eddy viscosity
* \f$\mathrm{[Pa \cdot s]} = \mathrm{[N \cdot s/m^2]}\f$ (if implemented).
*/
const Scalar dynamicEddyViscosity() const
{ return kinematicEddyViscosity() * density(); }
/*!
* \brief Return the kinematic eddy viscosity
* \brief Return the kinematic eddy viscosity
* \f$\mathrm{[m^2/s]}\f$ (if implemented).
*/
const Scalar kinematicEddyViscosity() const
......
......@@ -584,7 +584,7 @@ protected:
DimVector muGradVelTangential(0.0);
velGrad.umv(tangent, muGradVelTangential);
muGradVelTangential *= boundaryVars.dynamicViscosity() + boundaryVars.dynamicEddyViscosity();
this->residual_[scvIdx][massBalanceIdx] -= 0.5*stabilizationBeta_
* (muGradVelTangential*tangent);
}
......@@ -640,7 +640,7 @@ protected:
}
/*!
* \brief Interpolate the pressure at corner points of the grid, thus taking the degree of freedom there.
* \brief Interpolate the pressure at corner points of the grid, thus taking the degree of freedom there.
* This is required due to stability reasons.
*/
void interpolateCornerPoints_(const BoundaryTypes &bcTypes, const int scvIdx)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment