From 69fb28059eddcecca302ed87991982b4bc157038 Mon Sep 17 00:00:00 2001
From: Philipp Nuske <philipp.nuske@mailbox.org>
Date: Thu, 19 Sep 2013 13:06:05 +0000
Subject: [PATCH] cleanup: - removed old unsused functions - renamed
NumPrimaryVars to numPrimaryVars
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11506 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../mpnc/energy/mpncindicesenergykinetic.hh | 10 +++++--
dumux/implicit/mpnc/mpncvolumevariablesia.hh | 28 -------------------
2 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/dumux/implicit/mpnc/energy/mpncindicesenergykinetic.hh b/dumux/implicit/mpnc/energy/mpncindicesenergykinetic.hh
index 4f1f619fce..7163ccfebf 100644
--- a/dumux/implicit/mpnc/energy/mpncindicesenergykinetic.hh
+++ b/dumux/implicit/mpnc/energy/mpncindicesenergykinetic.hh
@@ -74,7 +74,10 @@ public:
/*!
* \brief This module defines one new primary variable.
*/
- static const unsigned int NumPrimaryVars = 1;
+ static const unsigned int numPrimaryVars = 1;
+
+ DUNE_DEPRECATED_MSG("use numPrimaryVars (uncapitalized 'n') instead")
+ static const unsigned int NumPrimaryVars = numPrimaryVars; //!< \deprecated
/*!
* \brief Index for the temperature in a vector of primary
@@ -100,7 +103,10 @@ public:
* \brief This module does not define any primary variables in the
* isothermal case.
*/
- static const unsigned int NumPrimaryVars = 0;
+ static const unsigned int numPrimaryVars = 0;
+
+ DUNE_DEPRECATED_MSG("use numPrimaryVars (uncapitalized 'n') instead")
+ static const unsigned int NumPrimaryVars = numPrimaryVars; //!< \deprecated
/*!
* \brief Equation index of the temperature primary variable. This
diff --git a/dumux/implicit/mpnc/mpncvolumevariablesia.hh b/dumux/implicit/mpnc/mpncvolumevariablesia.hh
index 6341f6dab5..c49ef0d7db 100644
--- a/dumux/implicit/mpnc/mpncvolumevariablesia.hh
+++ b/dumux/implicit/mpnc/mpncvolumevariablesia.hh
@@ -91,34 +91,6 @@ public:
*/
void checkDefined() const
{ }
-
- /*!
- * \brief Check the set variables as to whether they are in physically possible ranges.
- *
- * \param fluidState Container for all the secondary variables concerning the fluids
- * \param globalPos The position at which the check is conducted
- *
- * Since we are in equilibrium, we don't need to do anything!
- */
- bool physicalness(const FluidState & fluidState,
- const GlobalPosition & globalPos)
- {
- return true; // all the checks went through: tell calling function, nothing bad could be found.
- }
-
- /*!
- * \brief Output for the case that the current state is not physical.
- * This calls the output functions of the modules and throws and exception:
- * i.e. a smaller timestep is tried.
- *
- * Since we are in equilibrium, we don't need to do anything!
- *
- * \param fs Container for all the secondary variables concerning the fluids
- * \param message A string returning the error message for this module
- */
- const void physicalnessError(const FluidState & fs,
- std::stringstream & message)
- { }
};
} // namespace Dumux
--
GitLab