Merge pull request #339 from andlaus/use_deck_units_for_summary_output

also pass the deck to the output writer
This commit is contained in:
Atgeirr Flø Rasmussen
2015-03-27 12:30:20 +01:00
3 changed files with 5 additions and 2 deletions

View File

@@ -187,6 +187,7 @@ namespace Opm
template <class Grid>
BlackoilOutputWriter(const Grid& grid,
const parameter::ParameterGroup& param,
Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclipseState,
const Opm::PhaseUsage &phaseUsage);
@@ -235,6 +236,7 @@ namespace Opm
BlackoilOutputWriter::
BlackoilOutputWriter(const Grid& grid,
const parameter::ParameterGroup& param,
Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclipseState,
const Opm::PhaseUsage &phaseUsage )
: output_( param.getDefault("output", true) ),
@@ -246,7 +248,7 @@ namespace Opm
matlabWriter_( output_ && param.getDefault("output_matlab", false) ?
new BlackoilMatlabWriter< Grid >( grid, outputDir_ ) : 0 ),
eclWriter_( output_ && param.getDefault("output_ecl", true) ?
new EclipseWriter(param, eclipseState, phaseUsage,
new EclipseWriter(param, deck, eclipseState, phaseUsage,
Opm::UgGridHelpers::numCells( grid ),
Opm::UgGridHelpers::globalCell( grid ) )
: 0 )