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 #2528 from joakim-hove/apply-pyaction

Browse Source 
Add call to evaluate PYACTION in eclproblem::applyActions()
This commit is contained in:
Joakim Hove 2020-04-14 19:06:15 +02:00 committed by GitHub
commit 02aab06363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ebos/eclproblem.hh
View File

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