Commit 4bf4338f authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/virtual_override_final' into 'develop'

use exactly one of virtual, override, or final.

See merge request !86
parents c908be0b 6eb2e6bc
Pipeline #1760 canceled with stage
......@@ -47,8 +47,8 @@ namespace AMDiS
}
/// Implementation of \ref RunnerBase::solve()
virtual int solve(Matrix const& A, Vector& x, Vector const& b,
SolverInfo& solverInfo) override
int solve(Matrix const& A, Vector& x, Vector const& b,
SolverInfo& solverInfo) override
{
AMDIS_FUNCNAME("Umfpack_Runner::solve()");
test_exit(bool(solver_), "The umfpack solver was not initialized\n");
......@@ -71,7 +71,7 @@ namespace AMDiS
}
/// Implementation of \ref RunnerInterface::exit()
virtual void exit() override {}
void exit() override {}
protected:
std::shared_ptr<SolverType> solver_;
......@@ -98,7 +98,7 @@ namespace AMDiS
{}
/// Implementation of \ref RunnerInterface::init()
virtual void init(FullMatrix const& fullMatrix) override
void init(FullMatrix const& fullMatrix) override
{
try {
Super::solver_.reset(new SolverType(fullMatrix, Super::symmetricStrategy_, Super::allocInit_));
......
......@@ -54,14 +54,14 @@ namespace AMDiS
"Polynomial order of GridFunction can not be extracted. Provide an explicit order parameter instead.");
public:
virtual void bind(LocalFunction const& localFct) final
void bind(LocalFunction const& localFct) final
{
order_ = Dune::Hybrid::ifElse(Concept{},
[&](auto id) { return AMDiS::order(id(localFct)); },
[] (auto) { return -1; });
}
virtual int order() const final { return order_; }
int order() const final { return order_; }
private:
int order_ = -1;
......@@ -106,9 +106,9 @@ namespace AMDiS
, qt_(qt)
{}
virtual int order() const final { return order_; }
int order() const final { return order_; }
virtual QuadratureRule const& rule(Dune::GeometryType const& type, int degree) const final
QuadratureRule const& rule(Dune::GeometryType const& type, int degree) const final
{
using QuadratureRules = Dune::QuadratureRules<ctype, dimension>;
return QuadratureRules::rule(type, degree, qt_);
......@@ -159,7 +159,7 @@ namespace AMDiS
: rule_(rule)
{}
virtual QuadratureRule const& rule(Dune::GeometryType const& /*type*/, int /*degree*/) const final
QuadratureRule const& rule(Dune::GeometryType const& /*type*/, int /*degree*/) const final
{
return rule_;
}
......
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