Commit e8152f8a authored by Praetorius, Simon's avatar Praetorius, Simon

some error corrections for clang. Removed final contains-check in mmiterator.

parent e30e30f1
......@@ -34,7 +34,7 @@ namespace Dune
using Super = std::vector<HostGridEntity>;
/// Constructor from std::vector
using Super::vector;
using std::vector<HostGridEntity>::vector;
/// Return a local geometry of source in target
static LocalGeometry localGeometry (HostGridEntity const& source, HostGridEntity const& target)
......
......@@ -224,10 +224,10 @@ namespace Dune
for (; !(contains_[i](child) || child.isLeaf()); child = dereference(i)) {
assert(child.isRegular() && "No irregular elements allowed in multi-mesh traversal");
entityStack.emplace(child);
assert( entityStack.size() <= maxLevel_[i] );
assert(entityStack.size() <= maxLevel_[i]);
}
assert(contains_[i](child) && "No valid child element found in gridView");
// assert(contains_[i](child) && "No valid child element found in gridView");
}
/// Return true, if all stacks with size > stack[i].size are finished
......@@ -259,7 +259,7 @@ namespace Dune
assert(entityStack.size() <= maxLevel_[i]);
}
assert(contains_[i](child) && "No valid child element found in gridView");
// assert(contains_[i](child) && "No valid child element found in gridView");
}
HostEntity dereference (std::size_t i) const
......
......@@ -57,7 +57,7 @@ namespace Dune
/// Map entity to index.
template <int cc>
IndexType index (const typename LeafIndexSet::Traits::template Codim<cc>::Entity& e) const
IndexType index (const typename LeafIndexSet::template Codim<cc>::Entity& e) const
{
return std::visit([&e](auto const* is) { return is->template index<cc>(e); }, indexSets_);
}
......@@ -71,7 +71,7 @@ namespace Dune
/// Map a subentity to an index.
template <int cc>
IndexType subIndex (const typename LeafIndexSet::Traits::template Codim<cc>::Entity& e,
IndexType subIndex (const typename LeafIndexSet::template Codim<cc>::Entity& e,
int i, unsigned int codim) const
{
return std::visit([&e,i,codim](auto const* is) { return is->template subIndex<cc>(e,i,codim); }, indexSets_);
......
......@@ -60,7 +60,7 @@ namespace Dune
using LevelIterator = typename Partition<All_Partition>::LevelIterator;
private:
friend class HostGrid::GridFamily::Traits::template Codim<cd>::Entity;
// friend class HostGrid::GridFamily::Traits::template Codim<cd>::Entity;
};
/// The type of view for leaf grid
......
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