diff --git a/CHANGELOG b/CHANGELOG
index fac81d994052ab707405a3af86509aede25bb4d9..aad3543f41d0f609ff433f88b7abf9df68e5e637 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -44,6 +44,9 @@ Differences Between DuMuX 2.1 and DuMuX 2.2
- DUMUX_UNUSED is deprecated and will be removed after 2.2. It should be replaced
by the upstream version DUNE_UNUSED.
+
+ - DUMUX_DEPRECATED_MSG is deprecated and will be removed after 2.2. It should be
+ replaced by the upstream version DUNE_DEPRECATED_MSG.
* Deprecated PROPERTY NAMES, to be removed after 2.2: BEWARE: The compiler will not
print any warning if a deprecated property name is used.
@@ -122,6 +125,8 @@ Differences Between DuMuX 2.1 and DuMuX 2.2
IMPETProblem2P2C(..., SpatialParameters&, ...) replaced by IMPETProblem2P2C(TimeManager&, ...),
initSat(const GlobalPosition&, const Element&) replaced by initSat(const Element&)
initConcentration(const GlobalPosition&, const Element&) replaced by initConcentration(const Element&)
+
+ - DUMUX_DEPRECATED has been removed.
Notable Differences Between DuMuX 2.0 and DuMuX 2.1
diff --git a/dumux/boxmodels/1p/1pproblem.hh b/dumux/boxmodels/1p/1pproblem.hh
index 9575e1393386607297b38a0ab4df5f8e1c24cfa0..99b17e520c28a5b3d490dbd148394cc40c93f503 100644
--- a/dumux/boxmodels/1p/1pproblem.hh
+++ b/dumux/boxmodels/1p/1pproblem.hh
@@ -57,7 +57,7 @@ public:
* \param gridView The grid view
* \param verbose Turn verbosity on or off
*/
- DUMUX_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
+ DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
OnePBoxProblem(TimeManager &timeManager,
const GridView &gridView,
bool verbose = true)
@@ -72,7 +72,7 @@ public:
* \param spatialParams The spatial parameters object
* \param verbose Turn verbosity on or off
*/
- DUMUX_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
+ DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
OnePBoxProblem(TimeManager &timeManager,
const GridView &gridView,
SpatialParams &spatialParams,
diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
index 376b88bfcd888a83c04fc090513480016fbc79ad..16f8ffdb5c29ded649489cce1c50bd64b83cdb70 100644
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
@@ -174,7 +174,7 @@ public:
*
* \param compIdx The index of the considered component
*/
- DUMUX_DEPRECATED_MSG("use moleFractionGrad instead")
+ DUNE_DEPRECATED_MSG("use moleFractionGrad instead")
const DimVector &concentrationGrad(int compIdx) const
{
if (compIdx != 1)
@@ -205,7 +205,7 @@ public:
*
* \param compIdx The index of the considered component
*/
- DUMUX_DEPRECATED_MSG("use moleFractionGrad instead")
+ DUNE_DEPRECATED_MSG("use moleFractionGrad instead")
const DimVector &moleFracGrad(int compIdx) const
{
if (compIdx != 1)
@@ -221,7 +221,7 @@ public:
*
* \param compIdx The index of the considered component
*/
- DUMUX_DEPRECATED_MSG("use moleFractionGrad instead")
+ DUNE_DEPRECATED_MSG("use moleFractionGrad instead")
const DimVector &massFracGrad(int compIdx) const
{
if (compIdx != 1)
@@ -252,7 +252,7 @@ public:
* \brief Return viscosity \f$\mathrm{[Pa s]}\f$ of a phase at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use viscosity() instead")
+ DUNE_DEPRECATED_MSG("use viscosity() instead")
Scalar viscosityAtIP() const
{ return viscosity();}
@@ -267,7 +267,7 @@ public:
* \brief Return molar density \f$\mathrm{[mol/m^3]}\f$ of a phase at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use molarDensity() instead")
+ DUNE_DEPRECATED_MSG("use molarDensity() instead")
Scalar molarDensityAtIP() const
{ return molarDensity(); }
@@ -282,7 +282,7 @@ public:
* \brief Return density \f$\mathrm{[kg/m^3]}\f$ of a phase at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use density( instead")
+ DUNE_DEPRECATED_MSG("use density( instead")
Scalar densityAtIP() const
{ return density(); }
diff --git a/dumux/boxmodels/1p2c/1p2cproblem.hh b/dumux/boxmodels/1p2c/1p2cproblem.hh
index 1e7f73ecdee5b7b7c96f733a4eb83ee39d49e916..0fd435fdf75e7e853d294a474ad6c9a358cdde55 100644
--- a/dumux/boxmodels/1p2c/1p2cproblem.hh
+++ b/dumux/boxmodels/1p2c/1p2cproblem.hh
@@ -59,7 +59,7 @@ public:
* \param gridView The grid view
* \param verbose Turn verbosity on or off
*/
- DUMUX_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
+ DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
OnePTwoCBoxProblem(TimeManager &timeManager,
const GridView &gridView,
const bool verbose = true)
@@ -74,7 +74,7 @@ public:
* \param spatialParams The spatial parameters object
* \param verbose Turn verbosity on or off
*/
- DUMUX_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
+ DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
OnePTwoCBoxProblem(TimeManager &timeManager,
const GridView &gridView,
SpatialParams &spatialParams,
diff --git a/dumux/boxmodels/2p/2pproblem.hh b/dumux/boxmodels/2p/2pproblem.hh
index aae3e900e193f4f86e2ec2310bf3761537afe2de..0df5549791d8f7408fdd0e633b3fc7f5f86aff3c 100644
--- a/dumux/boxmodels/2p/2pproblem.hh
+++ b/dumux/boxmodels/2p/2pproblem.hh
@@ -56,7 +56,7 @@ public:
* \param gridView The grid view
* \param verbose Turn verbosity on or off
*/
- DUMUX_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
+ DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
TwoPProblem(TimeManager &timeManager,
const GridView &gridView,
bool verbose = true)
diff --git a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
index 19dff42435bba41e23255697ac00ce43689f5318..9288b1e2da65c216eb4cd0779a4a4b29d6322768 100644
--- a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
@@ -346,7 +346,7 @@ public:
* \brief Return density \f$\mathrm{[kg/m^3]}\f$ of a phase at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use density instead")
+ DUNE_DEPRECATED_MSG("use density instead")
Scalar densityAtIP(int phaseIdx) const
{ return density(phaseIdx); }
@@ -360,7 +360,7 @@ public:
* \brief Return molar density \f$\mathrm{[mol/m^3]}\f$ of a phase at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use molarDensity instead")
+ DUNE_DEPRECATED_MSG("use molarDensity instead")
Scalar molarDensityAtIP(int phaseIdx) const
{ return molarDensity(phaseIdx); }
@@ -373,21 +373,21 @@ public:
/*!
* \brief The concentration gradient of a component in a phase.
*/
- DUMUX_DEPRECATED_MSG("use massFractionGrad instead")
+ DUNE_DEPRECATED_MSG("use massFractionGrad instead")
const DimVector &concentrationGrad(int phaseIdx) const
{ return massFractionGrad(phaseIdx); };
/*!
* \brief The mass fraction gradient of the dissolved component in a phase.
*/
- DUMUX_DEPRECATED_MSG("use moleFractionGrad instead")
+ DUNE_DEPRECATED_MSG("use moleFractionGrad instead")
const DimVector &massFractionGrad(int phaseIdx) const
{ return massFractionGrad_[phaseIdx]; };
/*!
* \brief The molar concentration gradient of a component in a phase.
*/
- DUMUX_DEPRECATED_MSG("use moleFractionGrad instead")
+ DUNE_DEPRECATED_MSG("use moleFractionGrad instead")
const DimVector &molarConcGrad(int phaseIdx) const
{ return moleFractionGrad(phaseIdx); };
diff --git a/dumux/boxmodels/2p2c/2p2cindices.hh b/dumux/boxmodels/2p2c/2p2cindices.hh
index 9f16c4b01091cc2545a94396be98cd089b3a2085..e7e85ad677c9d26de8dbbe850880f886dcfe6a29 100644
--- a/dumux/boxmodels/2p2c/2p2cindices.hh
+++ b/dumux/boxmodels/2p2c/2p2cindices.hh
@@ -71,23 +71,23 @@ public:
static const int wPhaseIdx = FluidSystem::wPhaseIdx; //!< Index of the wetting phase
static const int nPhaseIdx = FluidSystem::nPhaseIdx; //!< Index of the non-wetting phase
- static const int DUMUX_DEPRECATED_MSG("use wPhaseIdx instead") lPhaseIdx = wPhaseIdx; //!< Index of the liquid phase
- static const int DUMUX_DEPRECATED_MSG("use nPhaseIdx instead") gPhaseIdx = nPhaseIdx; //!< Index of the gas phase
+ static const int DUNE_DEPRECATED_MSG("use wPhaseIdx instead") lPhaseIdx = wPhaseIdx; //!< Index of the liquid phase
+ static const int DUNE_DEPRECATED_MSG("use nPhaseIdx instead") gPhaseIdx = nPhaseIdx; //!< Index of the gas phase
// Component indices
static const int wCompIdx = FluidSystem::wCompIdx; //!< Index of the primary component of the wetting phase
static const int nCompIdx = FluidSystem::nCompIdx; //!< Index of the primary component of the non-wetting phase
- static const int DUMUX_DEPRECATED_MSG("use wCompIdx instead") lCompIdx = wCompIdx; //!< Index of the liquid's primary component
- static const int DUMUX_DEPRECATED_MSG("use nCompIdx instead") gCompIdx = nCompIdx; //!< Index of the gas' primary component
+ static const int DUNE_DEPRECATED_MSG("use wCompIdx instead") lCompIdx = wCompIdx; //!< Index of the liquid's primary component
+ static const int DUNE_DEPRECATED_MSG("use nCompIdx instead") gCompIdx = nCompIdx; //!< Index of the gas' primary component
// present phases (-> 'pseudo' primary variable)
static const int wPhaseOnly = 1; //!< Only the wetting phase is present
static const int nPhaseOnly = 0; //!< Only the non-wetting phase is present
static const int bothPhases = 2; //!< Both phases are present
- static const int DUMUX_DEPRECATED_MSG("use wPhaseOnly instead") lPhaseOnly = wPhaseOnly; //!< Only the wetting phase is present
- static const int DUMUX_DEPRECATED_MSG("use nPhaseOnly instead") gPhaseOnly = nPhaseOnly; //!< Only the non-wetting phase is present
+ static const int DUNE_DEPRECATED_MSG("use wPhaseOnly instead") lPhaseOnly = wPhaseOnly; //!< Only the wetting phase is present
+ static const int DUNE_DEPRECATED_MSG("use nPhaseOnly instead") gPhaseOnly = nPhaseOnly; //!< Only the non-wetting phase is present
// Primary variable indices
static const int pressureIdx = PVOffset + 0; //!< Index for wetting/non-wetting phase pressure (depending on formulation) in a solution vector
@@ -96,15 +96,15 @@ public:
static const int pwIdx = pressureIdx; //!< Index for wetting phase pressure in a solution vector
static const int SnOrXIdx = switchIdx; //!< Index of the either the saturation of the non-wetting phase or the mass fraction secondary component in the only phase
- static const int DUMUX_DEPRECATED_MSG("use pwIdx instead") plIdx = pwIdx; //!< Index for liquid phase pressure in a solution vector
- static const int DUMUX_DEPRECATED_MSG("use SnOrXIdx instead") SgOrXIdx = SnOrXIdx; //!< Index of the either the saturation of the gas phase or the mass fraction of the secondary component in the only phase
+ static const int DUNE_DEPRECATED_MSG("use pwIdx instead") plIdx = pwIdx; //!< Index for liquid phase pressure in a solution vector
+ static const int DUNE_DEPRECATED_MSG("use SnOrXIdx instead") SgOrXIdx = SnOrXIdx; //!< Index of the either the saturation of the gas phase or the mass fraction of the secondary component in the only phase
// equation indices
static const int conti0EqIdx = PVOffset; //!< Index of the mass conservation equation for the first component
static const int contiWEqIdx = conti0EqIdx + wCompIdx; //!< Index of the mass conservation equation for the liquid's primary component
static const int contiNEqIdx = conti0EqIdx + nCompIdx; //!< Index of the mass conservation equation for the gas' primary component
- static const int DUMUX_DEPRECATED_MSG("use contiWEqIdx instead") contiLEqIdx = contiWEqIdx; //!< Index of the mass conservation equation for the liquid's primary component
- static const int DUMUX_DEPRECATED_MSG("use contiNEqIdx instead") contiGEqIdx = contiNEqIdx; //!< Index of the mass conservation equation for the gas' primary component
+ static const int DUNE_DEPRECATED_MSG("use contiWEqIdx instead") contiLEqIdx = contiWEqIdx; //!< Index of the mass conservation equation for the liquid's primary component
+ static const int DUNE_DEPRECATED_MSG("use contiNEqIdx instead") contiGEqIdx = contiNEqIdx; //!< Index of the mass conservation equation for the gas' primary component
};
/*!
@@ -123,23 +123,23 @@ public:
static const int wPhaseIdx = FluidSystem::wPhaseIdx; //!< Index of the wetting phase
static const int nPhaseIdx = FluidSystem::nPhaseIdx; //!< Index of the non-wetting phase
- static const int DUMUX_DEPRECATED_MSG("use wPhaseIdx instead") lPhaseIdx = wPhaseIdx; //!< Index of the liquid phase
- static const int DUMUX_DEPRECATED_MSG("use nPhaseIdx instead") gPhaseIdx = nPhaseIdx; //!< Index of the gas phase
+ static const int DUNE_DEPRECATED_MSG("use wPhaseIdx instead") lPhaseIdx = wPhaseIdx; //!< Index of the liquid phase
+ static const int DUNE_DEPRECATED_MSG("use nPhaseIdx instead") gPhaseIdx = nPhaseIdx; //!< Index of the gas phase
// Component indices
static const int wCompIdx = FluidSystem::wCompIdx; //!< Index of the primary component of the wetting phase
static const int nCompIdx = FluidSystem::nCompIdx; //!< Index of the primary component of the non-wetting phase
- static const int DUMUX_DEPRECATED_MSG("use wCompIdx instead") lCompIdx = wCompIdx; //!< Index of the liquid's primary component
- static const int DUMUX_DEPRECATED_MSG("use nCompIdx instead") gCompIdx = nCompIdx; //!< Index of the gas' primary component
+ static const int DUNE_DEPRECATED_MSG("use wCompIdx instead") lCompIdx = wCompIdx; //!< Index of the liquid's primary component
+ static const int DUNE_DEPRECATED_MSG("use nCompIdx instead") gCompIdx = nCompIdx; //!< Index of the gas' primary component
// present phases (-> 'pseudo' primary variable)
static const int wPhaseOnly = 1; //!< Only the wetting phase is present
static const int nPhaseOnly = 2; //!< Only the non-wetting phase is present
static const int bothPhases = 3; //!< Both phases are present
- static const int DUMUX_DEPRECATED_MSG("use wPhaseOnly instead") lPhaseOnly = wPhaseOnly; //!< Only the wetting phase is present
- static const int DUMUX_DEPRECATED_MSG("use nPhaseOnly instead") gPhaseOnly = nPhaseOnly; //!< Only the non-wetting phase is present
+ static const int DUNE_DEPRECATED_MSG("use wPhaseOnly instead") lPhaseOnly = wPhaseOnly; //!< Only the wetting phase is present
+ static const int DUNE_DEPRECATED_MSG("use nPhaseOnly instead") gPhaseOnly = nPhaseOnly; //!< Only the non-wetting phase is present
// Primary variable indices
static const int pressureIdx = PVOffset + 0; //!< Index for wetting/non-wetting phase pressure (depending on formulation) in a solution vector
@@ -148,15 +148,15 @@ public:
static const int pnIdx = pressureIdx; //!< Index for non-wetting phase pressure in a solution vector
static const int SwOrXIdx = switchIdx; //!< Index of the either the saturation of the liquid phase or the mass fraction of the secondary component in the only phase
- static const int DUMUX_DEPRECATED_MSG("use pnIdx instead") pgIdx = pnIdx; //!< Index for gas phase pressure in a solution vector
- static const int DUMUX_DEPRECATED_MSG("use SwOrXIdx instead") SlOrXIdx = SwOrXIdx; //!< Index of the either the saturation of the liquid phase or the mass fraction secondary component in the only phase
+ static const int DUNE_DEPRECATED_MSG("use pnIdx instead") pgIdx = pnIdx; //!< Index for gas phase pressure in a solution vector
+ static const int DUNE_DEPRECATED_MSG("use SwOrXIdx instead") SlOrXIdx = SwOrXIdx; //!< Index of the either the saturation of the liquid phase or the mass fraction secondary component in the only phase
// Equation indices
static const int conti0EqIdx = PVOffset; //!< Index of the mass conservation equation for the first component
static const int contiWEqIdx = conti0EqIdx + wCompIdx; //!< Index of the mass conservation equation for the liquid's primary component
static const int contiNEqIdx = conti0EqIdx + nCompIdx; //!< Index of the mass conservation equation for the gas' primary component
- static const int DUMUX_DEPRECATED_MSG("use contiWEqIdx instead") contiLEqIdx = contiWEqIdx; //!< Index of the mass conservation equation for the liquid's primary component
- static const int DUMUX_DEPRECATED_MSG("use contiNEqIdx instead") contiGEqIdx = contiNEqIdx; //!< Index of the mass conservation equation for the gas' primary component
+ static const int DUNE_DEPRECATED_MSG("use contiWEqIdx instead") contiLEqIdx = contiWEqIdx; //!< Index of the mass conservation equation for the liquid's primary component
+ static const int DUNE_DEPRECATED_MSG("use contiNEqIdx instead") contiGEqIdx = contiNEqIdx; //!< Index of the mass conservation equation for the gas' primary component
};
// \}
diff --git a/dumux/boxmodels/2p2c/2p2cproblem.hh b/dumux/boxmodels/2p2c/2p2cproblem.hh
index 988ddd7151ef49865212a1a2d53f232cbfb3d91a..558e01fcd421b513764be26af84de8425587693a 100644
--- a/dumux/boxmodels/2p2c/2p2cproblem.hh
+++ b/dumux/boxmodels/2p2c/2p2cproblem.hh
@@ -57,7 +57,7 @@ public:
* \param gridView The grid view
* \param verbose Turn verbosity on or off
*/
- DUMUX_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
+ DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
TwoPTwoCProblem(TimeManager &timeManager,
const GridView &gridView,
bool verbose = true)
diff --git a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
index bb551a9b45b93ee9018c9ca33b0e1450dca516d8..70e8357fd9cfef1c41b9886da6fd8fbc4cba1eac 100644
--- a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
+++ b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
@@ -404,7 +404,7 @@ public:
* \brief Return density \f$\mathrm{[kg/m^3]}\f$ of a phase at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use density instead")
+ DUNE_DEPRECATED_MSG("use density instead")
Scalar densityAtIP(int phaseIdx) const
{
density(phaseIdx);
@@ -420,7 +420,7 @@ public:
* \brief Return molar density \f$\mathrm{[mol/m^3]}\f$ of a phase at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use molarDensity instead")
+ DUNE_DEPRECATED_MSG("use molarDensity instead")
Scalar molarDensityAtIP(int phaseIdx) const
{
molarDensity(phaseIdx);
@@ -434,21 +434,21 @@ public:
/*!
* \brief The mass fraction gradients of the components in a phase.
*/
- DUMUX_DEPRECATED_MSG("use massFractionCompWGrad instead")
+ DUNE_DEPRECATED_MSG("use massFractionCompWGrad instead")
const DimVector &wConcentrationGrad(int phaseIdx) const
{ massFractionCompWGrad(phaseIdx); };
const DimVector &massFractionCompWGrad(int phaseIdx) const
{return massFractionCompWGrad_[phaseIdx];}
- DUMUX_DEPRECATED_MSG("use massFractionCompNGrad instead")
+ DUNE_DEPRECATED_MSG("use massFractionCompNGrad instead")
const DimVector &cConcentrationGrad(int phaseIdx) const
{ massFractionCompNGrad(phaseIdx); };
const DimVector &massFractionCompNGrad(int phaseIdx) const
{ return massFractionCompNGrad_[phaseIdx]; };
- DUMUX_DEPRECATED_MSG("use massFractionCompGGrad instead")
+ DUNE_DEPRECATED_MSG("use massFractionCompGGrad instead")
const DimVector &aConcentrationGrad(int phaseIdx) const
{ massFractionCompGGrad(phaseIdx); };
@@ -459,21 +459,21 @@ public:
/*!
* \brief The molar concentration gradients of the components in a phase.
*/
- DUMUX_DEPRECATED_MSG("use moleFractionCompWGrad instead")
+ DUNE_DEPRECATED_MSG("use moleFractionCompWGrad instead")
const DimVector &molarWConcGrad(int phaseIdx) const
{ moleFractionCompWGrad(phaseIdx); };
const DimVector &moleFractionCompWGrad(int phaseIdx) const
{ return moleFractionCompWGrad_[phaseIdx]; };
- DUMUX_DEPRECATED_MSG("use moleFractionCompNGrad instead")
+ DUNE_DEPRECATED_MSG("use moleFractionCompNGrad instead")
const DimVector &molarCConcGrad(int phaseIdx) const
{ moleFractionCompNGrad(phaseIdx); };
const DimVector &moleFractionCompNGrad(int phaseIdx) const
{ return moleFractionCompNGrad_[phaseIdx]; };
- DUMUX_DEPRECATED_MSG("use moleFractionCompGGrad instead")
+ DUNE_DEPRECATED_MSG("use moleFractionCompGGrad instead")
const DimVector &molarAConcGrad(int phaseIdx) const
{ moleFractionCompGGrad(phaseIdx); };
diff --git a/dumux/boxmodels/3p3c/3p3cproblem.hh b/dumux/boxmodels/3p3c/3p3cproblem.hh
index 75c250f1f98c51d02acdf0eee853c8cf3091a19f..b2c28ba7f066a1abacbda7592767c0bccfce09f6 100644
--- a/dumux/boxmodels/3p3c/3p3cproblem.hh
+++ b/dumux/boxmodels/3p3c/3p3cproblem.hh
@@ -58,7 +58,7 @@ public:
* \param gridView The grid view
* \param verbose Turn verbosity on or off
*/
- DUMUX_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
+ DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
ThreePThreeCProblem(TimeManager &timeManager,
const GridView &gridView,
bool verbose = true)
diff --git a/dumux/boxmodels/common/boxelementboundarytypes.hh b/dumux/boxmodels/common/boxelementboundarytypes.hh
index 9897d96fe799f9c113e84f8520e06303c3a90d8d..bbd6e48b9be8000b0e7a04698d0982fce5d5ca9a 100644
--- a/dumux/boxmodels/common/boxelementboundarytypes.hh
+++ b/dumux/boxmodels/common/boxelementboundarytypes.hh
@@ -115,7 +115,7 @@ public:
* types should be collected
* \param fvGeometry The element's finite volume geometry
*/
- //DUMUX_DEPRECATED_MSG("use update(problem, element) instead")
+ //DUNE_DEPRECATED_MSG("use update(problem, element) instead")
void update(const Problem &problem,
const Element &element,
const FVElementGeometry &fvGeometry)
diff --git a/dumux/boxmodels/common/boxlocaljacobian.hh b/dumux/boxmodels/common/boxlocaljacobian.hh
index c7b743406c4cf1d896314de5fd8f2eccfa2ceddd..2953098ac84fa7fdd47d8d79713ea16948dd71b5 100644
--- a/dumux/boxmodels/common/boxlocaljacobian.hh
+++ b/dumux/boxmodels/common/boxlocaljacobian.hh
@@ -312,7 +312,7 @@ protected:
/*!
* \brief Returns a reference to the element.
*/
- DUMUX_DEPRECATED_MSG("use element_() instead")
+ DUNE_DEPRECATED_MSG("use element_() instead")
const Element &elem_() const
{
Valgrind::CheckDefined(elemPtr_);
diff --git a/dumux/boxmodels/common/boxlocalresidual.hh b/dumux/boxmodels/common/boxlocalresidual.hh
index 9757cd7dde6b9fea72dedc820cdca5fef1e5f0cb..64de569039c0abcee86dda52beef675172e730fe 100644
--- a/dumux/boxmodels/common/boxlocalresidual.hh
+++ b/dumux/boxmodels/common/boxlocalresidual.hh
@@ -631,7 +631,7 @@ protected:
/*!
* \brief Returns a reference to the current element.
*/
- DUMUX_DEPRECATED_MSG("use element_ instead")
+ DUNE_DEPRECATED_MSG("use element_ instead")
const Element &elem_() const
{ return element_();}
@@ -649,7 +649,7 @@ protected:
* \brief Returns a reference to the current element's finite
* volume geometry.
*/
- DUMUX_DEPRECATED_MSG("use fvGeometry_ instead")
+ DUNE_DEPRECATED_MSG("use fvGeometry_ instead")
const FVElementGeometry &fvElemGeom_() const
{ return fvGeometry_(); }
@@ -668,7 +668,7 @@ protected:
* the last time step of the i'th
* sub-control volume of the current element.
*/
- DUMUX_DEPRECATED_MSG("use prevPriVars_ instead")
+ DUNE_DEPRECATED_MSG("use prevPriVars_ instead")
const PrimaryVariables &prevPrimaryVars_(const int i) const
{
return prevPriVars_(i);
@@ -687,7 +687,7 @@ protected:
* \brief Returns a reference to the primary variables of the i'th
* sub-control volume of the current element.
*/
- DUMUX_DEPRECATED_MSG("use curPriVars_ instead")
+ DUNE_DEPRECATED_MSG("use curPriVars_ instead")
const PrimaryVariables &curPrimaryVars_(const int i) const
{
return curPriVars_(i);
@@ -706,7 +706,7 @@ protected:
* \brief Returns the j'th primary of the i'th sub-control volume
* of the current element.
*/
- DUMUX_DEPRECATED_MSG("use curPriVar_ instead")
+ DUNE_DEPRECATED_MSG("use curPriVar_ instead")
Scalar curPrimaryVar_(const int i, const int j) const
{
return curPriVar_(i, j);
diff --git a/dumux/boxmodels/common/boxvolumevariables.hh b/dumux/boxmodels/common/boxvolumevariables.hh
index c45e270c3768e4418b3163949bb1ab336bf67038..b11d1223e296c72eb1cf1cd62a43ac972fa4e07a 100644
--- a/dumux/boxmodels/common/boxvolumevariables.hh
+++ b/dumux/boxmodels/common/boxvolumevariables.hh
@@ -142,7 +142,7 @@ public:
/*!
* \brief Return the vector of primary variables
*/
- DUMUX_DEPRECATED_MSG("use priVars instead")
+ DUNE_DEPRECATED_MSG("use priVars instead")
const PrimaryVariables &primaryVars() const
{ return priVars(); }
@@ -161,7 +161,7 @@ public:
*
* \param pvIdx The index of the primary variable of interest
*/
- DUMUX_DEPRECATED_MSG("use priVar instead")
+ DUNE_DEPRECATED_MSG("use priVar instead")
Scalar primaryVar(const int pvIdx) const
{
return priVar(pvIdx);
diff --git a/dumux/boxmodels/common/porousmediaboxproblem.hh b/dumux/boxmodels/common/porousmediaboxproblem.hh
index ed843de64092e5d5d6dca783fa113fb2dddfc297..79eb3e2aaf494649a9ba0651920112ed2aad79d9 100644
--- a/dumux/boxmodels/common/porousmediaboxproblem.hh
+++ b/dumux/boxmodels/common/porousmediaboxproblem.hh
@@ -172,7 +172,7 @@ public:
SpatialParams &spatialParams()
{ return *spatialParams_; }
- DUMUX_DEPRECATED_MSG("use spatialParams instead")
+ DUNE_DEPRECATED_MSG("use spatialParams instead")
SpatialParams &spatialParameters()
{ return spatialParams(); }
@@ -182,7 +182,7 @@ public:
const SpatialParams &spatialParams() const
{ return *spatialParams_; }
- DUMUX_DEPRECATED_MSG("use spatialParams instead")
+ DUNE_DEPRECATED_MSG("use spatialParams instead")
const SpatialParams &spatialParameters() const
{ return spatialParams(); }
diff --git a/dumux/boxmodels/mpnc/diffusion/fluxvariables.hh b/dumux/boxmodels/mpnc/diffusion/fluxvariables.hh
index 5b4b5332c053ca217dac5d0e5f714019bbdb0f23..63a730c9a92c913b84ab34f41aab62c4c5a118f6 100644
--- a/dumux/boxmodels/mpnc/diffusion/fluxvariables.hh
+++ b/dumux/boxmodels/mpnc/diffusion/fluxvariables.hh
@@ -175,7 +175,7 @@ public:
const unsigned int compIdx) const
{ return moleFraction_[phaseIdx][compIdx]; }
- DUMUX_DEPRECATED_MSG("use moleFraction() instead")
+ DUNE_DEPRECATED_MSG("use moleFraction() instead")
Scalar moleFrac(const unsigned int phaseIdx,
const unsigned int compIdx) const
{ return moleFraction(phaseIdx, compIdx);}
@@ -184,7 +184,7 @@ public:
const unsigned int compIdx) const
{ return moleFractionGrad_[phaseIdx][compIdx];}
- DUMUX_DEPRECATED_MSG("use moleFractionGrad() instead")
+ DUNE_DEPRECATED_MSG("use moleFractionGrad() instead")
const DimVector &moleFracGrad(const unsigned int phaseIdx,
const unsigned int compIdx) const
{ return moleFractionGrad(phaseIdx, compIdx);}
diff --git a/dumux/boxmodels/mpnc/mpncfluxvariables.hh b/dumux/boxmodels/mpnc/mpncfluxvariables.hh
index a8cb00920f42a3bafea50c0adb9a8167dec31696..a6cdd056600edbc03299661b2420ec831d7de717 100644
--- a/dumux/boxmodels/mpnc/mpncfluxvariables.hh
+++ b/dumux/boxmodels/mpnc/mpncfluxvariables.hh
@@ -207,7 +207,7 @@ public:
const unsigned int compIdx) const
{ return fluxVarsDiffusion_.moleFraction(phaseIdx, compIdx); }
- DUMUX_DEPRECATED_MSG("use moleFraction() instead")
+ DUNE_DEPRECATED_MSG("use moleFraction() instead")
const Scalar moleFrac(const unsigned int phaseIdx,
const unsigned int compIdx) const
{ return fluxVarsDiffusion_.moleFraction(phaseIdx, compIdx); }
@@ -217,7 +217,7 @@ public:
const unsigned int compIdx) const
{ return fluxVarsDiffusion_.moleFractionGrad(phaseIdx, compIdx); }
- DUMUX_DEPRECATED_MSG("use moleFraction() instead")
+ DUNE_DEPRECATED_MSG("use moleFraction() instead")
const DimVector &moleFracGrad(const unsigned int phaseIdx,
const unsigned int compIdx) const
{ return fluxVarsDiffusion_.moleFractionGrad(phaseIdx, compIdx); }
@@ -229,7 +229,7 @@ public:
const DimVector &temperatureGrad() const
{ return fluxVarsEnergy_.temperatureGrad(); };
- DUMUX_DEPRECATED_MSG("use fluxVariablesEnergy() instead")
+ DUNE_DEPRECATED_MSG("use fluxVariablesEnergy() instead")
const FluxVariablesEnergy &energyData() const
{ return fluxVarsEnergy() ; }
diff --git a/dumux/boxmodels/mpnc/mpncproblem.hh b/dumux/boxmodels/mpnc/mpncproblem.hh
index 8879d7348a1d5b077ef578866f3829fe1d81c665..a742ae315395409a435b566d1936f69baeac7eca 100644
--- a/dumux/boxmodels/mpnc/mpncproblem.hh
+++ b/dumux/boxmodels/mpnc/mpncproblem.hh
@@ -57,7 +57,7 @@ public:
* \param gridView The grid view
* \param verbose Turn verbosity on or off
*/
- DUMUX_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
+ DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
MPNCProblem(TimeManager &timeManager,
const GridView &gridView,
bool verbose = true)
diff --git a/dumux/common/deprecated.hh b/dumux/common/deprecated.hh
index 77573c0ca98650fef90c0a0f097b8c41e332d9fc..b5806b918dc6b7634f4cae933c41a79cf4fdf40a 100644
--- a/dumux/common/deprecated.hh
+++ b/dumux/common/deprecated.hh
@@ -25,25 +25,15 @@
*
* This file is a almost verbatim copy of Dune's dune/common/version.hh.
*
- * \todo Remove this file and the corresponding m4 macros as soon as
- * Dumux depends on Dune 2.2 or newer.
+ * \deprecated DUMUX_DEPRECATED_MSG is deprecated, use DUNE_DEPRECATED_MSG instead.
*/
#ifndef DUMUX_DEPRECATED_HH
#define DUMUX_DEPRECATED_HH
-#ifndef DUMUX_DEPRECATED
-#if defined(DOXYGEN) || !HAVE_ATTRIBUTE_DEPRECATED
-//! Mark some entity as deprecated
-#define DUMUX_DEPRECATED
-#else
-#define DUMUX_DEPRECATED __attribute__((deprecated))
-#endif
-#endif
-
#ifndef DUMUX_DEPRECATED_MSG
#if defined(DOXYGEN) || !HAVE_ATTRIBUTE_DEPRECATED_MSG
//! Mark some entity as deprecated
-#define DUMUX_DEPRECATED_MSG(text) DUMUX_DEPRECATED
+#define DUMUX_DEPRECATED_MSG(text) DUNE_DEPRECATED
#else
#define DUMUX_DEPRECATED_MSG(text) __attribute__((deprecated(text)))
#endif
diff --git a/dumux/common/propertysystem.hh b/dumux/common/propertysystem.hh
index 7fc94a173ee1fb7e2edc96e3b7d3b40bfb8c7039..bf578abaa6506fac2dc1fd538e6147437bab36de 100644
--- a/dumux/common/propertysystem.hh
+++ b/dumux/common/propertysystem.hh
@@ -108,7 +108,7 @@ namespace Properties
blubb = blubb; \
return 0; \
}; \
- static DUMUX_DEPRECATED_MSG(DeprecationMsg) int foo; \
+ static DUNE_DEPRECATED_MSG(DeprecationMsg) int foo; \
}; \
int PropertyInfo<TTAG(EffTypeTagName), PTAG_(PropTagName)>::foo = \
PropertyInfo<TTAG(EffTypeTagName), PTAG_(PropTagName)>::init();
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 1a708815fe467e402afb37fa885a8a0298376ca4..cca52857b259f54caa5ac61e37a977d06a4e81ef 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -56,7 +56,7 @@ NEW_PROP_TAG(TimeManager);
*
* \param progname The name of the executable
*/
-DUMUX_DEPRECATED_MSG("Not needed if Dumux::start() is used")
+DUNE_DEPRECATED_MSG("Not needed if Dumux::start() is used")
void printUsageDGF(const char *progname)
{
std::cout << "usage: " << progname << " [--restart restartTime] gridfile.dgf tEnd dt\n";
@@ -69,7 +69,7 @@ void printUsageDGF(const char *progname)
*
* \param progname The name of the executable
*/
-DUMUX_DEPRECATED_MSG("Not needed if Dumux::start() is used")
+DUNE_DEPRECATED_MSG("Not needed if Dumux::start() is used")
void printUsageGrid(const char *progname)
{
std::cout << "usage: " << progname << " [--restart restartTime] tEnd dt\n";
diff --git a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
index bb5a970c5ea7332e815a7e29bfde781bf0ba2c65..213be28f98a7e04d94c6fbeed21232e5ba299049 100644
--- a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
+++ b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
@@ -234,7 +234,7 @@ public:
return *spatialParams_;
}
- DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
+ DUNE_DEPRECATED_MSG("use spatialParams() method instead")
SpatialParams &spatialParameters()
{ return *spatialParams_; }
@@ -246,7 +246,7 @@ public:
return *spatialParams_;
}
- DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
+ DUNE_DEPRECATED_MSG("use spatialParams() method instead")
const SpatialParams &spatialParameters() const
{ return *spatialParams_; }
diff --git a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
index 316ee8548c1bc6f2328ec69c6e1f2266be751e27..37f3b8597294b1f646fe9a05788b0b2624d84695 100644
--- a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
+++ b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
@@ -228,7 +228,7 @@ public:
return *spatialParams_;
}
- DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
+ DUNE_DEPRECATED_MSG("use spatialParams() method instead")
SpatialParams &spatialParameters()
{ return *spatialParams_; }
@@ -240,7 +240,7 @@ public:
return *spatialParams_;
}
- DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
+ DUNE_DEPRECATED_MSG("use spatialParams() method instead")
const SpatialParams &spatialParameters() const
{ return *spatialParams_; }
diff --git a/dumux/decoupled/2p/impes/impesproblem2p.hh b/dumux/decoupled/2p/impes/impesproblem2p.hh
index 378e0f3cb2916cff9f5c554e8ed32fce8875bc8b..5b2f7f02bbe0dcc65a56e22d77fc7a7a521afc6d 100644
--- a/dumux/decoupled/2p/impes/impesproblem2p.hh
+++ b/dumux/decoupled/2p/impes/impesproblem2p.hh
@@ -189,7 +189,7 @@ public:
SpatialParams &spatialParams()
{ return *spatialParams_; }
- DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
+ DUNE_DEPRECATED_MSG("use spatialParams() method instead")
SpatialParams &spatialParameters()
{ return *spatialParams_; }
/*!
@@ -198,7 +198,7 @@ public:
const SpatialParams &spatialParams() const
{ return *spatialParams_; }
- DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
+ DUNE_DEPRECATED_MSG("use spatialParams() method instead")
const SpatialParams &spatialParameters() const
{ return *spatialParams_; }
diff --git a/dumux/decoupled/2p/transport/transportproblem2p.hh b/dumux/decoupled/2p/transport/transportproblem2p.hh
index 6ff25839ca2f8e97e75d4be8d72372ac428d6c19..9294b2411398463d9867fcc85442ffa660cba3af 100644
--- a/dumux/decoupled/2p/transport/transportproblem2p.hh
+++ b/dumux/decoupled/2p/transport/transportproblem2p.hh
@@ -209,7 +209,7 @@ public:
SpatialParams &spatialParams()
{ return *spatialParams_; }
- DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
+ DUNE_DEPRECATED_MSG("use spatialParams() method instead")
SpatialParams &spatialParameters()
{ return *spatialParams_; }
@@ -219,7 +219,7 @@ public:
const SpatialParams &spatialParams() const
{ return *spatialParams_; }
- DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
+ DUNE_DEPRECATED_MSG("use spatialParams() method instead")
const SpatialParams &spatialParameters() const
{ return *spatialParams_; }
diff --git a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
index 8ef6406e696534d16d4d157fbac221340456c905..a502989fd1d93c7bb66b675aa2cb45ad3ea0d7ca 100644
--- a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
@@ -45,7 +45,7 @@ template <class TypeTag>
class DecoupledTwoPTwoCFluidState : public TwoPTwoCFluidState<TypeTag>
{
public:
- DUMUX_DEPRECATED_MSG("use TwoPTwoCFluidState instead")
+ DUNE_DEPRECATED_MSG("use TwoPTwoCFluidState instead")
DecoupledTwoPTwoCFluidState() : TwoPTwoCFluidState<TypeTag>() {}
};
diff --git a/dumux/freeflow/stokes/stokesfluxvariables.hh b/dumux/freeflow/stokes/stokesfluxvariables.hh
index b329c8736009448cbc257637803881020bdeaa2b..a072788125373e4451b081c9a93b79e0ba8a8b88 100644
--- a/dumux/freeflow/stokes/stokesfluxvariables.hh
+++ b/dumux/freeflow/stokes/stokesfluxvariables.hh
@@ -194,7 +194,7 @@ public:
* \brief Return the pressure \f$\mathrm{[Pa]}\f$ at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use pressure() instead")
+ DUNE_DEPRECATED_MSG("use pressure() instead")
Scalar pressureAtIP() const
{ return pressure(); }
@@ -209,7 +209,7 @@ public:
* \brief Return the mass density \f$ \mathrm{[kg/m^3]} \f$ at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use density() instead")
+ DUNE_DEPRECATED_MSG("use density() instead")
Scalar densityAtIP() const
{ return density(); }
@@ -222,7 +222,7 @@ public:
/*!
* \brief Return the molar density \f$ \mathrm{[mol/m^3]} \f$ at the integration point.
*/
- DUMUX_DEPRECATED_MSG("use molarDensity() instead")
+ DUNE_DEPRECATED_MSG("use molarDensity() instead")
const Scalar molarDensityAtIP() const
{ return molarDensity(); }
@@ -237,7 +237,7 @@ public:
* \brief Return the dynamic viscosity \f$ \mathrm{[Pa s]} \f$ at the integration
* point.
*/
- DUMUX_DEPRECATED_MSG("use viscosity() instead")
+ DUNE_DEPRECATED_MSG("use viscosity() instead")
Scalar viscosityAtIP() const
{ return viscosity(); }
@@ -252,7 +252,7 @@ public:
* \brief Return the velocity \f$ \mathrm{[m/s]} \f$ at the integration
* point multiplied by the normal and the area.
*/
- DUMUX_DEPRECATED_MSG("use normalVelocity() instead")
+ DUNE_DEPRECATED_MSG("use normalVelocity() instead")
Scalar normalVelocityAtIP() const
{ return normalVelocity(); }
@@ -265,7 +265,7 @@ public:
/*!
* \brief Return the pressure gradient at the integration point.
*/
- DUMUX_DEPRECATED_MSG("use pressureGrad() instead")
+ DUNE_DEPRECATED_MSG("use pressureGrad() instead")
const DimVector &pressureGradAtIP() const
{ return pressureGrad(); }
@@ -278,7 +278,7 @@ public:
/*!
* \brief Return the velocity vector at the integration point.
*/
- DUMUX_DEPRECATED_MSG("use velocity() instead")
+ DUNE_DEPRECATED_MSG("use velocity() instead")
const DimVector &velocityAtIP() const
{ return velocity(); }
@@ -293,7 +293,7 @@ public:
* \brief Return the velocity gradient at the integration
* point of a face.
*/
- DUMUX_DEPRECATED_MSG("use velocityGrad() instead")
+ DUNE_DEPRECATED_MSG("use velocityGrad() instead")
const DimMatrix &velocityGradAtIP() const
{ return velocityGrad(); }
diff --git a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
index 80970b87fe175dab5c6fa674ee2cf1ec4564c00c..f2b9565b9cf8a58871329f124a082f5abbb8a53b 100644
--- a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
@@ -93,7 +93,7 @@ public:
/*!
* \brief Return the mass fraction at the integration point.
*/
- DUMUX_DEPRECATED_MSG("use massFraction() instead")
+ DUNE_DEPRECATED_MSG("use massFraction() instead")
Scalar massFractionAtIP() const
{ return massFraction(); }
@@ -106,7 +106,7 @@ public:
/*!
* \brief Return the molar diffusion coefficient at the integration point.
*/
- DUMUX_DEPRECATED_MSG("use diffusionCoeff() instead")
+ DUNE_DEPRECATED_MSG("use diffusionCoeff() instead")
Scalar diffusionCoeffAtIP() const
{ return diffusionCoeff(); }
@@ -119,7 +119,7 @@ public:
/*!
* \brief Return the gradient of the mole fraction at the integration point.
*/
- DUMUX_DEPRECATED_MSG("use moleFractionGrad() instead")
+ DUNE_DEPRECATED_MSG("use moleFractionGrad() instead")
const DimVector &moleFractionGradAtIP() const
{ return moleFractionGrad(); }
diff --git a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
index aab4770b727c35018f0145c9c9ddfc72f867b95a..66c6a8ce4b09ab39a6938cff7d2c52e5c42cac6a 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
@@ -86,7 +86,7 @@ public:
/*!
* \brief Returns the heat conductivity at the integration point.
*/
- DUMUX_DEPRECATED_MSG("use heatConductivity() instead")
+ DUNE_DEPRECATED_MSG("use heatConductivity() instead")
Scalar heatConductivityAtIP() const
{ return heatConductivity(); }
@@ -99,7 +99,7 @@ public:
/*!
* \brief Returns the temperature gradient at the integration point.
*/
- DUMUX_DEPRECATED_MSG("use temperatureGrad() instead")
+ DUNE_DEPRECATED_MSG("use temperatureGrad() instead")
const DimVector &temperatureGradAtIP() const
{ return temperatureGrad(); }
diff --git a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
index e46d6464976036027aaf1ac59922fbd313ed3661..2fde1f9142730ef4f394980229150188cedee177 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
@@ -86,7 +86,7 @@ class Stokes2cniModel : public Stokes2cModel<TypeTag>
enum { dim = GridView::dimension };
enum { transportCompIdx = Indices::transportCompIdx };
- enum { lCompIdx = transportCompIdx } DUMUX_DEPRECATED_MSG("use transportCompIdx instead");
+ enum { lCompIdx = transportCompIdx } DUNE_DEPRECATED_MSG("use transportCompIdx instead");
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
diff --git a/dumux/material/spatialparameters/boxspatialparameters.hh b/dumux/material/spatialparameters/boxspatialparameters.hh
index e0585b36c8eb3fa8d409e61742652c9250b185df..8a258e302d43f725cc780939ee7b71066381bc26 100644
--- a/dumux/material/spatialparameters/boxspatialparameters.hh
+++ b/dumux/material/spatialparameters/boxspatialparameters.hh
@@ -38,7 +38,7 @@ class BoxSpatialParameters: public BoxSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
public:
- DUMUX_DEPRECATED_MSG("use BoxSpatialParams instead")
+ DUNE_DEPRECATED_MSG("use BoxSpatialParams instead")
BoxSpatialParameters(const GridView &gridView)
: BoxSpatialParams<TypeTag>(gridView)
{ }
diff --git a/dumux/material/spatialparameters/boxspatialparameters1p.hh b/dumux/material/spatialparameters/boxspatialparameters1p.hh
index 006f3619604f6f7597c42b688cc5759c8ad9a9ae..f3519fa5b426e8d19c81593672d32a4b53e66752 100644
--- a/dumux/material/spatialparameters/boxspatialparameters1p.hh
+++ b/dumux/material/spatialparameters/boxspatialparameters1p.hh
@@ -38,7 +38,7 @@ class BoxSpatialParametersOneP : public BoxSpatialParamsOneP<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
public:
- DUMUX_DEPRECATED_MSG("use BoxSpatialParamsOneP instead")
+ DUNE_DEPRECATED_MSG("use BoxSpatialParamsOneP instead")
BoxSpatialParametersOneP(const GridView &gridView)
: BoxSpatialParamsOneP<TypeTag>(gridView)
{ }
diff --git a/dumux/material/spatialparameters/fvspatialparameters.hh b/dumux/material/spatialparameters/fvspatialparameters.hh
index 64e148fafc779de743b13b28d0fefb950da1151e..ffb5eed78a53b7bfc25cb88c0c3c8f36d3ccef6b 100644
--- a/dumux/material/spatialparameters/fvspatialparameters.hh
+++ b/dumux/material/spatialparameters/fvspatialparameters.hh
@@ -39,7 +39,7 @@ class FVSpatialParameters: public FVSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
public:
- DUMUX_DEPRECATED_MSG("use FVSpatialParams instead")
+ DUNE_DEPRECATED_MSG("use FVSpatialParams instead")
FVSpatialParameters(const GridView &gridView)
:FVSpatialParams<TypeTag>(gridView)
{ }
diff --git a/dumux/material/spatialparameters/fvspatialparameters1p.hh b/dumux/material/spatialparameters/fvspatialparameters1p.hh
index 1d66e8163100776b4fe178b407ee76623c795746..18f274d825128065680d5a29ee478a1ffa0c4154 100644
--- a/dumux/material/spatialparameters/fvspatialparameters1p.hh
+++ b/dumux/material/spatialparameters/fvspatialparameters1p.hh
@@ -39,7 +39,7 @@ class FVSpatialParametersOneP : public FVSpatialParamsOneP<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
public:
- DUMUX_DEPRECATED_MSG("use FVSpatialParamsOneP instead")
+ DUNE_DEPRECATED_MSG("use FVSpatialParamsOneP instead")
FVSpatialParametersOneP(const GridView &gridView)
: FVSpatialParamsOneP<TypeTag>(gridView)
{ }