From c209462fc8c883364102fefee82cc253aaeeb691 Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Thu, 12 Mar 2015 09:49:02 +0000
Subject: [PATCH] [cleanup] Remove emtpy deconstructors, minor code cleanups.
(reviewed by nicolas)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14373 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../common/implicitdarcyfluxvariables.hh | 28 ++++++++++---------
.../implicit/common/implicitlocalresidual.hh | 3 --
.../boxcouplinglocalresidual.hh | 4 ---
3 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/dumux/implicit/common/implicitdarcyfluxvariables.hh b/dumux/implicit/common/implicitdarcyfluxvariables.hh
index f31687db6f..824884c686 100644
--- a/dumux/implicit/common/implicitdarcyfluxvariables.hh
+++ b/dumux/implicit/common/implicitdarcyfluxvariables.hh
@@ -26,15 +26,17 @@
#ifndef DUMUX_IMPLICIT_DARCY_FLUX_VARIABLES_HH
#define DUMUX_IMPLICIT_DARCY_FLUX_VARIABLES_HH
-#include "implicitproperties.hh"
#include <dune/common/float_cmp.hh>
-#include <dumux/common/parameters.hh>
#include <dumux/common/math.hh>
+#include <dumux/common/parameters.hh>
+
+#include "implicitproperties.hh"
+
namespace Dumux
{
-
+
namespace Properties
{
// forward declaration of properties
@@ -74,7 +76,7 @@ class ImplicitDarcyFluxVariables
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
public:
- /*
+ /*!
* \brief The constructor
*
* \param problem The problem
@@ -103,9 +105,8 @@ public:
* \brief Return the volumetric flux over a face of a given phase.
*
* This is the calculated velocity multiplied by the unit normal
- * and the area of the face.
- * face().normal
- * has already the magnitude of the area.
+ * and the area of the face. face().normal has already the
+ * magnitude of the area.
*
* \param phaseIdx index of the phase
*/
@@ -165,8 +166,8 @@ public:
}
protected:
-
- /*
+
+ /*!
* \brief Calculation of the potential gradients
*
* \param problem The problem
@@ -180,7 +181,8 @@ protected:
// loop over all phases
for (int phaseIdx = 0; phaseIdx < numPhases; phaseIdx++)
{
- potentialGrad_[phaseIdx]= 0.0 ;
+ potentialGrad_[phaseIdx]= 0.0;
+
for (unsigned int idx = 0;
idx < face().numFap;
idx++) // loop over adjacent vertices
@@ -227,7 +229,7 @@ protected:
} // loop over all phases
}
- /*
+ /*!
* \brief Actual calculation of the normal Darcy velocities.
*
* \param problem The problem
@@ -307,7 +309,7 @@ protected:
+ (1.0 - mobilityUpwindWeight_)*downVolVars.mobility(phaseIdx)) ;
// set the volume flux
- volumeFlux_[phaseIdx] = velocity_[phaseIdx] * face().normal ;
+ volumeFlux_[phaseIdx] = velocity_[phaseIdx] * face().normal;
}// loop all phases
}
@@ -325,4 +327,4 @@ protected:
} // end namespace
-#endif
+#endif // DUMUX_IMPLICIT_DARCY_FLUX_VARIABLES_HH
diff --git a/dumux/implicit/common/implicitlocalresidual.hh b/dumux/implicit/common/implicitlocalresidual.hh
index b72b554fea..0c2cccc995 100644
--- a/dumux/implicit/common/implicitlocalresidual.hh
+++ b/dumux/implicit/common/implicitlocalresidual.hh
@@ -64,9 +64,6 @@ public:
ImplicitLocalResidual()
{ }
- ~ImplicitLocalResidual()
- { }
-
/*!
* \brief Initialize the local residual.
*
diff --git a/dumux/multidomain/couplinglocalresiduals/boxcouplinglocalresidual.hh b/dumux/multidomain/couplinglocalresiduals/boxcouplinglocalresidual.hh
index 68b59f9e4a..52a1c32c6e 100644
--- a/dumux/multidomain/couplinglocalresiduals/boxcouplinglocalresidual.hh
+++ b/dumux/multidomain/couplinglocalresiduals/boxcouplinglocalresidual.hh
@@ -70,10 +70,6 @@ public:
BoxCouplingLocalResidual()
{ }
- //! \brief The destructor
- ~BoxCouplingLocalResidual()
- { }
-
/*!
* \brief Compute the local residual, i.e. the deviation of the
* equations from zero. Gets a solution vector computed by PDELab
--
GitLab