From 4c5ec4e59f705b5f8096fc5e6f567e40ad9b1710 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 22 Oct 2013 08:45:32 +0000
Subject: [PATCH] remove deprecated stuff from dumux/implicit/2pdfm
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11759 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/implicit/2pdfm/2pdfmindices.hh | 7 ++-----
dumux/implicit/2pdfm/2pdfmvolumevariables.hh | 6 ------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/dumux/implicit/2pdfm/2pdfmindices.hh b/dumux/implicit/2pdfm/2pdfmindices.hh
index a7d801c2cf..6eafb196a9 100644
--- a/dumux/implicit/2pdfm/2pdfmindices.hh
+++ b/dumux/implicit/2pdfm/2pdfmindices.hh
@@ -49,11 +49,8 @@ struct TwoPDFMIndices : public TwoPIndices <TypeTag, formulation, PVOffset>
static const int saturationIdx = PVOffset + 1; //!< Index of the saturation of the non-wetting/wetting phase
// 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
// indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
diff --git a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
index aae85394ac..4a4a065cca 100644
--- a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
@@ -353,12 +353,6 @@ public:
Scalar dsm_dsf() const
{ return dsm_dsf_;}
- DUNE_DEPRECATED_MSG("use dsm_dsf() (uncapitalized) instead")
- Scalar dSM_dSF() const
- {
- return dsm_dsf();
- }
-
protected:
FluidState fluidState_;
FluidState fluidStateFracture_;
--
GitLab