mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
glue in support for property modifiers
i.e. reading the grid properties from EclipseState instead of from the raw deck. This requires that all deck files exhibit a GRID and a SCHEDULE section or else EclipseState will throw in the constructor.
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
#include <opm/core/utility/parameters/ParameterGroup.hpp>
|
||||
|
||||
#include <opm/parser/eclipse/Parser/Parser.hpp>
|
||||
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
|
||||
#include <opm/parser/eclipse/Deck/Deck.hpp>
|
||||
|
||||
#include <fstream>
|
||||
@@ -47,6 +48,7 @@ struct SetupSimple {
|
||||
{
|
||||
Opm::ParserPtr parser(new Opm::Parser());
|
||||
deck = parser->parseFile("fluid.data");
|
||||
eclState.reset(new Opm::EclipseState(deck));
|
||||
|
||||
param.disableOutput();
|
||||
param.insertParameter("init_rock" , "false" );
|
||||
@@ -57,6 +59,7 @@ struct SetupSimple {
|
||||
|
||||
Opm::parameter::ParameterGroup param;
|
||||
Opm::DeckConstPtr deck;
|
||||
Opm::EclipseStateConstPtr eclState;
|
||||
};
|
||||
|
||||
|
||||
@@ -66,13 +69,14 @@ struct TestFixture : public Setup
|
||||
TestFixture()
|
||||
: Setup()
|
||||
, grid (deck)
|
||||
, props(deck, *grid.c_grid(), param,
|
||||
, props(deck, eclState, *grid.c_grid(), param,
|
||||
param.getDefault("init_rock", false))
|
||||
{
|
||||
}
|
||||
|
||||
using Setup::param;
|
||||
using Setup::deck;
|
||||
using Setup::eclState;
|
||||
|
||||
Opm::GridManager grid;
|
||||
Opm::BlackoilPropertiesFromDeck props;
|
||||
|
||||
Reference in New Issue
Block a user