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

Add class ScheduleTStep

Browse Source
This commit is contained in:
Joakim Hove
2021-01-07 15:49:46 +01:00
parent f460c67ade
commit c49463fe6f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
+4
View File
@@ -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_)
{}
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
+3 -1
View File
@@ -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<std::pair<const DeckKeyword*, std::size_t > >& 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,