From 4186a37563dec9edd59a17f0ecc2a3c1bc74eebc Mon Sep 17 00:00:00 2001 From: Anders Matheson Date: Tue, 20 Sep 2016 09:41:20 +0200 Subject: [PATCH 1/2] Pass PhaseUsage to WellState::report --- opm/core/simulator/WellState.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opm/core/simulator/WellState.hpp b/opm/core/simulator/WellState.hpp index 7fc82cc1..197a8226 100644 --- a/opm/core/simulator/WellState.hpp +++ b/opm/core/simulator/WellState.hpp @@ -34,6 +34,7 @@ namespace Opm { + class PhaseUsage; /// The state of a set of wells. class WellState @@ -212,7 +213,7 @@ namespace Opm return wellRates().size() / numWells(); } - virtual data::Wells report() const + virtual data::Wells report(const PhaseUsage &pu) const { return { { /* WellState offers no completion data, so that has to be added later */ }, this->bhp(), From 18a5c0b748f065a309a6781bbe88a5c13fd29bdf Mon Sep 17 00:00:00 2001 From: Anders Matheson Date: Tue, 20 Sep 2016 09:58:10 +0200 Subject: [PATCH 2/2] Remove unused parameter warning --- opm/core/simulator/WellState.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/core/simulator/WellState.hpp b/opm/core/simulator/WellState.hpp index 197a8226..acadf7ef 100644 --- a/opm/core/simulator/WellState.hpp +++ b/opm/core/simulator/WellState.hpp @@ -213,7 +213,7 @@ namespace Opm return wellRates().size() / numWells(); } - virtual data::Wells report(const PhaseUsage &pu) const + virtual data::Wells report(const PhaseUsage&) const { return { { /* WellState offers no completion data, so that has to be added later */ }, this->bhp(),