OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3295 from joakim-hove/wellstate-reorder

Browse Source 
Assemble all non-wellcontainer WellState members
This commit is contained in:
Joakim Hove 2021-05-25 11:02:01 +02:00 committed by GitHub
commit b8ccdaa106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
opm/simulators/wells/WellState.hpp
View File

@ -440,10 +440,17 @@ public:
private:
WellMapType wellMap_;
// Use of std::optional<> here is a technical crutch, the
// WellStateFullyImplicitBlackoil class should be default constructible,
// whereas the GlobalWellInfo is not.
std::optional<GlobalWellInfo> global_well_info;
ALQState alq_state;
bool do_glift_optimization_;
WellContainer<Well::Status> status_;
WellContainer<std::vector<PerforationData>> well_perf_data_;
WellContainer<const ParallelWellInfo*> parallel_well_info_;
WellMapType wellMap_;
std::vector<double> bhp_;
std::vector<double> thp_;
std::vector<double> temperature_;
@ -463,14 +470,8 @@ private:
WellContainer<Opm::Well::InjectorCMode> current_injection_controls_;
WellContainer<Well::ProducerCMode> current_production_controls_;
// Use of std::optional<> here is a technical crutch, the
// WellStateFullyImplicitBlackoil class should be default constructible,
// whereas the GlobalWellInfo is not.
std::optional<GlobalWellInfo> global_well_info;
std::map<std::string, std::pair<bool, std::vector<double>>> well_rates;
ALQState alq_state;
bool do_glift_optimization_;
std::vector<double> perfRateSolvent_;