diff --git a/dumux/implicit/2pdfm/2pdfmindices.hh b/dumux/implicit/2pdfm/2pdfmindices.hh index a7d801c2cf9f8155cd0371bc10aa3425db6af9bd..6eafb196a9f5c743e03d198082f2404264fd2296 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 aae85394ac7f05685d95ffed1a2e68791a659eee..4a4a065cca106dfe11f4bed536d9772085ae1d60 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_;