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

EclGenericVanguard: remove deck member

Browse Source
This commit is contained in:
Arne Morten Kvarving 2022-11-23 13:05:50 +01:00
parent aabf00a3ad
commit f4f8c033d8
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebos/eclgenericvanguard.cc
View File

@ -26,7 +26,6 @@
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/common/utility/TimeService.hpp> #include <opm/common/utility/TimeService.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp> #include <opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp>
#include <opm/input/eclipse/EclipseState/EclipseState.hpp> #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/input/eclipse/Parser/ErrorGuard.hpp> #include <opm/input/eclipse/Parser/ErrorGuard.hpp>
@ -55,7 +54,6 @@
namespace Opm { namespace Opm {
double EclGenericVanguard::setupTime_ = 0.0; double EclGenericVanguard::setupTime_ = 0.0;
std::shared_ptr<Deck> EclGenericVanguard::deck_;
std::shared_ptr<EclipseState> EclGenericVanguard::eclState_; std::shared_ptr<EclipseState> EclGenericVanguard::eclState_;
std::shared_ptr<Schedule> EclGenericVanguard::eclSchedule_; std::shared_ptr<Schedule> EclGenericVanguard::eclSchedule_;
std::shared_ptr<SummaryConfig> EclGenericVanguard::eclSummaryConfig_; std::shared_ptr<SummaryConfig> EclGenericVanguard::eclSummaryConfig_;
@ -72,7 +70,6 @@ EclGenericVanguard::EclGenericVanguard()
EclGenericVanguard::~EclGenericVanguard() = default; EclGenericVanguard::~EclGenericVanguard() = default;
void EclGenericVanguard::setParams(double setupTime, void EclGenericVanguard::setParams(double setupTime,
std::shared_ptr<Deck> deck,
std::shared_ptr<EclipseState> eclState, std::shared_ptr<EclipseState> eclState,
std::shared_ptr<Schedule> schedule, std::shared_ptr<Schedule> schedule,
std::unique_ptr<UDQState> udqState, std::unique_ptr<UDQState> udqState,
@ -81,7 +78,6 @@ void EclGenericVanguard::setParams(double setupTime,
std::shared_ptr<SummaryConfig> summaryConfig) std::shared_ptr<SummaryConfig> summaryConfig)
{ {
EclGenericVanguard::setupTime_ = setupTime; EclGenericVanguard::setupTime_ = setupTime;
EclGenericVanguard::deck_ = std::move(deck);
EclGenericVanguard::eclState_ = std::move(eclState); EclGenericVanguard::eclState_ = std::move(eclState);
EclGenericVanguard::eclSchedule_ = std::move(schedule); EclGenericVanguard::eclSchedule_ = std::move(schedule);
EclGenericVanguard::udqState_ = std::move(udqState); EclGenericVanguard::udqState_ = std::move(udqState);
@ -117,7 +113,7 @@ void EclGenericVanguard::readDeck(const std::string& filename)
false, false, {}); false, false, {});
EclGenericVanguard::setParams(setupTimer.elapsed(), EclGenericVanguard::setParams(setupTimer.elapsed(),
deck, eclipseState, schedule, eclipseState, schedule,
std::move(udqState), std::move(udqState),
std::move(actionState), std::move(actionState),
std::move(wtestState), summaryConfig); std::move(wtestState), summaryConfig);

11
ebos/eclgenericvanguard.hh
View File

@ -103,7 +103,6 @@ public:
* \brief Set the simulation configuration objects. * \brief Set the simulation configuration objects.
*/ */
static void setParams(double setupTime, static void setParams(double setupTime,
std::shared_ptr<Deck> deck,
std::shared_ptr<EclipseState> eclState, std::shared_ptr<EclipseState> eclState,
std::shared_ptr<Schedule> schedule, std::shared_ptr<Schedule> schedule,
std::unique_ptr<UDQState> udqState, std::unique_ptr<UDQState> udqState,
@ -111,15 +110,6 @@ public:
std::unique_ptr<WellTestState> wtestState, std::unique_ptr<WellTestState> wtestState,
std::shared_ptr<SummaryConfig> summaryConfig); std::shared_ptr<SummaryConfig> summaryConfig);
/*!
* \brief Return a reference to the parsed ECL deck.
*/
const Deck& deck() const
{ return *deck_; }
Deck& deck()
{ return *deck_; }
/*! /*!
* \brief Return a reference to the internalized ECL deck. * \brief Return a reference to the internalized ECL deck.
*/ */
@ -309,7 +299,6 @@ protected:
// parser objects. // parser objects.
std::shared_ptr<Python> python; std::shared_ptr<Python> python;
// These variables may be owned by both Python and the simulator // These variables may be owned by both Python and the simulator
static std::shared_ptr<Deck> deck_;
static std::shared_ptr<EclipseState> eclState_; static std::shared_ptr<EclipseState> eclState_;
static std::shared_ptr<Schedule> eclSchedule_; static std::shared_ptr<Schedule> eclSchedule_;
static std::shared_ptr<SummaryConfig> eclSummaryConfig_; static std::shared_ptr<SummaryConfig> eclSummaryConfig_;

3
opm/simulators/flow/Main.hpp
View File

@ -268,7 +268,6 @@ public:
// case. E.g. check that number of phases == 3 // case. E.g. check that number of phases == 3
EclGenericVanguard::setParams( EclGenericVanguard::setParams(
setupTime_, setupTime_,
deck_,
eclipseState_, eclipseState_,
schedule_, schedule_,
std::move(udqState_), std::move(udqState_),
@ -290,7 +289,6 @@ private:
const auto& phases = rspec.phases(); const auto& phases = rspec.phases();
EclGenericVanguard::setParams(this->setupTime_, EclGenericVanguard::setParams(this->setupTime_,
this->deck_,
this->eclipseState_, this->eclipseState_,
this->schedule_, this->schedule_,
std::move(this->udqState_), std::move(this->udqState_),
@ -374,7 +372,6 @@ private:
int dispatchStatic_() int dispatchStatic_()
{ {
EclGenericVanguard::setParams(this->setupTime_, EclGenericVanguard::setParams(this->setupTime_,
this->deck_,
this->eclipseState_, this->eclipseState_,
this->schedule_, this->schedule_,
std::move(this->udqState_), std::move(this->udqState_),