diff --git a/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh b/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh index bd73029e679e76a6cdc292dd999765164e54ed5e..ffa327db211d026aa6903cf7e1d493c275a0a13a 100644 --- a/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh +++ b/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh @@ -375,12 +375,6 @@ public: return normal_[subVolumeIdx][subVolumeFaceIdxInInsideN] * permTimesNu_[subVolumeIdx][subVolumeFaceIdxInInsideNu]; } - DUNE_DEPRECATED_MSG("use getNtkNu() instead") - Scalar getNTKNu(int subVolumeIdx, int subVolumeFaceIdxInInsideN, int subVolumeFaceIdxInInsideNu) const - { - return getNtkNu(subVolumeIdx, subVolumeFaceIdxInInsideN, subVolumeFaceIdxInInsideNu); - } - //! Get \f$ \boldsymbol n^\text{T} k_{r\alpha} \boldsymbol K \boldsymbol \nu\f$ for the transmissiblity calculation /*! * \param relPerm relative permeability value (\f$ \boldsymbol n^\text{T} k_{r\alpha} \f$) @@ -399,12 +393,6 @@ public: return normal_[subVolumeIdx][subVolumeFaceIdxInInsideN] * krKNu; } - DUNE_DEPRECATED_MSG("use getNtkrkNu() instead") - Scalar getNTKrKNu(Scalar& relPerm, int subVolumeIdx, int subVolumeFaceIdxInInsideN, int subVolumeFaceIdxInInsideNu) const - { - return getNtkrkNu(relPerm, subVolumeIdx, subVolumeFaceIdxInInsideN, subVolumeFaceIdxInInsideNu); - } - //! Get \f$ \frac{1}{dF} \left(\boldsymbol n^\text{T} \boldsymbol K \boldsymbol \nu \right) \f$ for the transmissiblity calculation /*! * \param subVolumeIdx The local element index in the interaction volume @@ -418,12 +406,6 @@ public: return faceArea_[subVolumeIdx][subVolumeFaceIdxInInsideN]*getNtkNu(subVolumeIdx, subVolumeFaceIdxInInsideN, subVolumeFaceIdxInInsideNu) / dF_[subVolumeIdx]; } - DUNE_DEPRECATED_MSG("use getNtkNu_df() instead") - Scalar getNTKNu_by_dF(int subVolumeIdx, int subVolumeFaceIdxInInsideN, int subVolumeFaceIdxInInsideNu) const - { - return getNtkNu_df(subVolumeIdx, subVolumeFaceIdxInInsideN, subVolumeFaceIdxInInsideNu); - } - //! Get \f$ \frac{1}{dF} \left(\boldsymbol n^\text{T} k_{r\alpha} \boldsymbol K \boldsymbol \nu \right) \f$ for the transmissiblity calculation /*! * \param relPerm relative permeability value (\f$ \boldsymbol n^\text{T} k_{r\alpha} \f$) @@ -438,12 +420,6 @@ public: return faceArea_[subVolumeIdx][subVolumeFaceIdxInInsideN]*getNtkrkNu(relPerm, subVolumeIdx, subVolumeFaceIdxInInsideN, subVolumeFaceIdxInInsideNu) / dF_[subVolumeIdx]; } - DUNE_DEPRECATED_MSG("use getNtkrkNu_df() instead") - Scalar getNTKrKNu_by_dF(Scalar& relPerm, int subVolumeIdx, int subVolumeFaceIdxInInsideN, int subVolumeFaceIdxInInsideNu) const - { - return getNtkrkNu_df(relPerm, subVolumeIdx, subVolumeFaceIdxInInsideN, subVolumeFaceIdxInInsideNu); - } - private: bool stored_; Dune::FieldVector<FieldVectorVector, 2*dim> permTimesNu_; diff --git a/dumux/decoupled/common/impetproblem.hh b/dumux/decoupled/common/impetproblem.hh index a6a8026a79284ce26c3d9e06ad2eb9d279b05608..09487d2a709f75bd422510b865547efbd7b50666 100644 --- a/dumux/decoupled/common/impetproblem.hh +++ b/dumux/decoupled/common/impetproblem.hh @@ -649,10 +649,6 @@ public: const GlobalPosition &bBoxMin() const { return bBoxMin_; } - DUNE_DEPRECATED_MSG("use bBoxMin() (capitalized second 'B') instead") - const GlobalPosition &bboxMin() const - { return bBoxMin(); } - /*! * \brief The coordinate of the corner of the GridView's bounding * box with the largest values. @@ -660,10 +656,6 @@ public: const GlobalPosition &bBoxMax() const { return bBoxMax_; } - DUNE_DEPRECATED_MSG("use bBoxMax() (capitalized second 'B') instead") - const GlobalPosition &bboxMax() const - { return bBoxMax(); } - //! \name Access functions //@{ /*! diff --git a/dumux/decoupled/common/onemodelproblem.hh b/dumux/decoupled/common/onemodelproblem.hh index b2f73e886f7636093aaddf55ceaa9f0daa3084f8..acf0b5f784af7bea2eab737b660ee2a915fee302 100644 --- a/dumux/decoupled/common/onemodelproblem.hh +++ b/dumux/decoupled/common/onemodelproblem.hh @@ -495,10 +495,6 @@ public: const GlobalPosition &bBoxMin() const { return bBoxMin_; } - DUNE_DEPRECATED_MSG("use bBoxMin() (capitalized second 'B') instead") - const GlobalPosition &bboxMin() const - { return bBoxMin(); } - /*! * \brief The coordinate of the corner of the GridView's bounding * box with the largest values. @@ -506,10 +502,6 @@ public: const GlobalPosition &bBoxMax() const { return bBoxMax_; } - DUNE_DEPRECATED_MSG("use bBoxMax() (capitalized second 'B') instead") - const GlobalPosition &bboxMax() const - { return bBoxMax(); } - /*! * \brief Returns TimeManager object used by the simulation */