Skip to content
Snippets Groups Projects
Commit d1935259 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'fix/glue-constructor' into 'master'

Fix/glue constructor

See merge request !1618
parents 8cfa5f23 9c1c7980
No related branches found
No related tags found
1 merge request!1618Fix/glue constructor
...@@ -26,11 +26,14 @@ ...@@ -26,11 +26,14 @@
#define DUMUX_MULTIDOMAIN_MIXEDDIMENSION_GLUE_HH #define DUMUX_MULTIDOMAIN_MIXEDDIMENSION_GLUE_HH
#include <dumux/multidomain/glue.hh> #include <dumux/multidomain/glue.hh>
#include <dune/grid/common/mcmgmapper.hh>
namespace Dumux { namespace Dumux {
// forward declaration // forward declaration
template<class BulkGridView, class LowDimGridView, class BulkMapper, class LowDimMapper> template<class BulkGridView, class LowDimGridView,
class BulkMapper = Dune::MultipleCodimMultipleGeomTypeMapper<BulkGridView>,
class LowDimMapper = Dune::MultipleCodimMultipleGeomTypeMapper<LowDimGridView>>
class DUNE_DEPRECATED_MSG("Use MultiDomainGlue instead. Will be removed after 3.1!") class DUNE_DEPRECATED_MSG("Use MultiDomainGlue instead. Will be removed after 3.1!")
MixedDimensionGlue MixedDimensionGlue
: public MultiDomainGlue<LowDimGridView, BulkGridView, LowDimMapper, BulkMapper> : public MultiDomainGlue<LowDimGridView, BulkGridView, LowDimMapper, BulkMapper>
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <dune/common/promotiontraits.hh> #include <dune/common/promotiontraits.hh>
#include <dune/geometry/affinegeometry.hh> #include <dune/geometry/affinegeometry.hh>
#include <dune/geometry/type.hh> #include <dune/geometry/type.hh>
#include <dune/grid/common/mcmgmapper.hh>
#include <dumux/common/geometry/geometricentityset.hh> #include <dumux/common/geometry/geometricentityset.hh>
#include <dumux/common/geometry/boundingboxtree.hh> #include <dumux/common/geometry/boundingboxtree.hh>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment