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

TargetCalculator: remove unused wellstate member

Browse Source
This commit is contained in:
Arne Morten Kvarving 2021-04-30 08:38:45 +02:00
parent dae6b61370
commit 8ff32b594a
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/wells/TargetCalculator.hpp
View File

@ -174,7 +174,6 @@ namespace WellGroupHelpers
const std::vector<double>& resv_coeff, const std::vector<double>& resv_coeff,
const std::string& group_name, const std::string& group_name,
const double sales_target, const double sales_target,
const WellStateFullyImplicitBlackoil& well_state,
const GroupState& group_state, const GroupState& group_state,
const Phase& injection_phase, const Phase& injection_phase,
DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
@ -183,7 +182,6 @@ namespace WellGroupHelpers
, resv_coeff_(resv_coeff) , resv_coeff_(resv_coeff)
, group_name_(group_name) , group_name_(group_name)
, sales_target_(sales_target) , sales_target_(sales_target)
, well_state_(well_state)
, group_state_(group_state) , group_state_(group_state)
{ {
// initialize to avoid warning // initialize to avoid warning
@ -282,7 +280,6 @@ namespace WellGroupHelpers
const std::vector<double>& resv_coeff_; const std::vector<double>& resv_coeff_;
const std::string& group_name_; const std::string& group_name_;
double sales_target_; double sales_target_;
const WellStateFullyImplicitBlackoil& well_state_;
const GroupState& group_state_; const GroupState& group_state_;
int pos_; int pos_;
GuideRateModel::Target target_; GuideRateModel::Target target_;

2
opm/simulators/wells/WellGroupHelpers.cpp
View File

@ -1151,7 +1151,7 @@ namespace WellGroupHelpers
const auto& gconsale = schedule[reportStepIdx].gconsale().get(group.name(), summaryState); const auto& gconsale = schedule[reportStepIdx].gconsale().get(group.name(), summaryState);
sales_target = gconsale.sales_target; sales_target = gconsale.sales_target;
} }
InjectionTargetCalculator tcalc(currentGroupControl, pu, resv_coeff, group.name(), sales_target, wellState, group_state, injectionPhase, deferred_logger); InjectionTargetCalculator tcalc(currentGroupControl, pu, resv_coeff, group.name(), sales_target, group_state, injectionPhase, deferred_logger);
FractionCalculator fcalc(schedule, summaryState, wellState, group_state, reportStepIdx, guideRate, tcalc.guideTargetMode(), pu, false, injectionPhase); FractionCalculator fcalc(schedule, summaryState, wellState, group_state, reportStepIdx, guideRate, tcalc.guideTargetMode(), pu, false, injectionPhase);
auto localFraction = [&](const std::string& child) { return fcalc.localFraction(child, name); }; auto localFraction = [&](const std::string& child) { return fcalc.localFraction(child, name); };

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

@ -2242,7 +2242,7 @@ namespace Opm
const auto& gconsale = schedule[current_step_].gconsale().get(group.name(), summaryState); const auto& gconsale = schedule[current_step_].gconsale().get(group.name(), summaryState);
sales_target = gconsale.sales_target; sales_target = gconsale.sales_target;
} }
WellGroupHelpers::InjectionTargetCalculator tcalc(currentGroupControl, pu, resv_coeff, group.name(), sales_target, well_state, group_state, injectionPhase, deferred_logger); WellGroupHelpers::InjectionTargetCalculator tcalc(currentGroupControl, pu, resv_coeff, group.name(), sales_target, group_state, injectionPhase, deferred_logger);
WellGroupHelpers::FractionCalculator fcalc(schedule, summaryState, well_state, group_state, current_step_, guide_rate_, tcalc.guideTargetMode(), pu, false, injectionPhase); WellGroupHelpers::FractionCalculator fcalc(schedule, summaryState, well_state, group_state, current_step_, guide_rate_, tcalc.guideTargetMode(), pu, false, injectionPhase);
auto localFraction = [&](const std::string& child) { auto localFraction = [&](const std::string& child) {