Skip to content
Snippets Groups Projects
Commit d7922050 authored by Santiago Ospina De Los Ríos's avatar Santiago Ospina De Los Ríos
Browse files

Merge branch 'feature/remove-typetree-dependency' into 'master'

Remove typetree dependecy

See merge request !31
parents 0341ff69 110084a7
No related branches found
No related tags found
1 merge request!31Remove typetree dependecy
Pipeline #38173 passed
......@@ -15,9 +15,13 @@ Changes
### Unreleased
* Fix bug where lelve index sets where not updated after grid adaptation.
* Fix bug where level index sets where not updated after grid adaptation.
* Add entity iterator capabilities
* Add entity iterator capabilities.
* Compatiblity with DUNE 2.8.0.
* Remove dune-typetree dependency.
### MultiDomainGrid 2.7
......
......@@ -84,8 +84,6 @@ dune-multidomaingrid depends on the following software packages:
* [DUNE core libraries][2] (dune-common, dune-geometry, dune-grid) version 2.7-git,
and their respective dependencies.
* The [dune-typetree][7] library, version 2.7-git.
* CMake 3.1.0 and a compiler that is compatible with GCC 5 or newer in C++14 mode.
......
......@@ -6,5 +6,5 @@ Module: dune-multidomaingrid
Version: 2.7-git
Maintainer: steffen.muething@iwr.uni-heidelberg.de
#depending on
Depends: dune-grid (>= 2.7) dune-typetree (>= 2.7)
Depends: dune-grid (>= 2.7)
Whitespace-Hook: Yes
......@@ -11,16 +11,16 @@
#include <tuple>
#include <utility>
#include <dune/common/hybridutilities.hh>
#include <dune/geometry/typeindex.hh>
#include <dune/grid/common/exceptions.hh>
#include <dune/grid/common/indexidset.hh>
#include <dune/grid/multidomaingrid/utility.hh>
#include <dune/grid/multidomaingrid/subdomaingrid/indexsets.hh>
#include <dune/typetree/utility.hh>
namespace Dune {
namespace mdgrid {
......@@ -729,20 +729,18 @@ private:
template<typename Functor>
void applyToCodims(Functor func) const {
TypeTree::apply_to_tuple(
_containers,
func,
TypeTree::apply_to_tuple_policy::pass_index()
);
// static loop over container tuple
Hybrid::forEach(Dune::range(std::tuple_size<ContainerMap>{}),
[&](auto i){func(i, std::get<i>(_containers));}
);
}
template<typename Functor>
void applyToCodims(Functor func) {
TypeTree::apply_to_tuple(
_containers,
func,
TypeTree::apply_to_tuple_policy::pass_index()
);
// static loop over container tuple
Hybrid::forEach(Dune::range(std::tuple_size<ContainerMap>{}),
[&](auto i){func(i, std::get<i>(_containers));}
);
}
template<typename Impl>
......
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