Move phase access

This commit is contained in:
Joakim Hove
2021-05-20 11:19:14 +02:00
parent 7cb7b0eb82
commit 4418fcc477
2 changed files with 10 additions and 11 deletions

View File

@@ -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: protected:
WellContainer<Well::Status> status_; WellContainer<Well::Status> status_;
@@ -118,9 +109,9 @@ protected:
std::vector<double> bhp_; std::vector<double> bhp_;
std::vector<double> thp_; std::vector<double> thp_;
WellContainer<std::vector<double>> wellrates_; WellContainer<std::vector<double>> wellrates_;
PhaseUsage phase_usage_;
private: private:
PhaseUsage phase_usage_;
std::vector<double> temperature_; std::vector<double> temperature_;
WellContainer<std::vector<double>> perfrates_; WellContainer<std::vector<double>> perfrates_;
WellContainer<std::vector<double>> perfpress_; WellContainer<std::vector<double>> perfpress_;

View File

@@ -63,7 +63,6 @@ public:
using BaseType :: wellRates; using BaseType :: wellRates;
using BaseType :: bhp; using BaseType :: bhp;
using BaseType :: perfPress; using BaseType :: perfPress;
using BaseType :: numPhases;
explicit WellStateFullyImplicitBlackoil(const PhaseUsage& pu) : explicit WellStateFullyImplicitBlackoil(const PhaseUsage& pu) :
WellState(pu) WellState(pu)
@@ -402,6 +401,15 @@ public:
void shutWell(int well_index); void shutWell(int well_index);
void stopWell(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: private:
std::vector<double> perfphaserates_; std::vector<double> perfphaserates_;