From 23a8aed4e8bbf09f5f421e8a432f5bb1c45b1a25 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 9 Nov 2022 11:39:50 +0100 Subject: [PATCH] move getWQTotal to StandardWellPrimaryVariables --- opm/simulators/wells/StandardWellEval.hpp | 5 ----- opm/simulators/wells/StandardWellPrimaryVariables.hpp | 5 +++++ opm/simulators/wells/StandardWell_impl.hpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opm/simulators/wells/StandardWellEval.hpp b/opm/simulators/wells/StandardWellEval.hpp index 03b9662a6..d9f78b6b6 100644 --- a/opm/simulators/wells/StandardWellEval.hpp +++ b/opm/simulators/wells/StandardWellEval.hpp @@ -73,11 +73,6 @@ protected: const WellInterfaceIndices& baseif_; - const EvalWell& getWQTotal() const - { - return primary_variables_.evaluation_[WQTotal]; - } - EvalWell extendEval(const Eval& in) const; // computing the accumulation term for later use in well mass equations diff --git a/opm/simulators/wells/StandardWellPrimaryVariables.hpp b/opm/simulators/wells/StandardWellPrimaryVariables.hpp index 9f5885666..9e576ae1c 100644 --- a/opm/simulators/wells/StandardWellPrimaryVariables.hpp +++ b/opm/simulators/wells/StandardWellPrimaryVariables.hpp @@ -139,6 +139,11 @@ public: return evaluation_[Bhp]; } + const EvalWell& getWQTotal() const + { + return evaluation_[WQTotal]; + } + private: //! \brief Calculate a relaxation factor for producers. //! \details To avoid overshoot of the fractions which might result in negative rates. diff --git a/opm/simulators/wells/StandardWell_impl.hpp b/opm/simulators/wells/StandardWell_impl.hpp index 3acdd5b1c..06323e027 100644 --- a/opm/simulators/wells/StandardWell_impl.hpp +++ b/opm/simulators/wells/StandardWell_impl.hpp @@ -547,7 +547,7 @@ namespace Opm assembleControlEq(well_state, group_state, schedule, summaryState, this->primary_variables_.numWellEq(), - this->getWQTotal(), + this->primary_variables_.getWQTotal(), this->primary_variables_.getBhp(), gQ, this->getRho(),