OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-25 08:41:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3597 from joakim-hove/set-external-action-state

Browse Source 
Set external Action::State object in the vanguard
This commit is contained in:
Joakim Hove 2021-10-12 17:02:19 +02:00 committed by GitHub
commit 3d5bd5e7a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flow/flow_ebos_blackoil.cpp
View File

@ -34,6 +34,7 @@ void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
std::shared_ptr<EclipseState> eclState,
std::shared_ptr<Schedule> schedule,
std::unique_ptr<UDQState> udqState,
std::unique_ptr<Action::State> actionState,
std::shared_ptr<SummaryConfig> summaryConfig)
{
using TypeTag = Properties::TTag::EclFlowProblem;
@ -44,6 +45,7 @@ void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalUDQState(std::move(udqState));
Vanguard::setExternalActionState(std::move(actionState));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
}

4
flow/flow_ebos_blackoil.hpp
View File

@ -27,12 +27,16 @@ template<class TypeTag> class FlowMainEbos;
class Schedule;
class SummaryConfig;
class UDQState;
namespace Action {
class State;
}
namespace Properties { namespace TTag { struct EclFlowProblem; } }
void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
std::shared_ptr<EclipseState> eclState,
std::shared_ptr<Schedule> schedule,
std::unique_ptr<UDQState> udqState,
std::unique_ptr<Action::State> actionState,
std::shared_ptr<SummaryConfig> summaryConfig);
int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles);

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

@ -263,6 +263,7 @@ namespace Opm
eclipseState_,
schedule_,
std::move(udqState_),
std::move(this->actionState_),
summaryConfig_);
return flowEbosBlackoilMainInit(
argc_, argv_, outputCout_, outputFiles_);
@ -653,6 +654,7 @@ namespace Opm
this->eclipseState_,
this->schedule_,
std::move(this->udqState_),
std::move(this->actionState_),
this->summaryConfig_);
return flowEbosBlackoilMain(argc_, argv_, outputCout_, outputFiles_);