Commit 1ba853f5 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/remove-leaf-mcmgmapper' into 'master'

Replace the LeafMultipleCodimMultipleGeomTypeMapper by the MCMGMapper

See merge request amdis/amdis!9
parents 0fb869e3 1e008c75
......@@ -132,7 +132,7 @@ namespace AMDiS
PersistentContainer persistentContainer_;
/// Map leaf entities to unique index
using Mapper = Dune::LeafMultipleCodimMultipleGeomTypeMapper<Grid>;
using Mapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
Mapper mapper_;
/// Data transfer on a single basis node
......
......@@ -13,6 +13,7 @@
#include <dune/common/fvector.hh>
#include <dune/common/hash.hh>
#include <dune/common/version.hh>
#include <dune/grid/common/geometry.hh>
#include <dune/grid/common/rangegenerators.hh>
......@@ -45,7 +46,7 @@ struct CoordHasher
template <class C, class B>
DataTransfer<C,B>::DataTransfer(std::shared_ptr<B const> basis)
: basis_(std::move(basis))
, mapper_(basis_->gridView().grid(), Dune::mcmgElementLayout())
, mapper_(basis_->gridView(), Dune::mcmgElementLayout())
, nodeDataTransfer_()
{}
......@@ -162,7 +163,12 @@ void DataTransfer<C,B>::adapt(C& coeff)
nodeDataTransfer_[tp].adaptInit(lv, coeff, node);
});
#if DUNE_VERSION_LT(DUNE_GRID,2,8)
mapper_.update();
#else
mapper_.update(gv);
#endif
std::vector<bool> finished(mapper_.size(), false);
for (const auto& e : elements(gv, typename C::Traits::PartitionSet{}))
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment