Revert "also pass the deck to the output writer"

This reverts commit 88730e855f.
This commit is contained in:
Andreas Lauser 2015-03-31 12:11:45 +02:00
parent 05bee313d3
commit ba4fca5a77
3 changed files with 2 additions and 5 deletions

View File

@ -155,7 +155,6 @@ try
const PhaseUsage pu = Opm::phaseUsageFromDeck(deck);
Opm::BlackoilOutputWriter outputWriter(cGrid,
param,
deck,
eclipseState,
pu );

View File

@ -180,7 +180,7 @@ try
grid->processEclipseFormat(deck, false, false, false, porv);
const PhaseUsage pu = Opm::phaseUsageFromDeck(deck);
Opm::BlackoilOutputWriter outputWriter(*grid, param, deck, eclipseState, pu );
Opm::BlackoilOutputWriter outputWriter(*grid, param, eclipseState, pu );
// Rock and fluid init
props.reset(new BlackoilPropertiesFromDeck(deck, eclipseState,

View File

@ -187,7 +187,6 @@ namespace Opm
template <class Grid>
BlackoilOutputWriter(const Grid& grid,
const parameter::ParameterGroup& param,
Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclipseState,
const Opm::PhaseUsage &phaseUsage);
@ -236,7 +235,6 @@ 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) ),
@ -248,7 +246,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, deck, eclipseState, phaseUsage,
new EclipseWriter(param, eclipseState, phaseUsage,
Opm::UgGridHelpers::numCells( grid ),
Opm::UgGridHelpers::globalCell( grid ) )
: 0 )