Add call to evaluate PYACTION in eclproblem::applyActions()

This commit is contained in:
Joakim Hove 2020-04-13 07:43:16 +02:00
parent 6b72227b3b
commit 5a09624ad6

View File

@ -991,9 +991,11 @@ public:
eclWriter_->evalSummaryState(isSubStep);
auto& schedule = simulator.vanguard().schedule();
auto& ecl_state = simulator.vanguard().eclState();
int episodeIdx = simulator.episodeIndex();
this->applyActions(episodeIdx,
simulator.time() + simulator.timeStepSize(),
ecl_state,
schedule,
simulator.vanguard().summaryState());
}
@ -1058,8 +1060,9 @@ public:
void applyActions(int reportStep,
double sim_time,
Opm::EclipseState& ecl_state,
Opm::Schedule& schedule,
const Opm::SummaryState& summaryState) {
Opm::SummaryState& summaryState) {
const auto& actions = schedule.actions(reportStep);
if (actions.empty())
return;
@ -1076,6 +1079,10 @@ public:
ts = os.str();
}
for (const auto& pyaction : actions.pending_python()) {
pyaction->run(ecl_state, schedule, reportStep, summaryState);
}
auto simTime = schedule.simTime(reportStep);
for (const auto& action : actions.pending(simTime)) {
auto actionResult = action->eval(simTime, context);