From 4418fcc477c8baf26dd9a9c1beb19abcbe9aa8ea Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Thu, 20 May 2021 11:19:14 +0200 Subject: [PATCH] Move phase access --- opm/simulators/wells/WellState.hpp | 11 +---------- .../wells/WellStateFullyImplicitBlackoil.hpp | 10 +++++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/opm/simulators/wells/WellState.hpp b/opm/simulators/wells/WellState.hpp index a6615a85c..8a46577a5 100644 --- a/opm/simulators/wells/WellState.hpp +++ b/opm/simulators/wells/WellState.hpp @@ -100,15 +100,6 @@ public: - /// The number of phases present. - int numPhases() const - { - return this->phase_usage_.num_phases; - } - - const PhaseUsage& phaseUsage() const { - return this->phase_usage_; - } protected: WellContainer status_; @@ -118,9 +109,9 @@ protected: std::vector bhp_; std::vector thp_; WellContainer> wellrates_; + PhaseUsage phase_usage_; private: - PhaseUsage phase_usage_; std::vector temperature_; WellContainer> perfrates_; WellContainer> perfpress_; diff --git a/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp b/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp index b70e5f199..ac0bc2d4f 100644 --- a/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp +++ b/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp @@ -63,7 +63,6 @@ public: using BaseType :: wellRates; using BaseType :: bhp; using BaseType :: perfPress; - using BaseType :: numPhases; explicit WellStateFullyImplicitBlackoil(const PhaseUsage& pu) : WellState(pu) @@ -402,6 +401,15 @@ public: void shutWell(int well_index); void stopWell(int well_index); + /// The number of phases present. + int numPhases() const + { + return this->phase_usage_.num_phases; + } + + const PhaseUsage& phaseUsage() const { + return this->phase_usage_; + } private: std::vector perfphaserates_;