OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

also pass the deck to the output writer

Browse Source
This commit is contained in:
Andreas Lauser 2015-03-26 17:33:13 +01:00
parent c524be454a
commit 88730e855f
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/flow.cpp
View File

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

2
examples/flow_cp.cpp
View File

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

4
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

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