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

remove unused fipnum argument

Browse Source 
also allows to drop the default value for the tuningUpdater callback
This commit is contained in:
Arne Morten Kvarving 2024-12-16 14:49:08 +01:00
parent a0614bcd9c
commit 410e19e807
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
View File

@ -350,7 +350,7 @@ public:
events.hasEvent(ScheduleEvents::PRODUCTION_UPDATE) || events.hasEvent(ScheduleEvents::PRODUCTION_UPDATE) ||
events.hasEvent(ScheduleEvents::INJECTION_UPDATE) || events.hasEvent(ScheduleEvents::INJECTION_UPDATE) ||
events.hasEvent(ScheduleEvents::WELL_STATUS_CHANGE); events.hasEvent(ScheduleEvents::WELL_STATUS_CHANGE);
auto stepReport = adaptiveTimeStepping_->step(timer, *solver_, event, nullptr, tuningUpdater); auto stepReport = adaptiveTimeStepping_->step(timer, *solver_, event, tuningUpdater);
report_ += stepReport; report_ += stepReport;
//Pass simulation report to eclwriter for summary output //Pass simulation report to eclwriter for summary output
simulator_.problem().setSimulationReport(report_); simulator_.problem().setSimulationReport(report_);

6
opm/simulators/timestepping/AdaptiveTimeStepping.hpp
View File

@ -180,8 +180,7 @@ void registerAdaptiveParameters();
SimulatorReport step(const SimulatorTimer& simulatorTimer, SimulatorReport step(const SimulatorTimer& simulatorTimer,
Solver& solver, Solver& solver,
const bool isEvent, const bool isEvent,
const std::vector<int>* fipnum = nullptr, const std::function<bool()> tuningUpdater)
const std::function<bool()> tuningUpdater = [](){return false;})
{ {
// Maybe update tuning // Maybe update tuning
tuningUpdater(); tuningUpdater();
@ -336,9 +335,6 @@ void registerAdaptiveParameters();
// to write it as this will be done by the simulator // to write it as this will be done by the simulator
// anyway. // anyway.
if (!substepTimer.done()) { if (!substepTimer.done()) {
if (fipnum) {
solver.computeFluidInPlace(*fipnum);
}
time::StopWatch perfTimer; time::StopWatch perfTimer;
perfTimer.start(); perfTimer.start();