OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add optional RstState * argument to Schedule constructors

Browse Source
This commit is contained in:
Joakim Hove
2020-01-28 13:03:07 +01:00
parent e4955d3d94
commit 5399c4f37f
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@@ -112,7 +112,8 @@ namespace {
const FieldPropsManager& fp,
const Runspec &runspec,
const ParseContext& parseContext,
ErrorGuard& errors) :
ErrorGuard& errors,
const RestartIO::RstState * rst) :
m_timeMap( deck ),
m_oilvaporizationproperties( this->m_timeMap, OilVaporizationProperties(runspec.tabdims().getNumPVTTables()) ),
m_events( this->m_timeMap ),
@@ -159,43 +160,47 @@ namespace {
const FieldPropsManager& fp,
const Runspec &runspec,
const ParseContext& parseContext,
T&& errors) :
Schedule(deck, grid, fp, runspec, parseContext, errors)
T&& errors,
const RestartIO::RstState * rst) :
Schedule(deck, grid, fp, runspec, parseContext, errors, rst)
{}
Schedule::Schedule( const Deck& deck,
const EclipseGrid& grid,
const FieldPropsManager& fp,
const Runspec &runspec) :
Schedule(deck, grid, fp, runspec, ParseContext(), ErrorGuard())
const Runspec &runspec,
const RestartIO::RstState * rst) :
Schedule(deck, grid, fp, runspec, ParseContext(), ErrorGuard(), rst)
{}
Schedule::Schedule(const Deck& deck, const EclipseState& es, const ParseContext& parse_context, ErrorGuard& errors) :
Schedule::Schedule(const Deck& deck, const EclipseState& es, const ParseContext& parse_context, ErrorGuard& errors, const RestartIO::RstState * rst) :
Schedule(deck,
es.getInputGrid(),
es.fieldProps(),
es.runspec(),
parse_context,
errors)
errors,
rst)
{}
template <typename T>
Schedule::Schedule(const Deck& deck, const EclipseState& es, const ParseContext& parse_context, T&& errors) :
Schedule::Schedule(const Deck& deck, const EclipseState& es, const ParseContext& parse_context, T&& errors, const RestartIO::RstState * rst) :
Schedule(deck,
es.getInputGrid(),
es.fieldProps(),
es.runspec(),
parse_context,
errors)
errors,
rst)
{}
Schedule::Schedule(const Deck& deck, const EclipseState& es) :
Schedule(deck, es, ParseContext(), ErrorGuard())
Schedule::Schedule(const Deck& deck, const EclipseState& es, const RestartIO::RstState * rst) :
Schedule(deck, es, ParseContext(), ErrorGuard(), rst)
{}