From 642060c15bb6ef098f0771db5edd660846daa4f6 Mon Sep 17 00:00:00 2001
From: Philipp Nuske <philipp.nuske@mailbox.org>
Date: Thu, 19 Dec 2013 06:38:41 +0000
Subject: [PATCH] Introduce the required deprecation mesages for the renamed
interfaces in the volume variables. Sorry for the delay. reviewed by Bernd
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12248 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../implicit/mpnc/energy/mpncvolumevariablesenergy.hh | 10 +++++++---
.../mpnc/energy/mpncvolumevariablesenergykinetic.hh | 8 ++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh b/dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh
index aed4f0f646..450eafcebd 100644
--- a/dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh
+++ b/dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh
@@ -211,21 +211,25 @@ public:
* the sub-control volume.
*/
Scalar heatCapacity() const
- { return heatCapacity_; };
+ { return heatCapacity_; }
/*!
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m*K)]}\f$ of the fluid phase in
* the sub-control volume.
*/
Scalar thermalConductivity(const unsigned int phaseIdx) const
- { return thermalConductivity_[phaseIdx] ; };
+ { return thermalConductivity_[phaseIdx] ; }
/*!
* \brief Returns the total density of the given solid phase [kg / m^3] in
* the sub-control volume.
*/
Scalar densitySolid() const
- { return densitySolid_; };
+ { return densitySolid_; }
+
+ DUNE_DEPRECATED_MSG("use densitySolid() instead")
+ Scalar soilDensity() const
+ { return densitySolid(); }
/*!
* \brief If running under valgrind this produces an error message
diff --git a/dumux/implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh b/dumux/implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh
index afb05bfdd0..69540b4369 100644
--- a/dumux/implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh
+++ b/dumux/implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh
@@ -182,6 +182,10 @@ public:
Scalar densitySolid() const
{ return densitySolid_; }
+ DUNE_DEPRECATED_MSG("use densitySolid() instead")
+ Scalar soilDensity() const
+ { return densitySolid(); }
+
/*!
* \brief Returns the conductivity of the given solid phase [kg / m^3] in
* the sub-control volume.
@@ -189,6 +193,10 @@ public:
Scalar thermalConductivitySolid() const
{ return thermalConductivitySolid_; }
+ DUNE_DEPRECATED_MSG("use thermalConductivitySolid() instead")
+ Scalar soilThermalConductivity() const
+ { return thermalConductivitySolid(); }
+
/*!
* \brief Returns the conductivity of the given fluid [kg / m^3] in
* the sub-control volume.
--
GitLab