adapt construction of to EclipseWriter

i.e., don't pass around the UnstructuredGrid object directly, but use
the "generic" interface which is also used in the case Dune::CpGrid.
This commit is contained in:
Andreas Lauser 2014-07-11 12:36:04 +02:00
parent 263e337136
commit 6727fe28fe
2 changed files with 7 additions and 4 deletions

View File

@ -46,7 +46,6 @@
#include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>
#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
#include <opm/core/utility/share_obj.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
@ -108,7 +107,12 @@ try
// Grid init
grid.reset(new GridManager(eclipseState->getEclipseGrid()));
Opm::EclipseWriter outputWriter(param, deck, share_obj(*grid->c_grid()));
auto &cGrid = *grid->c_grid();
Opm::EclipseWriter outputWriter(param,
deck,
cGrid.number_of_cells,
cGrid.global_cell,
cGrid.cartdims);
// Rock and fluid init
props.reset(new BlackoilPropertiesFromDeck(deck, eclipseState, *grid->c_grid(), param));

View File

@ -148,8 +148,7 @@ try
Opm::EclipseWriter outputWriter(param, deck,
Opm::UgGridHelpers::numCells(*grid),
Opm::UgGridHelpers::globalCell(*grid),
Opm::UgGridHelpers::cartDims(*grid),
Opm::UgGridHelpers::dimensions(*grid));
Opm::UgGridHelpers::cartDims(*grid));
// Rock and fluid init
props.reset(new BlackoilPropertiesFromDeck(deck, eclipseState,