Commit 16f8b826 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

Deprecated DUMUX_DEPRECATED_MSG.

Replaced use of DUMUX_DEPREATED_MSG by DUNE_DEPRECATED_MSG.
(reviewed by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8702 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 3fdd1ca6
......@@ -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
......
......@@ -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,
......
......@@ -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(); }
......
......@@ -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,
......
......@@ -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)
......
......@@ -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); };
......
......@@ -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
};
// \}
......
......@@ -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)
......
......@@ -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); };
......
......@@ -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)
......
......@@ -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)
......
......@@ -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_);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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(); }
......
......@@ -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);}
......
......@@ -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() ; }
......
......@@ -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)
......
......@@ -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
......
......@@ -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();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment