From 5b42e96397672c7a0aaf9e50309e34e8cd45a888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <christoph.grueninger@iws.uni-stuttgart.de> Date: Tue, 29 Nov 2016 15:51:09 +0100 Subject: [PATCH] [Cleanup] superfuous semicolon and other cleanups --- doc/handbook/dumux-handbook.bib | 2 +- dumux/common/eigenvalues.hh | 5 +++-- dumux/common/splinecommon_.hh | 14 +++++++------- dumux/common/tabulated2dfunction.hh | 14 +++++++------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/doc/handbook/dumux-handbook.bib b/doc/handbook/dumux-handbook.bib index 982fc19040..ee68f39d7d 100644 --- a/doc/handbook/dumux-handbook.bib +++ b/doc/handbook/dumux-handbook.bib @@ -756,11 +756,11 @@ url = {http://www.sciencedirect.com/science/article/pii/S0169772204001160} edition = {1} } -% no doi or link available @BOOK{kays2005, title = {{Convective heat and mass transfer}}, publisher = {McGraw-Hill Higher Education}, year = {2005}, + isbn={9780071238298}, author = {W. M. Kays and M. E. Crawford and B. Weigand}, edition = {4}, } diff --git a/dumux/common/eigenvalues.hh b/dumux/common/eigenvalues.hh index d6bb97ea91..5b8d4ea82b 100644 --- a/dumux/common/eigenvalues.hh +++ b/dumux/common/eigenvalues.hh @@ -55,8 +55,9 @@ double calcOffDiagonalNorm(Matrix& matrix) return sqrt(norm); } -//! Function to calculate eigenvalues of n x n matrices -/* +/*! + * \briefFunction to calculate eigenvalues of n x n matrices + * * \param eigVel Vector for storing the eigenvalues * \param matrix n x n matrices for which eigenvalues have to be calculated * \param relativeTolerance tolerance for the relative convergence criterion (default: 0.01) diff --git a/dumux/common/splinecommon_.hh b/dumux/common/splinecommon_.hh index 9dcfe46c72..ed99383eba 100644 --- a/dumux/common/splinecommon_.hh +++ b/dumux/common/splinecommon_.hh @@ -30,8 +30,8 @@ #include <dune/common/exceptions.hh> #include <dune/common/float_cmp.hh> -#include "valgrind.hh" #include "math.hh" +#include "valgrind.hh" namespace Dumux { @@ -56,19 +56,19 @@ public: bool applies(Scalar x) const { return x_(0) <= x && x <= x_(numSamples_() - 1); - }; + } /*! * \brief Return the x value of the leftmost sampling point. */ Scalar xMin() const - { return x_(0); }; + { return x_(0); } /*! * \brief Return the x value of the rightmost sampling point. */ Scalar xMax() const - { return x_(numSamples_() - 1); }; + { return x_(numSamples_() - 1); } /*! * \brief Prints k tuples of the format (x, y, dx/dy, isMonotonic) @@ -193,7 +193,7 @@ public: Scalar intersect(Scalar a, Scalar b, Scalar c, Scalar d) const { return intersectIntervall(xMin(), xMax(), a, b, c, d); - }; + } /*! * \brief Find the intersections of the spline with a cubic @@ -225,7 +225,7 @@ public: "Spline has no intersection"); //<<a<"x^3 + " <<b<"x^2 + "<<c<"x + "<<d<<"!"); return tmpSol[0]; - }; + } /*! * \brief Returns 1 if the spline is monotonically increasing, -1 @@ -291,7 +291,7 @@ public: protected: // this is an internal class, so everything is protected! SplineCommon_() - { Valgrind::SetUndefined(asImp_()); }; + { Valgrind::SetUndefined(asImp_()); } /*! * \brief Set the sampling point vectors. diff --git a/dumux/common/tabulated2dfunction.hh b/dumux/common/tabulated2dfunction.hh index f4e1f510cc..81bcbcb383 100644 --- a/dumux/common/tabulated2dfunction.hh +++ b/dumux/common/tabulated2dfunction.hh @@ -79,7 +79,7 @@ public: yMin_ = yMin; yMax_ = yMax; - }; + } /*! * \brief Return the position on the x-axis of the i-th interval. @@ -89,7 +89,7 @@ public: assert(0 <= i && i < m_); return xMin_ + i*(xMax_ - xMin_)/(m_ - 1); - }; + } /*! * \brief Return the position on the y-axis of the j-th interval. @@ -99,7 +99,7 @@ public: assert(0 <= j && j < n_); return yMin_ + j*(yMax_ - yMin_)/(n_ - 1); - }; + } /*! * \brief Return the interval index of a given position on the x-axis. @@ -112,7 +112,7 @@ public: Scalar xToI(Scalar x) const { return (x - xMin_)/(xMax_ - xMin_)*m_; - }; + } /*! @@ -126,7 +126,7 @@ public: Scalar yToJ(Scalar y) const { return (y - yMin_)/(yMax_ - yMin_)*n_; - }; + } /*! @@ -140,7 +140,7 @@ public: assert(0 <= j && j < n_); return samples_[j*m_ + i]; - }; + } /*! * \brief Set the value of the sample point which is at the @@ -153,7 +153,7 @@ public: assert(0 <= j && j < n_); samples_[j*m_ + i] = value; - }; + } /*! * \brief Return an interpolated value. -- GitLab