From b80beb98e11d036c26c294fa468307fc54d11ab9 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 22 Oct 2013 09:05:30 +0000
Subject: [PATCH] remove deprecated stuff from dumux/decoupled/2p
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11764 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/2p/2pindices.hh | 70 +++----------------
dumux/decoupled/2p/fluxdata2p.hh | 24 -------
.../decoupled/2p/transport/fv/evalcflflux.hh | 4 --
.../2p/transport/fv/evalcflfluxdefault.hh | 4 --
4 files changed, 10 insertions(+), 92 deletions(-)
diff --git a/dumux/decoupled/2p/2pindices.hh b/dumux/decoupled/2p/2pindices.hh
index 600a339663..e325c50753 100644
--- a/dumux/decoupled/2p/2pindices.hh
+++ b/dumux/decoupled/2p/2pindices.hh
@@ -39,20 +39,9 @@ struct DecoupledTwoPCommonIndices
{
// Formulations
static const int pwsn = 0; //!< pw and sn as primary variables
- DUNE_DEPRECATED_MSG("use pwsn (uncapitalized 's') instead")
- static const int pwSn = pwsn; //!< \deprecated
-
static const int pnsw = 1; //!< pn and sw as primary variables
- DUNE_DEPRECATED_MSG("use pnsw (uncapitalized 's') instead")
- static const int pnSw = pnsw; //!< \deprecated
-
static const int pwsw = 2; //!< pw and sw as primary variables
- DUNE_DEPRECATED_MSG("use pwsw (uncapitalized 'S') instead")
- static const int pwSw = pwsw; //!< \deprecated
-
static const int pnsn = 3; //!< pn and sn as primary variables
- DUNE_DEPRECATED_MSG("use pnsn (uncapitalized 'S') instead")
- static const int pnSn = pnsn; //!< \deprecated
static const int pGlobalSw = 4; //!< pGlobal and sw as primary variables
static const int pGlobalSn = 5; //!< pGlobal and sn as primary variables
@@ -66,24 +55,15 @@ struct DecoupledTwoPCommonIndices
static const int saturationW = 0; //!< Indicates wetting phase saturation
static const int saturationNw = 1; //!< Indicates non-wetting phase saturation
- DUNE_DEPRECATED_MSG("use saturationNw (uncapitalized 'w') instead")
- static const int saturationNW = saturationNw; //!< \deprecated
-
//pressure flags
static const int pressureW = 0; //!< Indicates wetting phase pressure
static const int pressureNw = 1; //!< Indicates non-wetting phase pressure
static const int pressureGlobal = 2; //!< Indicates global-pressure
- DUNE_DEPRECATED_MSG("use pressureNw (uncapitalized 'w') instead")
- static const int pressureNW = pressureNw; //!< \deprecated
-
//velocity flags
static const int velocityW = 0; //!< Indicates wetting phase velocity
static const int velocityNw = 1; //!< Indicates non-wetting phase velocity
static const int velocityTotal = 2; //!< Indicates total velocity
-
- DUNE_DEPRECATED_MSG("use velocityNw (uncapitalized 'w') instead")
- static const int velocityNW = velocityNw; //!< \deprecated
};
/*!
@@ -101,11 +81,8 @@ struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices
static const int saturationIdx = PVOffset + 1; //!< Index for the primary saturation variable in a solution vector
// indices of the primary variables
- static const int pwIdx = PVOffset + 0; //!< Pressure index of the wetting phase
- static const int snIdx = PVOffset + 1; //!< \deprecated Saturation index of the nonwetting phase
-
- DUNE_DEPRECATED_MSG("use snIdx (uncapitalized 's') instead")
- static const int SnIdx = snIdx; //!< \deprecated Saturation index of the nonwetting phase
+ static const int pwIdx = PVOffset + 0; //!< index of the wetting phase pressure
+ static const int snIdx = PVOffset + 1; //!< index of the nonwetting phase saturation
//! \cond \private
//Set the types of the single models depending on the formulation
@@ -118,8 +95,6 @@ struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices
// indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
static const int pressureEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
- DUNE_DEPRECATED_MSG("use pressureEqIdx instead")
- static const int pressEqIdx = pressureEqIdx; //!< \deprecated
static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase
static const int satEqIdx = contiNEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
@@ -140,11 +115,8 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnsw, PVOffset>
static const int saturationIdx = PVOffset + 1; //!< Index for the primary saturation variable in a solution vector
// indices of the primary variables
- static const int pnIdx = PVOffset + 0; //!< Pressure index of the non-wetting phase
- static const int swIdx = PVOffset + 1; //!< Saturation index of the wetting phase
-
- DUNE_DEPRECATED_MSG("use swIdx (uncapitalized 's') instead")
- static const int SwIdx = swIdx; //!< \deprecated Saturation index of the wetting phase
+ static const int pnIdx = PVOffset + 0; //!< index of the non-wetting phase pressure
+ static const int swIdx = PVOffset + 1; //!< index of the wetting phase saturation
//! \cond \private
//Set the types of the single models depending on the formulation
@@ -157,8 +129,6 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnsw, PVOffset>
// indices of the equations
static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
static const int pressureEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
- DUNE_DEPRECATED_MSG("use pressureEqIdx instead")
- static const int pressEqIdx = pressureEqIdx; //!< \deprecated
static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase
static const int satEqIdx = contiWEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
@@ -183,9 +153,6 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwsw, PVOffset>
static const int pwIdx = PVOffset + 0; //!< Pressure index of the wetting phase
static const int swIdx = PVOffset + 1; //!< Saturation index of the wetting phase
- DUNE_DEPRECATED_MSG("use swIdx (uncapitalized 's') instead")
- static const int SwIdx = swIdx; //!< \deprecated Saturation index of the wetting phase
-
//! \cond \private
//Set the types of the single models depending on the formulation
static const int pressureType = pressureW;
@@ -197,8 +164,6 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwsw, PVOffset>
// indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
static const int pressureEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
- DUNE_DEPRECATED_MSG("use pressureEqIdx instead")
- static const int pressEqIdx = pressureEqIdx; //!< \deprecated
static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase
static const int satEqIdx = contiNEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
@@ -219,11 +184,8 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnsn, PVOffset>
static const int saturationIdx = PVOffset + 1; //!< Index for the primary saturation variable in a solution vector
// indices of the primary variables
- static const int pnIdx = PVOffset + 0; //!< Pressure index of the non-wetting phase
- static const int snIdx = PVOffset + 1; //!< \deprecated Saturation index of the nonwetting phase
-
- DUNE_DEPRECATED_MSG("use snIdx (uncapitalized 's') instead")
- static const int SnIdx = snIdx; //!< \deprecated Saturation index of the nonwetting phase
+ static const int pnIdx = PVOffset + 0; //!< index of the nonwetting phase pressure
+ static const int snIdx = PVOffset + 1; //!< index of the nonwetting phase saturation
//! \cond \private
//Set the types of the single models depending on the formulation
@@ -236,8 +198,6 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnsn, PVOffset>
// indices of the equations
static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
static const int pressureEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
- DUNE_DEPRECATED_MSG("use pressureEqIdx instead")
- static const int pressEqIdx = pressureEqIdx; //!< \deprecated
static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase
static const int satEqIdx = contiWEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
@@ -258,11 +218,8 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSw, PVOffset> : p
static const int saturationIdx = PVOffset + 1; //!< Index for the primary saturation variable in a solution vector
// indices of the primary variables
- static const int pGlobalIdx = PVOffset + 0; //!< Global pressure index
- static const int swIdx = PVOffset + 1; //!< Saturation index of the wetting phase
-
- DUNE_DEPRECATED_MSG("use swIdx (uncapitalized 's') instead")
- static const int SwIdx = swIdx; //!< \deprecated Saturation index of the wetting phase
+ static const int pGlobalIdx = PVOffset + 0; //!< index of the global pressure
+ static const int swIdx = PVOffset + 1; //!< index of the wetting phase saturation
//! \cond \private
//Set the types of the single models depending on the formulation
@@ -274,8 +231,6 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSw, PVOffset> : p
// indices of the equations
static const int pressureEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
- DUNE_DEPRECATED_MSG("use pressureEqIdx instead")
- static const int pressEqIdx = pressureEqIdx; //!< \deprecated
static const int satEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
};
@@ -295,11 +250,8 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSn, PVOffset>
static const int saturationIdx = PVOffset + 1; //!< Index for the primary saturation variable in a solution vector
// indices of the primary variables
- static const int pGlobalIdx = PVOffset + 0; //!< Global pressure index
- static const int snIdx = PVOffset + 1; //!< \deprecated Saturation index of the nonwetting phase
-
- DUNE_DEPRECATED_MSG("use snIdx (uncapitalized 's') instead")
- static const int SnIdx = snIdx; //!< \deprecated Saturation index of the nonwetting phase
+ static const int pGlobalIdx = PVOffset + 0; //!< index of the global pressure
+ static const int snIdx = PVOffset + 1; //!< index of the nonwetting phase saturation
//! \cond \private
//Set the types of the single models depending on the formulation
@@ -311,8 +263,6 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSn, PVOffset>
// indices of the equations
static const int pressureEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
- DUNE_DEPRECATED_MSG("use pressureEqIdx instead")
- static const int pressEqIdx = pressureEqIdx; //!< \deprecated
static const int satEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
};
diff --git a/dumux/decoupled/2p/fluxdata2p.hh b/dumux/decoupled/2p/fluxdata2p.hh
index 605086b13a..960d897657 100644
--- a/dumux/decoupled/2p/fluxdata2p.hh
+++ b/dumux/decoupled/2p/fluxdata2p.hh
@@ -223,12 +223,6 @@ public:
return upwindPotential_[indexInInside][phaseIdx];
}
- DUNE_DEPRECATED_MSG("use upwindPotential() instead")
- Scalar potential(int phaseIdx, int indexInInside)
- {
- return upwindPotential_[indexInInside][phaseIdx];
- }
-
/*! \brief Returns the phase upwind potential at a cell-cell interface
*
* \param phaseIdx Index of a fluid phase
@@ -239,12 +233,6 @@ public:
return upwindPotential_[indexInInside][phaseIdx];
}
- DUNE_DEPRECATED_MSG("use upwindPotential() instead")
- Scalar potential(int phaseIdx, int indexInInside) const
- {
- return upwindPotential_[indexInInside][phaseIdx];
- }
-
/*! \brief Sets the phase upwind potential at a cell-cell interface
*
* \param phaseIdx Index of a fluid phase
@@ -256,12 +244,6 @@ public:
upwindPotential_[indexInInside][phaseIdx] = pot;
}
- DUNE_DEPRECATED_MSG("use setUpwindPotential() instead")
- void setPotential(int phaseIdx, int indexInInside, Scalar pot)
- {
- upwindPotential_[indexInInside][phaseIdx] = pot;
- }
-
/*! \brief Adds a phase upwind potential to the one previously stored
*
* \param phaseIdx Index of a fluid phase
@@ -272,12 +254,6 @@ public:
{
upwindPotential_[indexInInside][phaseIdx] += pot;
}
-
- DUNE_DEPRECATED_MSG("use addUpwindPotential() instead")
- void addPotential(int phaseIdx, int indexInInside, Scalar pot)
- {
- upwindPotential_[indexInInside][phaseIdx] += pot;
- }
};
}
#endif
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux.hh b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
index 2dfdd3b54e..ca7ca52eb7 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
@@ -97,10 +97,6 @@ public:
return 0.0;
}
- DUNE_DEPRECATED_MSG("use getCflFluxFunction() (uncapitalized 'fl') instead")
- Scalar getCFLFluxFunction(const Element& element)
- { return getCflFluxFunction(element); }
-
/*! \brief Returns the CFL time-step
*
* \param element element on which the CFL-criterion is evaluated
diff --git a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
index 5525571867..af6740a014 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
@@ -85,10 +85,6 @@ public:
*/
Scalar getCflFluxFunction(const Element& element);
- DUNE_DEPRECATED_MSG("use getCflFluxFunction() (uncapitalized 'fl') instead")
- Scalar getCFLFluxFunction(const Element& element)
- { return getCflFluxFunction(element); }
-
/*! \brief Returns the CFL time-step
*
* \copydetails EvalCflFlux::getDt(const Element&)
--
GitLab