From 05f92a1133680157932d30df45d1148d4f9a1842 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 13 Feb 2023 17:49:17 +0100 Subject: [PATCH] EclGenericVanguard: rename setParams to defineSimulationModel setParams is a rather generic method name, be more specific --- ebos/eclgenericvanguard.cc | 24 ++++++++++++------------ ebos/eclgenericvanguard.hh | 14 +++++++------- opm/simulators/flow/Main.cpp | 14 +++++++------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ebos/eclgenericvanguard.cc b/ebos/eclgenericvanguard.cc index 88e441b9e..ae7c3108e 100644 --- a/ebos/eclgenericvanguard.cc +++ b/ebos/eclgenericvanguard.cc @@ -69,13 +69,13 @@ EclGenericVanguard::EclGenericVanguard() EclGenericVanguard::~EclGenericVanguard() = default; -void EclGenericVanguard::setParams(double setupTime, - std::shared_ptr eclState, - std::shared_ptr schedule, - std::unique_ptr udqState, - std::unique_ptr actionState, - std::unique_ptr wtestState, - std::shared_ptr summaryConfig) +void EclGenericVanguard::defineSimulationModel(double setupTime, + std::shared_ptr eclState, + std::shared_ptr schedule, + std::unique_ptr udqState, + std::unique_ptr actionState, + std::unique_ptr wtestState, + std::shared_ptr summaryConfig) { EclGenericVanguard::setupTime_ = setupTime; EclGenericVanguard::eclState_ = std::move(eclState); @@ -104,11 +104,11 @@ void EclGenericVanguard::readDeck(const std::string& filename) summaryConfig, nullptr, false, false, false, {}); - EclGenericVanguard::setParams(setupTimer.elapsed(), - eclipseState, schedule, - std::move(udqState), - std::move(actionState), - std::move(wtestState), summaryConfig); + EclGenericVanguard::defineSimulationModel(setupTimer.elapsed(), + eclipseState, schedule, + std::move(udqState), + std::move(actionState), + std::move(wtestState), summaryConfig); } std::string EclGenericVanguard::canonicalDeckPath(const std::string& caseName) diff --git a/ebos/eclgenericvanguard.hh b/ebos/eclgenericvanguard.hh index b244a0d28..9c14a5644 100644 --- a/ebos/eclgenericvanguard.hh +++ b/ebos/eclgenericvanguard.hh @@ -101,13 +101,13 @@ public: /*! * \brief Set the simulation configuration objects. */ - static void setParams(double setupTime, - std::shared_ptr eclState, - std::shared_ptr schedule, - std::unique_ptr udqState, - std::unique_ptr actionState, - std::unique_ptr wtestState, - std::shared_ptr summaryConfig); + static void defineSimulationModel(double setupTime, + std::shared_ptr eclState, + std::shared_ptr schedule, + std::unique_ptr udqState, + std::unique_ptr actionState, + std::unique_ptr wtestState, + std::shared_ptr summaryConfig); /*! * \brief Return a reference to the internalized ECL deck. diff --git a/opm/simulators/flow/Main.cpp b/opm/simulators/flow/Main.cpp index ac5312234..494629f1a 100644 --- a/opm/simulators/flow/Main.cpp +++ b/opm/simulators/flow/Main.cpp @@ -211,13 +211,13 @@ void Main::readDeck(const std::string& deckFilename, void Main::setupVanguard() { - EclGenericVanguard::setParams(this->setupTime_, - this->eclipseState_, - this->schedule_, - std::move(this->udqState_), - std::move(this->actionState_), - std::move(this->wtestState_), - this->summaryConfig_); + EclGenericVanguard::defineSimulationModel(this->setupTime_, + this->eclipseState_, + this->schedule_, + std::move(this->udqState_), + std::move(this->actionState_), + std::move(this->wtestState_), + this->summaryConfig_); } #if HAVE_DAMARIS