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 #2203 from joakim-hove/apply-action-output-update

Browse Source 
Update output from applyActions() to show date
This commit is contained in:
Atgeirr Flø Rasmussen
2019-12-03 09:02:02 +01:00
committed by GitHub
parent 0a6b5f0ea9 deb397cf0e
commit becb29cec6
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ebos/eclproblem.hh
View File

@@ -997,6 +997,7 @@ public:
int episodeIdx = simulator.episodeIndex(); int episodeIdx = simulator.episodeIndex();
this->applyActions(episodeIdx + 1, this->applyActions(episodeIdx + 1,
simulator.time() + simulator.timeStepSize(),
schedule, schedule,
simulator.vanguard().summaryState()); simulator.vanguard().summaryState());
@@ -1044,6 +1045,7 @@ public:
void applyActions(int reportStep, void applyActions(int reportStep,
double sim_time,
Opm::Schedule& schedule, Opm::Schedule& schedule,
const Opm::SummaryState& summaryState) { const Opm::SummaryState& summaryState) {
const auto& actions = schedule.actions(reportStep); const auto& actions = schedule.actions(reportStep);
@@ -1051,6 +1053,16 @@ public:
return; return;
Opm::Action::Context context( summaryState ); Opm::Action::Context context( summaryState );
auto now = Opm::TimeStampUTC( schedule.getStartTime() ) + std::chrono::duration<double>(sim_time);
std::string ts;
{
std::ostringstream os;
os << std::setw(4) << std::to_string(now.year()) << '/'
<< std::setw(2) << std::setfill('0') << std::to_string(now.month()) << '/'
<< std::setw(2) << std::setfill('0') << std::to_string(now.day()) << " report:" << std::to_string(reportStep);
ts = os.str();
}
auto simTime = schedule.simTime(reportStep); auto simTime = schedule.simTime(reportStep);
for (const auto& action : actions.pending(simTime)) { for (const auto& action : actions.pending(simTime)) {
@@ -1063,11 +1075,11 @@ public:
wells_string += matching_wells[iw] + ", "; wells_string += matching_wells[iw] + ", ";
wells_string += matching_wells.back(); wells_string += matching_wells.back();
} }
std::string msg = "The action: " + action->name() + " evaluated to true at report step: " + std::to_string(reportStep) + " wells: " + wells_string; std::string msg = "The action: " + action->name() + " evaluated to true at " + ts + " wells: " + wells_string;
Opm::OpmLog::info(msg); Opm::OpmLog::info(msg);
schedule.applyAction(reportStep, *action, actionResult); schedule.applyAction(reportStep, *action, actionResult);
} else { } else {
std::string msg = "The action: " + action->name() + " evaluated to false at report step: " + std::to_string(reportStep); std::string msg = "The action: " + action->name() + " evaluated to false at " + ts;
Opm::OpmLog::info(msg); Opm::OpmLog::info(msg);
} }
} }