From 9ecbdf23b9cf7efe1fddb86ee7adbea5c6072243 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 29 Oct 2014 11:11:12 +0000
Subject: [PATCH] [multidomain] remove deprecated functions from
MultiDomainModel/Problem
Reviewed by Thomas.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13579 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/multidomain/common/multidomainmodel.hh | 32 -------------------
.../multidomain/common/multidomainproblem.hh | 24 --------------
2 files changed, 56 deletions(-)
diff --git a/dumux/multidomain/common/multidomainmodel.hh b/dumux/multidomain/common/multidomainmodel.hh
index 1fc32a2a23..bbe2e05da4 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 c72a723c89..ffec62301a 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
*/
--
GitLab