mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #3521 from totto82/avoidAvg
only compute fip avg pressure when gpmaint
This commit is contained in:
commit
09cf878649
@ -207,10 +207,12 @@ namespace Opm {
|
|||||||
rateConverter_->template defineState<ElementContext>(ebosSimulator_);
|
rateConverter_->template defineState<ElementContext>(ebosSimulator_);
|
||||||
|
|
||||||
// Compute regional average pressures used by gpmaint
|
// Compute regional average pressures used by gpmaint
|
||||||
const auto& fp = this->eclState_.fieldProps();
|
if (schedule_[timeStepIdx].has_gpmaint()) {
|
||||||
const auto& fipnum = fp.get_int("FIPNUM");
|
const auto& fp = this->eclState_.fieldProps();
|
||||||
regionalAveragePressureCalculator_.reset(new AverageRegionalPressureType (phase_usage_,fipnum));
|
const auto& fipnum = fp.get_int("FIPNUM");
|
||||||
regionalAveragePressureCalculator_->template defineState<ElementContext>(ebosSimulator_);
|
regionalAveragePressureCalculator_.reset(new AverageRegionalPressureType (phase_usage_,fipnum));
|
||||||
|
regionalAveragePressureCalculator_->template defineState<ElementContext>(ebosSimulator_);
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
const auto& sched_state = this->schedule()[timeStepIdx];
|
const auto& sched_state = this->schedule()[timeStepIdx];
|
||||||
@ -463,11 +465,12 @@ namespace Opm {
|
|||||||
// update the rate converter with current averages pressures etc in
|
// update the rate converter with current averages pressures etc in
|
||||||
rateConverter_->template defineState<ElementContext>(ebosSimulator_);
|
rateConverter_->template defineState<ElementContext>(ebosSimulator_);
|
||||||
|
|
||||||
regionalAveragePressureCalculator_->template defineState<ElementContext>(ebosSimulator_);
|
|
||||||
const Group& fieldGroup = schedule_.getGroup("FIELD", reportStepIdx);
|
const Group& fieldGroup = schedule_.getGroup("FIELD", reportStepIdx);
|
||||||
WellGroupHelpers::updateGpMaintTargetForGroups(fieldGroup,
|
if (schedule_[reportStepIdx].has_gpmaint()) {
|
||||||
schedule_, *regionalAveragePressureCalculator_, reportStepIdx, dt, this->wellState(), this->groupState());
|
regionalAveragePressureCalculator_->template defineState<ElementContext>(ebosSimulator_);
|
||||||
|
WellGroupHelpers::updateGpMaintTargetForGroups(fieldGroup,
|
||||||
|
schedule_, *regionalAveragePressureCalculator_, reportStepIdx, dt, this->wellState(), this->groupState());
|
||||||
|
}
|
||||||
|
|
||||||
// calculate the well potentials
|
// calculate the well potentials
|
||||||
try {
|
try {
|
||||||
|
Loading…
Reference in New Issue
Block a user