mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Set external Action::State object in the vanguard
This commit is contained in:
@@ -34,6 +34,7 @@ void flowEbosBlackoilSetDeck(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,
|
||||||
|
std::unique_ptr<Action::State> actionState,
|
||||||
std::shared_ptr<SummaryConfig> summaryConfig)
|
std::shared_ptr<SummaryConfig> summaryConfig)
|
||||||
{
|
{
|
||||||
using TypeTag = Properties::TTag::EclFlowProblem;
|
using TypeTag = Properties::TTag::EclFlowProblem;
|
||||||
@@ -44,6 +45,7 @@ void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
|
|||||||
Vanguard::setExternalEclState(std::move(eclState));
|
Vanguard::setExternalEclState(std::move(eclState));
|
||||||
Vanguard::setExternalSchedule(std::move(schedule));
|
Vanguard::setExternalSchedule(std::move(schedule));
|
||||||
Vanguard::setExternalUDQState(std::move(udqState));
|
Vanguard::setExternalUDQState(std::move(udqState));
|
||||||
|
Vanguard::setExternalActionState(std::move(actionState));
|
||||||
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
|
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,12 +27,16 @@ template<class TypeTag> class FlowMainEbos;
|
|||||||
class Schedule;
|
class Schedule;
|
||||||
class SummaryConfig;
|
class SummaryConfig;
|
||||||
class UDQState;
|
class UDQState;
|
||||||
|
namespace Action {
|
||||||
|
class State;
|
||||||
|
}
|
||||||
namespace Properties { namespace TTag { struct EclFlowProblem; } }
|
namespace Properties { namespace TTag { struct EclFlowProblem; } }
|
||||||
|
|
||||||
void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
|
void flowEbosBlackoilSetDeck(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,
|
||||||
|
std::unique_ptr<Action::State> actionState,
|
||||||
std::shared_ptr<SummaryConfig> summaryConfig);
|
std::shared_ptr<SummaryConfig> summaryConfig);
|
||||||
|
|
||||||
int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles);
|
int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles);
|
||||||
|
|||||||
@@ -263,6 +263,7 @@ namespace Opm
|
|||||||
eclipseState_,
|
eclipseState_,
|
||||||
schedule_,
|
schedule_,
|
||||||
std::move(udqState_),
|
std::move(udqState_),
|
||||||
|
std::move(this->actionState_),
|
||||||
summaryConfig_);
|
summaryConfig_);
|
||||||
return flowEbosBlackoilMainInit(
|
return flowEbosBlackoilMainInit(
|
||||||
argc_, argv_, outputCout_, outputFiles_);
|
argc_, argv_, outputCout_, outputFiles_);
|
||||||
@@ -653,6 +654,7 @@ namespace Opm
|
|||||||
this->eclipseState_,
|
this->eclipseState_,
|
||||||
this->schedule_,
|
this->schedule_,
|
||||||
std::move(this->udqState_),
|
std::move(this->udqState_),
|
||||||
|
std::move(this->actionState_),
|
||||||
this->summaryConfig_);
|
this->summaryConfig_);
|
||||||
|
|
||||||
return flowEbosBlackoilMain(argc_, argv_, outputCout_, outputFiles_);
|
return flowEbosBlackoilMain(argc_, argv_, outputCout_, outputFiles_);
|
||||||
|
|||||||
Reference in New Issue
Block a user