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

BlackoilWellModel: mutate well_container_ directly in createWellContainer

Browse Source
This commit is contained in:
Arne Morten Kvarving
2021-06-07 14:49:41 +02:00
parent 2c5942595c
commit 7219f09fdc
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/wells/BlackoilWellModel.hpp
View File

@@ -279,7 +279,7 @@ namespace Opm {
const SummaryState& summaryState); const SummaryState& summaryState);
// create the well container // create the well container
std::vector<WellInterfacePtr > createWellContainer(const int time_step); void createWellContainer(const int time_step);
WellInterfacePtr WellInterfacePtr
createWellPointer(const int wellID, createWellPointer(const int wellID,

20
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@@ -244,7 +244,7 @@ namespace Opm {
wellTesting(reportStepIdx, simulationTime, local_deferredLogger); wellTesting(reportStepIdx, simulationTime, local_deferredLogger);
// create the well container // create the well container
well_container_ = createWellContainer(reportStepIdx); createWellContainer(reportStepIdx);
// do the initialization for all the wells // do the initialization for all the wells
// TODO: to see whether we can postpone of the intialization of the well containers to // TODO: to see whether we can postpone of the intialization of the well containers to
@@ -570,18 +570,18 @@ namespace Opm {
template<typename TypeTag> template<typename TypeTag>
std::vector<typename BlackoilWellModel<TypeTag>::WellInterfacePtr > void
BlackoilWellModel<TypeTag>:: BlackoilWellModel<TypeTag>::
createWellContainer(const int time_step) createWellContainer(const int time_step)
{ {
std::vector<WellInterfacePtr> well_container;
DeferredLogger local_deferredLogger; DeferredLogger local_deferredLogger;
const int nw = numLocalWells(); const int nw = numLocalWells();
well_container_.clear();
if (nw > 0) { if (nw > 0) {
well_container.reserve(nw); well_container_.reserve(nw);
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
const Well& well_ecl = wells_ecl_[w]; const Well& well_ecl = wells_ecl_[w];
@@ -688,10 +688,10 @@ namespace Opm {
wellIsStopped = true; wellIsStopped = true;
} }
well_container.emplace_back(this->createWellPointer(w, time_step)); well_container_.emplace_back(this->createWellPointer(w, time_step));
if (wellIsStopped) if (wellIsStopped)
well_container.back()->stopWell(); well_container_.back()->stopWell();
} }
} }
@@ -702,10 +702,8 @@ namespace Opm {
} }
well_container_generic_.clear(); well_container_generic_.clear();
for (auto& w : well_container) for (auto& w : well_container_)
well_container_generic_.push_back(w.get()); well_container_generic_.push_back(w.get());
return well_container;
} }
@@ -1551,7 +1549,7 @@ namespace Opm {
auto saved_previous_wgstate = this->prevWGState(); auto saved_previous_wgstate = this->prevWGState();
this->commitWGState(); this->commitWGState();
this->well_container_ = this->createWellContainer(timeStepIdx); this->createWellContainer(timeStepIdx);
this->inferLocalShutWells(); this->inferLocalShutWells();
this->initWellContainer(); this->initWellContainer();