Silence override and member order warnings.

This commit is contained in:
Atgeirr Flø Rasmussen authored and Markus Blatt committed 2019-04-10 14:40:46 +02:00
1 parent 29837be2e3
commit 5f4f8b71a8
4 files changed
+17 -17

No files matched your search

+5 -5
View File
@@ -408,7 +408,7 @@ private:
}
#endif
void apply(X& x, X& b, double reduction, Dune::InverseOperatorResult& res)
void apply(X& x, X& b, double reduction, Dune::InverseOperatorResult& res) override
{
DUNE_UNUSED_PARAMETER(reduction);
DUNE_UNUSED_PARAMETER(res);
@@ -518,7 +518,7 @@ private:
#endif
}
void apply(X& x, X& b, Dune::InverseOperatorResult& res)
void apply(X& x, X& b, Dune::InverseOperatorResult& res) override
{
return apply(x,b,1e-8,res);
}
@@ -1022,18 +1022,18 @@ public:
{}
void pre(typename TwoLevelMethod::FineDomainType& x,
typename TwoLevelMethod::FineRangeType& b)
typename TwoLevelMethod::FineRangeType& b) override
{
twoLevelMethod_.pre(x,b);
}
void post(typename TwoLevelMethod::FineDomainType& x)
void post(typename TwoLevelMethod::FineDomainType& x) override
{
twoLevelMethod_.post(x);
}
void apply(typename TwoLevelMethod::FineDomainType& v,
const typename TwoLevelMethod::FineRangeType& d)
const typename TwoLevelMethod::FineRangeType& d) override
{
auto scaledD = d;
Detail::scaleVectorDRS(scaledD, COMPONENT_INDEX, param_, weights_);
+6 -6
View File
@@ -287,7 +287,7 @@ namespace Opm
const Criterion& crit,
const typename AMGType::SmootherArgs& args,
const Communication& comm)
: param_(param), amg_(),crit_(crit), op_(op),args_(args), comm_(comm)
: param_(param), amg_(), op_(op), crit_(crit), args_(args), comm_(comm)
{
amg_.reset(new AMGType(op, crit,args, comm));
}
@@ -308,7 +308,7 @@ namespace Opm
#endif
void apply(X& x, X& b, double reduction, Dune::InverseOperatorResult& res)
void apply(X& x, X& b, double reduction, Dune::InverseOperatorResult& res) override
{
DUNE_UNUSED_PARAMETER(reduction);
DUNE_UNUSED_PARAMETER(res);
@@ -380,7 +380,7 @@ namespace Opm
#endif
}
void apply(X& x, X& b, Dune::InverseOperatorResult& res)
void apply(X& x, X& b, Dune::InverseOperatorResult& res) override
{
return apply(x,b,1e-8,res);
}
@@ -561,18 +561,18 @@ namespace Opm
}
void pre(typename TwoLevelMethod::FineDomainType& x,
typename TwoLevelMethod::FineRangeType& b)
typename TwoLevelMethod::FineRangeType& b) override
{
twoLevelMethod_.pre(x,b);
}
void post(typename TwoLevelMethod::FineDomainType& x)
void post(typename TwoLevelMethod::FineDomainType& x) override
{
twoLevelMethod_.post(x);
}
void apply(typename TwoLevelMethod::FineDomainType& v,
const typename TwoLevelMethod::FineRangeType& d)
const typename TwoLevelMethod::FineRangeType& d) override
{
auto scaledD = d;
Detail::scaleVectorDRS(scaledD, COMPONENT_INDEX, param_, weights_);
+3 -3
View File
@@ -130,7 +130,7 @@ public:
#endif
}
virtual void apply( const X& x, Y& y ) const
virtual void apply( const X& x, Y& y ) const override
{
A_.mv( x, y );
@@ -144,7 +144,7 @@ public:
}
// y += \alpha * A * x
virtual void applyscaleadd (field_type alpha, const X& x, Y& y) const
virtual void applyscaleadd (field_type alpha, const X& x, Y& y) const override
{
A_.usmv(alpha,x,y);
@@ -157,7 +157,7 @@ public:
#endif
}
virtual const matrix_type& getmat() const { return A_for_precond_; }
virtual const matrix_type& getmat() const override { return A_for_precond_; }
communication_type* comm()
{
+3 -3
View File
@@ -724,7 +724,7 @@ public:
\copydoc Preconditioner::pre(X&,Y&)
*/
virtual void pre (Domain& x, Range& b)
virtual void pre (Domain& x, Range& b) override
{
DUNE_UNUSED_PARAMETER(x);
DUNE_UNUSED_PARAMETER(b);
@@ -735,7 +735,7 @@ public:
\copydoc Preconditioner::apply(X&,const Y&)
*/
virtual void apply (Domain& v, const Range& d)
virtual void apply (Domain& v, const Range& d) override
{
Range& md = reorderD(d);
Domain& mv = reorderV(v);
@@ -806,7 +806,7 @@ public:
\copydoc Preconditioner::post(X&)
*/
virtual void post (Range& x)
virtual void post (Range& x) override
{
DUNE_UNUSED_PARAMETER(x);
}