From 6eb95bad7fb27935c1a5349375512fc24da69e81 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Mon, 13 Apr 2020 18:48:32 +0200
Subject: [PATCH] [cleanup] Make MultiDomainGlue an alias template
---
dumux/multidomain/glue.hh | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/dumux/multidomain/glue.hh b/dumux/multidomain/glue.hh
index a5996d7fd8..d0d54f5c2e 100644
--- a/dumux/multidomain/glue.hh
+++ b/dumux/multidomain/glue.hh
@@ -32,23 +32,13 @@
namespace Dumux {
+/*!
+ * \ingroup MultiDomain
+ * \brief A convenience alias for the IntersectionEntitySet of two GridViewGeometricEntitySets
+ */
template<class DomainGridView, class TargetGridView, class DomainMapper, class TargetMapper>
-class MultiDomainGlue : public IntersectionEntitySet<GridViewGeometricEntitySet<DomainGridView, 0, DomainMapper>,
- GridViewGeometricEntitySet<TargetGridView, 0, TargetMapper>>
-{
- using DomainEntitySet = GridViewGeometricEntitySet<DomainGridView, 0, DomainMapper>;
- using TargetEntitySet = GridViewGeometricEntitySet<TargetGridView, 0, TargetMapper>;
- using ParentType = IntersectionEntitySet<DomainEntitySet, TargetEntitySet>;
- using DomainTree = BoundingBoxTree<DomainEntitySet>;
- using TargetTree = BoundingBoxTree<TargetEntitySet>;
-public:
- using ParentType::ParentType;
-
- // TODO: After the deprecation period (after release 3.2) this class can be replaced by an alias template
- [[deprecated("Will be removed after 3.2. Use default constructor and call build(domainTree, targetTree)!")]]
- MultiDomainGlue(const DomainTree& domainTree, const TargetTree& targetTree)
- { this->build(domainTree, targetTree); }
-};
+using MultiDomainGlue = IntersectionEntitySet<GridViewGeometricEntitySet<DomainGridView, 0, DomainMapper>,
+ GridViewGeometricEntitySet<TargetGridView, 0, TargetMapper>>;
/*!
* \ingroup MultiDomain
--
GitLab