Set external UDQState for flow blackoil

This commit is contained in:
Joakim Hove committed 2021-07-04 08:55:07 +02:00
1 parent 2b680f27af
commit c62a9ba198
4 files changed
+7

No files matched your search

+2
View File
@@ -33,6 +33,7 @@ namespace Opm {
void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck, void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck,
std::unique_ptr<EclipseState> eclState, std::unique_ptr<EclipseState> eclState,
std::unique_ptr<Schedule> schedule, std::unique_ptr<Schedule> schedule,
std::unique_ptr<UDQState> udqState,
std::unique_ptr<SummaryConfig> summaryConfig) std::unique_ptr<SummaryConfig> summaryConfig)
{ {
using TypeTag = Properties::TTag::EclFlowProblem; using TypeTag = Properties::TTag::EclFlowProblem;
@@ -42,6 +43,7 @@ void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck,
Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalDeck(std::move(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::setExternalSummaryConfig(std::move(summaryConfig)); Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
} }
+2
View File
@@ -26,11 +26,13 @@ class EclipseState;
template<class TypeTag> class FlowMainEbos; template<class TypeTag> class FlowMainEbos;
class Schedule; class Schedule;
class SummaryConfig; class SummaryConfig;
class UDQState;
namespace Properties { namespace TTag { struct EclFlowProblem; } } namespace Properties { namespace TTag { struct EclFlowProblem; } }
void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck, void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck,
std::unique_ptr<EclipseState> eclState, std::unique_ptr<EclipseState> eclState,
std::unique_ptr<Schedule> schedule, std::unique_ptr<Schedule> schedule,
std::unique_ptr<UDQState> udqState,
std::unique_ptr<SummaryConfig> summaryConfig); std::unique_ptr<SummaryConfig> summaryConfig);
int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles); int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles);
+1
View File
@@ -33,6 +33,7 @@
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp> #include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp>
#include <opm/common/utility/String.hpp> #include <opm/common/utility/String.hpp>
#include <fmt/format.h> #include <fmt/format.h>
+2
View File
@@ -188,6 +188,7 @@ namespace Opm
std::move(deck_), std::move(deck_),
std::move(eclipseState_), std::move(eclipseState_),
std::move(schedule_), std::move(schedule_),
std::move(udqState_),
std::move(summaryConfig_)); std::move(summaryConfig_));
return flowEbosBlackoilMainInit( return flowEbosBlackoilMainInit(
argc_, argv_, outputCout_, outputFiles_); argc_, argv_, outputCout_, outputFiles_);
@@ -326,6 +327,7 @@ namespace Opm
flowEbosBlackoilSetDeck(setupTime_, std::move(deck_), flowEbosBlackoilSetDeck(setupTime_, std::move(deck_),
std::move(eclipseState_), std::move(eclipseState_),
std::move(schedule_), std::move(schedule_),
std::move(udqState_),
std::move(summaryConfig_)); std::move(summaryConfig_));
return flowEbosBlackoilMain(argc_, argv_, outputCout_, outputFiles_); return flowEbosBlackoilMain(argc_, argv_, outputCout_, outputFiles_);
} }