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 #3380 from joakim-hove/guiderate-value

Browse Source 
Use GuideRate value instead of std::unique_ptr<GuideRate>
This commit is contained in:
Joakim Hove 2021-06-14 15:52:08 +02:00 committed by GitHub
commit 166907c45d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
opm/simulators/wells/BlackoilWellModelGeneric.cpp
View File

@ -55,12 +55,11 @@ BlackoilWellModelGeneric(Schedule& schedule,
, eclState_(eclState) , eclState_(eclState)
, comm_(comm) , comm_(comm)
, phase_usage_(phase_usage) , phase_usage_(phase_usage)
, guideRate_(schedule)
, active_wgstate_(phase_usage) , active_wgstate_(phase_usage)
, last_valid_wgstate_(phase_usage) , last_valid_wgstate_(phase_usage)
, nupcol_wgstate_(phase_usage) , nupcol_wgstate_(phase_usage)
{ {
// Create the guide rate container.
this->guideRate_ = std::make_unique<GuideRate>(schedule_);
const auto numProcs = comm_.size(); const auto numProcs = comm_.size();
this->not_on_process_ = [this, numProcs](const Well& well) { this->not_on_process_ = [this, numProcs](const Well& well) {
@ -796,7 +795,7 @@ checkGroupHigherConstraints(const Group& group,
this->wellState(), this->wellState(),
this->groupState(), this->groupState(),
reportStepIdx, reportStepIdx,
guideRate_.get(), &guideRate_,
rates.data(), rates.data(),
phase, phase,
phase_usage_, phase_usage_,
@ -833,7 +832,7 @@ checkGroupHigherConstraints(const Group& group,
this->wellState(), this->wellState(),
this->groupState(), this->groupState(),
reportStepIdx, reportStepIdx,
guideRate_.get(), &guideRate_,
rates.data(), rates.data(),
phase_usage_, phase_usage_,
group.getGroupEfficiencyFactor(), group.getGroupEfficiencyFactor(),
@ -1150,7 +1149,7 @@ getGuideRateValues(const Well& well) const
return grval; return grval;
} }
if (!this->guideRate_->has(wname)) { if (!this->guideRate_.has(wname)) {
// No guiderates exist for 'wname'. // No guiderates exist for 'wname'.
return grval; return grval;
} }
@ -1172,7 +1171,7 @@ getGuideRateValues(const GuideRate::RateVector& qs,
{ {
auto getGR = [this, &wgname, &qs](const GuideRateModel::Target t) auto getGR = [this, &wgname, &qs](const GuideRateModel::Target t)
{ {
return this->guideRate_->get(wgname, t, qs); return this->guideRate_.get(wgname, t, qs);
}; };
// Note: GuideRate does currently (2020-07-20) not support Target::RES. // Note: GuideRate does currently (2020-07-20) not support Target::RES.
@ -1194,9 +1193,6 @@ BlackoilWellModelGeneric::
getGuideRateValues(const Group& group) const getGuideRateValues(const Group& group) const
{ {
auto grval = data::GuideRateValue{}; auto grval = data::GuideRateValue{};
assert (this->guideRate_ != nullptr);
const auto& gname = group.name(); const auto& gname = group.name();
if (!this->groupState().has_production_rates(gname)) { if (!this->groupState().has_production_rates(gname)) {
@ -1206,7 +1202,7 @@ getGuideRateValues(const Group& group) const
return grval; return grval;
} }
if (!this->guideRate_->has(gname)) { if (!this->guideRate_.has(gname)) {
// No guiderates exist for 'gname'. // No guiderates exist for 'gname'.
return grval; return grval;
} }
@ -1228,13 +1224,13 @@ getGuideRateInjectionGroupValues(const Group& group) const
assert (this->guideRate_ != nullptr); assert (this->guideRate_ != nullptr);
const auto& gname = group.name(); const auto& gname = group.name();
if (this->guideRate_->has(gname, Phase::GAS)) { if (this->guideRate_.has(gname, Phase::GAS)) {
grval.set(data::GuideRateValue::Item::Gas, grval.set(data::GuideRateValue::Item::Gas,
this->guideRate_->get(gname, Phase::GAS)); this->guideRate_.get(gname, Phase::GAS));
} }
if (this->guideRate_->has(gname, Phase::WATER)) { if (this->guideRate_.has(gname, Phase::WATER)) {
grval.set(data::GuideRateValue::Item::Water, grval.set(data::GuideRateValue::Item::Water,
this->guideRate_->get(gname, Phase::WATER)); this->guideRate_.get(gname, Phase::WATER));
} }
return grval; return grval;
} }
@ -1309,7 +1305,7 @@ calculateAllGroupGuiderates(const int reportStepIdx) const
for (const auto& wname : schedule_.wellNames(reportStepIdx)) { for (const auto& wname : schedule_.wellNames(reportStepIdx)) {
if (! (this->wellState().hasWellRates(wname) && if (! (this->wellState().hasWellRates(wname) &&
this->guideRate_->has(wname))) this->guideRate_.has(wname)))
{ {
continue; continue;
} }
@ -1346,12 +1342,12 @@ calculateAllGroupGuiderates(const int reportStepIdx) const
const auto& gname = up[start + gi]; const auto& gname = up[start + gi];
const auto& group = schedule_.getGroup(gname, reportStepIdx); const auto& group = schedule_.getGroup(gname, reportStepIdx);
if (this->guideRate_->has(gname)) { if (this->guideRate_.has(gname)) {
gr[gname].production = this->getGuideRateValues(group); gr[gname].production = this->getGuideRateValues(group);
} }
if (this->guideRate_->has(gname, Phase::WATER) if (this->guideRate_.has(gname, Phase::WATER)
|| this->guideRate_->has(gname, Phase::GAS)) { || this->guideRate_.has(gname, Phase::GAS)) {
gr[gname].injection = this->getGuideRateInjectionGroupValues(group); gr[gname].injection = this->getGuideRateInjectionGroupValues(group);
} }
@ -1416,7 +1412,7 @@ assignGroupGuideRates(const Group& group,
auto xgrPos = groupGuideRates.find(group.name()); auto xgrPos = groupGuideRates.find(group.name());
if ((xgrPos == groupGuideRates.end()) || if ((xgrPos == groupGuideRates.end()) ||
!this->guideRate_->has(group.name())) !this->guideRate_.has(group.name()))
{ {
// No guiderates defined for this group. // No guiderates defined for this group.
return; return;
@ -1487,9 +1483,9 @@ updateAndCommunicateGroupData(const int reportStepIdx,
// the group target reduction rates needs to be update since wells may have switched to/from GRUP control // the group target reduction rates needs to be update since wells may have switched to/from GRUP control
// Currently the group target reduction does not honor NUPCOL. TODO: is that true? // Currently the group target reduction does not honor NUPCOL. TODO: is that true?
std::vector<double> groupTargetReduction(numPhases(), 0.0); std::vector<double> groupTargetReduction(numPhases(), 0.0);
WellGroupHelpers::updateGroupTargetReduction(fieldGroup, schedule(), reportStepIdx, /*isInjector*/ false, phase_usage_, *guideRate_, well_state_nupcol, well_state, this->groupState(), groupTargetReduction); WellGroupHelpers::updateGroupTargetReduction(fieldGroup, schedule(), reportStepIdx, /*isInjector*/ false, phase_usage_, guideRate_, well_state_nupcol, well_state, this->groupState(), groupTargetReduction);
std::vector<double> groupTargetReductionInj(numPhases(), 0.0); std::vector<double> groupTargetReductionInj(numPhases(), 0.0);
WellGroupHelpers::updateGroupTargetReduction(fieldGroup, schedule(), reportStepIdx, /*isInjector*/ true, phase_usage_, *guideRate_, well_state_nupcol, well_state, this->groupState(), groupTargetReductionInj); WellGroupHelpers::updateGroupTargetReduction(fieldGroup, schedule(), reportStepIdx, /*isInjector*/ true, phase_usage_, guideRate_, well_state_nupcol, well_state, this->groupState(), groupTargetReductionInj);
WellGroupHelpers::updateREINForGroups(fieldGroup, schedule(), reportStepIdx, phase_usage_, summaryState_, well_state_nupcol, well_state, this->groupState()); WellGroupHelpers::updateREINForGroups(fieldGroup, schedule(), reportStepIdx, phase_usage_, summaryState_, well_state_nupcol, well_state, this->groupState());
WellGroupHelpers::updateVREPForGroups(fieldGroup, schedule(), reportStepIdx, well_state_nupcol, well_state, this->groupState()); WellGroupHelpers::updateVREPForGroups(fieldGroup, schedule(), reportStepIdx, well_state_nupcol, well_state, this->groupState());

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

@ -404,7 +404,7 @@ protected:
mutable std::unordered_set<std::string> closed_this_step_; mutable std::unordered_set<std::string> closed_this_step_;
WellTestState wellTestState_{}; WellTestState wellTestState_{};
std::unique_ptr<GuideRate> guideRate_; GuideRate guideRate_;
std::unique_ptr<VFPProperties> vfp_properties_{}; std::unique_ptr<VFPProperties> vfp_properties_{};
std::map<std::string, double> node_pressures_; // Storing network pressures for output. std::map<std::string, double> node_pressures_; // Storing network pressures for output.

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

@ -286,7 +286,7 @@ namespace Opm {
for (auto& well : well_container_) { for (auto& well : well_container_) {
well->setVFPProperties(vfp_properties_.get()); well->setVFPProperties(vfp_properties_.get());
well->setGuideRate(guideRate_.get()); well->setGuideRate(&guideRate_);
} }
// Close completions due to economical reasons // Close completions due to economical reasons
@ -322,9 +322,9 @@ namespace Opm {
const auto& summaryState = ebosSimulator_.vanguard().summaryState(); const auto& summaryState = ebosSimulator_.vanguard().summaryState();
std::vector<double> pot(numPhases(), 0.0); std::vector<double> pot(numPhases(), 0.0);
const Group& fieldGroup = schedule().getGroup("FIELD", reportStepIdx); const Group& fieldGroup = schedule().getGroup("FIELD", reportStepIdx);
WellGroupHelpers::updateGuideRateForProductionGroups(fieldGroup, schedule(), phase_usage_, reportStepIdx, simulationTime, this->wellState(), this->groupState(), comm, guideRate_.get(), pot); WellGroupHelpers::updateGuideRateForProductionGroups(fieldGroup, schedule(), phase_usage_, reportStepIdx, simulationTime, this->wellState(), this->groupState(), comm, &guideRate_, pot);
WellGroupHelpers::updateGuideRatesForInjectionGroups(fieldGroup, schedule(), summaryState, phase_usage_, reportStepIdx, this->wellState(), this->groupState(), guideRate_.get(), local_deferredLogger); WellGroupHelpers::updateGuideRatesForInjectionGroups(fieldGroup, schedule(), summaryState, phase_usage_, reportStepIdx, this->wellState(), this->groupState(), &guideRate_, local_deferredLogger);
WellGroupHelpers::updateGuideRatesForWells(schedule(), phase_usage_, reportStepIdx, simulationTime, this->wellState(), comm, guideRate_.get()); WellGroupHelpers::updateGuideRatesForWells(schedule(), phase_usage_, reportStepIdx, simulationTime, this->wellState(), comm, &guideRate_);
try { try {
// Compute initial well solution for new wells and injectors that change injection type i.e. WAG. // Compute initial well solution for new wells and injectors that change injection type i.e. WAG.
@ -397,7 +397,7 @@ namespace Opm {
well->setWellEfficiencyFactor(well_efficiency_factor); well->setWellEfficiencyFactor(well_efficiency_factor);
well->setVFPProperties(vfp_properties_.get()); well->setVFPProperties(vfp_properties_.get());
well->setGuideRate(guideRate_.get()); well->setGuideRate(&guideRate_);
const WellTestConfig::Reason testing_reason = testWell.second; const WellTestConfig::Reason testing_reason = testWell.second;