diff --git a/dumux/multidomain/common/multidomainmodel.hh b/dumux/multidomain/common/multidomainmodel.hh index 1fc32a2a23d8e16f750a41beb71b94201ba2259d..bbe2e05da43341ba34013cc385ea93b92191d557 100644 --- a/dumux/multidomain/common/multidomainmodel.hh +++ b/dumux/multidomain/common/multidomainmodel.hh @@ -210,38 +210,6 @@ public: const SubDomainModel2 &sdModel2() const { return sdProblem2().model(); } - DUNE_DEPRECATED_MSG("use sdProblem1 instead") - SubDomainProblem1 &subProblem1() - { return sdProblem1(); } - - DUNE_DEPRECATED_MSG("use sdProblem1 instead") - const SubDomainProblem1 &subProblem1() const - { return sdProblem1(); } - - DUNE_DEPRECATED_MSG("use sdProblem2 instead") - SubDomainProblem2 &subProblem2() - { return sdProblem2(); } - - DUNE_DEPRECATED_MSG("use sdProblem2 instead") - const SubDomainProblem2 &subProblem2() const - { return sdProblem2(); } - - DUNE_DEPRECATED_MSG("use sdModel1 instead") - SubDomainModel1 &subModel1() - { return sdModel1(); } - - DUNE_DEPRECATED_MSG("use sdModel1 instead") - const SubDomainModel1 &subModel1() const - { return sdModel1(); } - - DUNE_DEPRECATED_MSG("use sdModel2 instead") - SubDomainModel2 &subModel2() - { return sdModel2(); } - - DUNE_DEPRECATED_MSG("use sdModel2 instead") - const SubDomainModel2 &subModel2() const - { return sdModel2(); } - //! \copydoc Dumux::ImplicitModel::update() bool update(NewtonMethod &solver, NewtonController &controller) diff --git a/dumux/multidomain/common/multidomainproblem.hh b/dumux/multidomain/common/multidomainproblem.hh index c72a723c89a6abfb6c87442b72614cb63d4ba2e6..ffec62301aecb83f8aade7e478495cf2a5e275ff 100644 --- a/dumux/multidomain/common/multidomainproblem.hh +++ b/dumux/multidomain/common/multidomainproblem.hh @@ -406,30 +406,6 @@ public: const SubDomainGrid& sdGrid2() const { return sdGrid2_; } - DUNE_DEPRECATED_MSG("use sdID1 instead") - const typename MultiDomainGrid::SubDomainType subID1() const - { return sdID1(); } - - DUNE_DEPRECATED_MSG("use sdID2 instead") - const typename MultiDomainGrid::SubDomainType subID2() const - { return sdID2(); } - - DUNE_DEPRECATED_MSG("use sdProblem1 instead") - SubDomainProblem1& subProblem1() - { return sdProblem1(); } - - DUNE_DEPRECATED_MSG("use sdProblem2 instead") - SubDomainProblem2& subProblem2() - { return sdProblem2(); } - - DUNE_DEPRECATED_MSG("use sdGridView1 instead") - const SubDomainGridView1 gridView1() const - { return mdGrid().subDomain(sdID1_).leafView(); } - - DUNE_DEPRECATED_MSG("use sdGridView2 instead") - const SubDomainGridView2 gridView2() const - { return mdGrid().subDomain(sdID2_).leafView(); } - /*! * \brief Returns the gridview of subdomain1 */