Commit 163ea7db authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/remove-several-warnings' into 'master'

Remove unused-parameter warnings

See merge request amdis/amdis!72
parents 46684b80 f0c0c661
......@@ -180,8 +180,8 @@ namespace AMDiS
/// Set the flag that forces an update of the pattern since the underlying
/// basis that defines the indexset has been changed
void updateImpl(event::adapt e, index_t<0> i) override { updateImpl2(*rowBasis_); }
void updateImpl(event::adapt e, index_t<1> i) override { updateImpl2(*colBasis_); }
void updateImpl(event::adapt, index_t<0>) override { updateImpl2(*rowBasis_); }
void updateImpl(event::adapt, index_t<1>) override { updateImpl2(*colBasis_); }
auto& operators() { return operators_; }
......
......@@ -155,7 +155,7 @@ void ESMarker<Grid>::initMarking(AdaptInfo& adaptInfo)
int nLeaves = (this->grid_->leafGridView()).size(0);
#if AMDIS_HAS_PARALLEL
Dune::CollectiveCommunication<>{}.sum(nLeaves, 1);
Dune::Communication<>{}.sum(nLeaves, 1);
#endif
this->markRLimit_ = esThetaP * epsP / nLeaves;
......
......@@ -6,7 +6,7 @@
#include <limits>
#include <type_traits>
#include <dune/common/power.hh>
#include <dune/common/math.hh>
namespace AMDiS
{
......@@ -32,7 +32,7 @@ namespace AMDiS
constexpr auto pow(T const& v)
{
static_assert( p >= 0, "Exponent p in `pow<p>(v)` should be >= 0," );
return Dune::Power<p>::eval(v);
return Dune::power(v,p);
}
......
......@@ -40,7 +40,7 @@ namespace AMDiS
template <class T>
std::shared_ptr<T> wrap_or_share(std::shared_ptr<T> t)
{
return std::move(t);
return t;
}
template <class T>
......
......@@ -64,7 +64,7 @@ preAdapt(B const& basis, C const& coeff, bool mightCoarsen)
lv.bind(e);
auto& treeContainer = it.first->second;
Traversal::forEachLeafNode(lv.tree(), [&](auto const& node, auto const& tp) {
Traversal::forEachLeafNode(lv.tree(), [&](auto const& /*node*/, auto const& tp) {
nodeDataTransfer_[tp].cacheLocal(treeContainer[tp]);
});
}
......@@ -124,7 +124,7 @@ preAdapt(B const& basis, C const& coeff, bool mightCoarsen)
};
restrictLocalCompleted = true;
Traversal::forEachLeafNode(lv.tree(), [&](auto const& node, auto const& tp) {
Traversal::forEachLeafNode(lv.tree(), [&](auto const& /*node*/, auto const& tp) {
restrictLocalCompleted &=
nodeDataTransfer_[tp].restrictLocal(father, treeContainer[tp], xInChildCached,
childContainer[tp], init);
......@@ -172,7 +172,7 @@ void InterpolationDataTransfer<B,C>::adapt(B const& basis, C& coeff)
if (it != persistentContainer_.end()) {
lv.bind(e);
auto const& treeContainer = it->second;
Traversal::forEachLeafNode(lv.tree(), [&](auto const& node, auto const& tp) {
Traversal::forEachLeafNode(lv.tree(), [&](auto const& /*node*/, auto const& tp) {
nodeDataTransfer_[tp].copyLocal(treeContainer[tp]);
});
finished[index] = true;
......@@ -207,7 +207,7 @@ void InterpolationDataTransfer<B,C>::adapt(B const& basis, C& coeff)
return fatherGeo.local(childGeo.global(x));
};
Traversal::forEachLeafNode(lv.tree(), [&](auto const& node, auto const& tp) {
Traversal::forEachLeafNode(lv.tree(), [&](auto const& /*node*/, auto const& tp) {
nodeDataTransfer_[tp].prolongLocal(father, treeContainer[tp], xInFather, init);
});
......
......@@ -25,7 +25,7 @@ namespace AMDiS
template <class RowBasis, class ColBasis>
SparsityPattern(RowBasis const& rowBasis, ColBasis const& colBasis,
SymmetryStructure symmetry = SymmetryStructure::unknown)
SymmetryStructure /*symmetry*/ = SymmetryStructure::unknown)
: rows_(rowBasis.dimension())
, cols_(colBasis.dimension())
, pattern_(rows_, cols_)
......
......@@ -35,8 +35,8 @@ namespace AMDiS
}
template <class BitVector, class Associations>
static void periodicBC(Matrix& mat, Vector& sol, Vector& rhs, BitVector const& left, Associations const& left2right,
bool setDiagonal = true)
static void periodicBC(Matrix& /*mat*/, Vector& /*sol*/, Vector& /*rhs*/, BitVector const& /*left*/, Associations const& /*left2right*/,
bool /*setDiagonal*/ = true)
{
error_exit("Not implemented");
}
......
......@@ -121,7 +121,7 @@ namespace AMDiS
create_impl(Dune::SolverCategory::Category cat, std::unique_ptr<Interface> prec, Dune::Amg::SequentialInformation, Dune::PriorityTag<2>)
{
assert(cat == Dune::SolverCategory::sequential);
return std::move(prec);
return prec;
}
template <class Comm>
......@@ -131,7 +131,7 @@ namespace AMDiS
switch (cat)
{
case Dune::SolverCategory::sequential:
return std::move(prec);
return prec;
#if HAVE_MPI
case Dune::SolverCategory::overlapping:
{
......
......@@ -58,10 +58,10 @@ namespace AMDiS
// Always contains one int, the rank
template <class Entity>
std::size_t size(Entity const& e) const { return 1; }
std::size_t size(Entity const& /*e*/) const { return 1; }
template <class MessageBuffer, class Entity>
void gather(MessageBuffer& buff, Entity const& e) const
void gather(MessageBuffer& buff, Entity const& /*e*/) const
{
buff.write(myrank_);
}
......
Supports Markdown
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