Glue in support for the grid property modifier keywords

this basically means using Opm::EclipseState instead of the raw deck
for these keywords.

with this, property modifiers like ADD, MULT, COPY and friends are
supported for at least the PERM* keywords. If additional keywords are
required these can be added relatively easily as well.

no ctest regressions have been observed with this patch on my machine.
This commit is contained in:
Andreas Lauser 2014-06-06 14:07:14 +02:00
parent 8e373c3539
commit 13ea365c64

View File

@ -99,12 +99,12 @@ try
if (use_deck) {
std::string deck_filename = param.get<std::string>("deck_filename");
deck = parser->parseFile(deck_filename);
eclipseState.reset(new EclipseState(deck));
// Grid init
grid.reset(new GridManager(deck));
// Rock and fluid init
props.reset(new BlackoilPropertiesFromDeck(deck, *grid->c_grid(), param));
props.reset(new BlackoilPropertiesFromDeck(deck, eclipseState, *grid->c_grid(), param));
// check_well_controls = param.getDefault("check_well_controls", false);
// max_well_control_iterations = param.getDefault("max_well_control_iterations", 10);
// Rock compressibility.