From 3e17d34f027af090429fb382e7a2f47301fec71d Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Mon, 2 Feb 2015 10:39:52 +0000
Subject: [PATCH] [cleanup] Remove wrong semicolon after methods.
Remove empty constructors and destructors.
(reviewed by bernd)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14161 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/implicit/1p/1plocalresidual.hh | 2 +-
.../common/multidomainconvergencewriter.hh | 10 +++++-----
dumux/multidomain/common/multidomainmodel.hh | 8 ++++----
.../common/multidomainnewtoncontroller.hh | 13 +++----------
.../2p2ccouplinglocalresidual.hh | 4 ----
.../2p2cnicouplinglocalresidual.hh | 4 ----
6 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/dumux/implicit/1p/1plocalresidual.hh b/dumux/implicit/1p/1plocalresidual.hh
index 7d523b43db..0196bda670 100644
--- a/dumux/implicit/1p/1plocalresidual.hh
+++ b/dumux/implicit/1p/1plocalresidual.hh
@@ -63,7 +63,7 @@ public:
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
upwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
- };
+ }
/*!
* \brief Evaluate the rate of change of all conservation
diff --git a/dumux/multidomain/common/multidomainconvergencewriter.hh b/dumux/multidomain/common/multidomainconvergencewriter.hh
index 95c24c3f36..68816b7630 100644
--- a/dumux/multidomain/common/multidomainconvergencewriter.hh
+++ b/dumux/multidomain/common/multidomainconvergencewriter.hh
@@ -89,7 +89,7 @@ struct MultiDomainConvergenceWriter
if (!vtkMultiWriter2_)
vtkMultiWriter2_ = new VtkMultiWriter2(problem_().sdProblem2().gridView(), "convergence2");
- };
+ }
/*!
* \brief Start and advance one iteration
@@ -103,7 +103,7 @@ struct MultiDomainConvergenceWriter
++ iteration_;
vtkMultiWriter1_->beginWrite(timeStepIndex_ + iteration_ / 100.0);
vtkMultiWriter2_->beginWrite(timeStepIndex_ + iteration_ / 100.0);
- };
+ }
/*!
* \brief Start and advance one iteration
@@ -135,21 +135,21 @@ struct MultiDomainConvergenceWriter
std::cout << "\n writing convergence file of current Newton iteration \n";
ctl_.method().model().sdModel1().addConvergenceVtkFields(*vtkMultiWriter1_, uLastIter1, deltaU1);
ctl_.method().model().sdModel2().addConvergenceVtkFields(*vtkMultiWriter2_, uLastIter2, deltaU2);
- };
+ }
//! \brief End of iteration
void endIteration()
{
vtkMultiWriter1_->endWrite();
vtkMultiWriter2_->endWrite();
- };
+ }
//! \brief End of time step
void endTimestep()
{
++timeStepIndex_;
iteration_ = 0;
- };
+ }
private:
const Problem &problem_() const
diff --git a/dumux/multidomain/common/multidomainmodel.hh b/dumux/multidomain/common/multidomainmodel.hh
index bbe2e05da4..814daa8b32 100644
--- a/dumux/multidomain/common/multidomainmodel.hh
+++ b/dumux/multidomain/common/multidomainmodel.hh
@@ -120,7 +120,7 @@ public:
uCur_ = tmpU;
return result;
#endif
- };
+ }
/*!
* \brief Reference to the current solution as a block vector.
@@ -271,7 +271,7 @@ public:
// merge the two sub-vectors together
SplitAndMerge::mergeSolVectors(sdModel1().curSol(), sdModel2().curSol(), *uCur_);
SplitAndMerge::mergeSolVectors(sdModel1().prevSol(), sdModel2().prevSol(), *uPrev_);
- };
+ }
//! \copydoc Dumux::ImplicitModel::updateFailed()
void updateFailed()
@@ -281,7 +281,7 @@ public:
// merge the two sub-vectors together
SplitAndMerge::mergeSolVectors(sdModel1().curSol(), sdModel2().curSol(), *uCur_);
- };
+ }
/*!
* \brief Called by the update() method if a try was
@@ -295,7 +295,7 @@ public:
// merge the two sub-vectors together
SplitAndMerge::mergeSolVectors(sdModel1().curSol(), sdModel2().curSol(), *uCur_);
- };
+ }
/*!
* \brief Calculate the global residual.
diff --git a/dumux/multidomain/common/multidomainnewtoncontroller.hh b/dumux/multidomain/common/multidomainnewtoncontroller.hh
index 19b34c499a..cc71989d53 100644
--- a/dumux/multidomain/common/multidomainnewtoncontroller.hh
+++ b/dumux/multidomain/common/multidomainnewtoncontroller.hh
@@ -93,14 +93,7 @@ public:
<< ", "
<< GET_PROP_VALUE(TypeTag, NewtonMaxRelativeShift)
<< std::endl;
- };
-
- /*!
- * \brief Destructor
- */
- ~MultiDomainNewtonController()
- { };
-
+ }
//! \copydoc ParentType::newtonUpdateShift()
void newtonUpdateShift(const SolutionVector &uLastIter,
@@ -282,8 +275,8 @@ public:
convergenceWriter_.beginIteration(sdGridView1_(), sdGridView2_());
convergenceWriter_.writeFields(uLastIter, deltaU);
convergenceWriter_.endIteration();
- };
- };
+ }
+ }
/*!
* \brief the subdomain gridviews
diff --git a/dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh b/dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh
index c2b0d168e3..5476e7d071 100644
--- a/dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh
+++ b/dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh
@@ -78,10 +78,6 @@ class TwoPTwoCCouplingLocalResidual : public TwoPTwoCLocalResidual<TypeTag>
typedef Dune::FieldVector<Scalar, dim> DimVector;
public:
- //! \brief Constructor
- TwoPTwoCCouplingLocalResidual()
- { };
-
/*!
* \brief Implementation of the boundary evaluation
*/
diff --git a/dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh b/dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh
index 3b182f912f..52e8ee1dde 100644
--- a/dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh
+++ b/dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh
@@ -82,10 +82,6 @@ class TwoPTwoCNICouplingLocalResidual : public NILocalResidual<TypeTag>
typedef Dune::FieldVector<Scalar, dim> DimVector;
public:
- //! \brief Constructor
- TwoPTwoCNICouplingLocalResidual()
- { };
-
/*!
* \brief Implementation of the boundary evaluation
*/
--
GitLab