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

Merge pull request #1474 from joakim-hove/schedule-add-rst-argument

Browse Source 
Schedule add rst argument
This commit is contained in:
Atgeirr Flø Rasmussen
2020-02-14 14:00:20 +01:00
committed by GitHub
parent 15861f1dde 0b3f885b33
commit fa5050f18a
3 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
View File

@@ -46,6 +46,8 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp>
#include <opm/common/utility/ActiveGridCells.hpp>
#include <opm/io/eclipse/rst/state.hpp>
/*
The DynamicState<std::shared_ptr<T>> pattern: The quantities in the Schedule
@@ -120,7 +122,8 @@ namespace Opm
const FieldPropsManager& fp,
const Runspec &runspec,
const ParseContext& parseContext,
ErrorGuard& errors);
ErrorGuard& errors,
const RestartIO::RstState* rst = nullptr);
template<typename T>
Schedule(const Deck& deck,
@@ -128,26 +131,31 @@ namespace Opm
const FieldPropsManager& fp,
const Runspec &runspec,
const ParseContext& parseContext,
T&& errors);
T&& errors,
const RestartIO::RstState* rst = nullptr);
Schedule(const Deck& deck,
const EclipseGrid& grid,
const FieldPropsManager& fp,
const Runspec &runspec);
const Runspec &runspec,
const RestartIO::RstState* rst = nullptr);
Schedule(const Deck& deck,
const EclipseState& es,
const ParseContext& parseContext,
ErrorGuard& errors);
ErrorGuard& errors,
const RestartIO::RstState* rst = nullptr);
template <typename T>
Schedule(const Deck& deck,
const EclipseState& es,
const ParseContext& parseContext,
T&& errors);
T&& errors,
const RestartIO::RstState* rst = nullptr);
Schedule(const Deck& deck,
const EclipseState& es);
const EclipseState& es,
const RestartIO::RstState* rst = nullptr);
Schedule(const TimeMap& timeMap,
const WellMap& wellsStatic,
@@ -305,6 +313,7 @@ namespace Opm
std::map<std::string,Events> wellgroup_events;
void load_rst(const RestartIO::RstState& rst, const UnitSystem& unit_system);
void addWell(const std::string& wellName,
const std::string& group,
int headI,

35
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 ),
@@ -132,6 +133,9 @@ namespace {
rft_config(this->m_timeMap),
m_nupcol(this->m_timeMap, ParserKeywords::NUPCOL::NUM_ITER::defaultValue)
{
if (rst)
this->load_rst(*rst, deck.getActiveUnitSystem());
addGroup( "FIELD", 0, deck.getActiveUnitSystem());
/*
@@ -159,43 +163,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)
{}
@@ -2949,4 +2957,9 @@ void Schedule::handleGRUPTREE( const DeckKeyword& keyword, size_t currentStep, c
this->getWellGroupEvents() == data.getWellGroupEvents();
}
void Schedule::load_rst(const RestartIO::RstState&, const UnitSystem&)
{
}
}

9
tests/parser/ScheduleRestartTests.cpp
View File

@@ -89,11 +89,14 @@ BOOST_AUTO_TEST_CASE(LoadRST) {
BOOST_AUTO_TEST_CASE(LoadRestartSim) {
Parser parser;
auto deck = parser.parseFile("SPE1CASE2.DATA");
EclipseState ecl_state(deck);
Schedule sched(deck, ecl_state);
auto restart_deck = parser.parseFile("SPE1CASE2_RESTART.DATA");
EclIO::ERst rst_file("SPE1CASE2.X0060");
auto rst_state = RestartIO::RstState::load(rst_file, 60);
EclipseState ecl_state_restart(restart_deck);
Schedule restart_sched(restart_deck, ecl_state_restart, &rst_state);
EclipseState ecl_state(deck);
Schedule sched(deck, ecl_state);
//Schedule restart_sched(deck, ecl_state, &rst_state);
// Verify that sched and restart_sched are identical from report_step 60 and onwords.
}