From 410e19e807e2e6e209c0e7c086c099aae88469c8 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 16 Dec 2024 14:49:08 +0100 Subject: [PATCH] remove unused fipnum argument also allows to drop the default value for the tuningUpdater callback --- opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp | 2 +- opm/simulators/timestepping/AdaptiveTimeStepping.hpp | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp index c7cf62c30..e3b6fbf48 100644 --- a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp +++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp @@ -350,7 +350,7 @@ public: events.hasEvent(ScheduleEvents::PRODUCTION_UPDATE) || events.hasEvent(ScheduleEvents::INJECTION_UPDATE) || 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; //Pass simulation report to eclwriter for summary output simulator_.problem().setSimulationReport(report_); diff --git a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp index f744ac78e..33771bd6a 100644 --- a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp +++ b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp @@ -180,8 +180,7 @@ void registerAdaptiveParameters(); SimulatorReport step(const SimulatorTimer& simulatorTimer, Solver& solver, const bool isEvent, - const std::vector* fipnum = nullptr, - const std::function tuningUpdater = [](){return false;}) + const std::function tuningUpdater) { // Maybe update tuning tuningUpdater(); @@ -336,9 +335,6 @@ void registerAdaptiveParameters(); // to write it as this will be done by the simulator // anyway. if (!substepTimer.done()) { - if (fipnum) { - solver.computeFluidInPlace(*fipnum); - } time::StopWatch perfTimer; perfTimer.start();