Skip to content

Commit

Permalink
Merge pull request OPM#5614 from akva2/janitoring_clang
Browse files Browse the repository at this point in the history
Quell some clang warnings
  • Loading branch information
bska authored Sep 17, 2024
2 parents 32886f6 + 048ae50 commit 7ae70ef
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions flowexperimental/comp/flowexp_comp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,11 @@ namespace Opm{
void beginIteration(){};
// add the water rate due to aquifers to the source term.
template<class RateVector, class Context>
void addToSource(RateVector& rates, const Context& context, unsigned spaceIdx, unsigned timeIdx) const{};
void addToSource(RateVector& /*rates*/, const Context& /*context*/,
unsigned /*spaceIdx*/, unsigned /*timeIdx*/) const {}
template<class RateVector>
void addToSource(RateVector& rates, unsigned globalSpaceIdx, unsigned timeIdx) const{};
void addToSource(RateVector& /*rates*/, unsigned /*globalSpaceIdx*/,
unsigned /*timeIdx*/) const {}
void endIteration()const{};
void endTimeStep(){};
void endEpisode(){};
Expand Down
2 changes: 2 additions & 0 deletions opm/simulators/flow/FlowProblem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ class FlowProblem : public GetPropType<TypeTag, Properties::BaseProblem>
relpermDiagnostics.diagnosis(vanguard.eclState(), vanguard.cartesianIndexMapper());
}

virtual ~FlowProblem() = default;

void prefetch(const Element& elem) const
{ pffDofData_.prefetch(elem); }

Expand Down
2 changes: 1 addition & 1 deletion opm/simulators/flow/FlowProblemBlackoil.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@ class FlowProblemBlackoil : public FlowProblem<TypeTag>
this->eclWriter_->endRestart();
}

void readEquilInitialCondition_()
void readEquilInitialCondition_() override
{
const auto& simulator = this->simulator();

Expand Down
6 changes: 3 additions & 3 deletions opm/simulators/flow/FlowProblemComp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ class FlowProblemComp : public FlowProblem<TypeTag>
values.assignNaive(fs);
}

void addToSourceDense(RateVector&, unsigned, unsigned) const
void addToSourceDense(RateVector&, unsigned, unsigned) const override
{
// we do nothing for now
}
Expand All @@ -326,7 +326,7 @@ class FlowProblemComp : public FlowProblem<TypeTag>
// we do nothing here for now
}

void readEquilInitialCondition_()
void readEquilInitialCondition_() override
{
throw std::logic_error("Equilibration is not supported by compositional modeling yet");
}
Expand All @@ -336,7 +336,7 @@ class FlowProblemComp : public FlowProblem<TypeTag>
throw std::logic_error("Restarting is not supported by compositional modeling yet");
}

void readExplicitInitialCondition_()
void readExplicitInitialCondition_() override
{
readExplicitInitialConditionCompositional_();
}
Expand Down

0 comments on commit 7ae70ef

Please sign in to comment.