Merge pull request #3685 from joakim-hove/sim-update

Use struct SimulatorUpdate as return type from Schedule::applyAction
This commit is contained in:
Joakim Hove 2021-11-11 14:58:58 +01:00 committed by GitHub
commit 7b038ba376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1319,9 +1319,9 @@ public:
const auto& wellpi = this->fetchWellPI(reportStep, *action, schedule, matching_wells);
auto affected_wells = schedule.applyAction(reportStep, TimeService::from_time_t(simTime), *action, actionResult, wellpi);
this->wellModel_.updateEclWells(reportStep, affected_wells, summaryState);
if (!affected_wells.empty())
auto sim_update = schedule.applyAction(reportStep, TimeService::from_time_t(simTime), *action, actionResult, wellpi);
this->wellModel_.updateEclWells(reportStep, sim_update.affected_wells, summaryState);
if (!sim_update.affected_wells.empty())
commit_wellstate = true;
actionState.add_run(*action, simTime, std::move(actionResult));
} else {