From c49463fe6fdf894ccc4dbbe0912c880728f8d7dd Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Tue, 5 Jan 2021 12:16:44 +0100 Subject: [PATCH] Add class ScheduleTStep --- opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp | 4 ++++ src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp index d0218722e..2b79d0e3d 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp @@ -429,6 +429,7 @@ namespace Opm const std::string& input_path, std::size_t currentStep, const ScheduleBlock& block, + ScheduleState& sched_step, const DeckKeyword& keyword, const ParseContext& parseContext, ErrorGuard& errors, const EclipseGrid& grid, @@ -475,17 +476,20 @@ namespace Opm const ScheduleBlock& block; const DeckKeyword& keyword; const std::size_t currentStep; + ScheduleState& sched_step; const EclipseGrid& grid; const FieldPropsManager& fieldPropsManager; HandlerContext(const ScheduleBlock& block_, const DeckKeyword& keyword_, const std::size_t currentStep_, + ScheduleState& sched_step_, const EclipseGrid& grid_, const FieldPropsManager& fieldPropsManager_) : block(block_), keyword(keyword_), currentStep(currentStep_), + sched_step(sched_step_), grid(grid_), fieldPropsManager(fieldPropsManager_) {} diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index 5c5dae632..570f9601d 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -308,6 +308,7 @@ namespace { const std::string& input_path, std::size_t currentStep, const ScheduleBlock& block, + ScheduleState& sched_step, const DeckKeyword& keyword, const ParseContext& parseContext, ErrorGuard& errors, @@ -315,7 +316,7 @@ namespace { const FieldPropsManager& fp, std::vector >& rftProperties) { - HandlerContext handlerContext { block, keyword, currentStep, grid, fp }; + HandlerContext handlerContext { block, keyword, currentStep, sched_step, grid, fp }; if (handleNormalKeyword(handlerContext, parseContext, errors)) return; @@ -493,6 +494,7 @@ private: input_path, currentStep, block, + this->snapshots.back(), keyword, parseContext, errors,