Merge pull request #145 from bska/restore-build

Follow API update of BlackoilOutputWriter
This commit is contained in:
Atgeirr Flø Rasmussen 2015-09-30 11:30:57 +02:00
commit 6ef6dbcf5a
2 changed files with 9 additions and 8 deletions

View File

@ -184,10 +184,6 @@ try
grid.reset(new GridManager(eclipseState->getEclipseGrid(), porv));
auto &cGrid = *grid->c_grid();
const PhaseUsage pu = Opm::phaseUsageFromDeck(deck);
Opm::BlackoilOutputWriter outputWriter(cGrid,
param,
eclipseState,
pu );
// Rock and fluid init
@ -285,6 +281,10 @@ try
std::vector<double> threshold_pressures = thresholdPressures(parseMode, eclipseState, *grid->c_grid());
Opm::BlackoilOutputWriter
outputWriter(cGrid, param, eclipseState, pu,
new_props->permeability());
SimulatorFullyImplicitBlackoilPolymer<UnstructuredGrid>
simulator(param,
*grid->c_grid(),

View File

@ -172,10 +172,6 @@ try
grid.reset(new GridManager(eclipseState->getEclipseGrid(), porv));
auto &cGrid = *grid->c_grid();
const PhaseUsage pu = Opm::phaseUsageFromDeck(deck);
Opm::BlackoilOutputWriter outputWriter(cGrid,
param,
eclipseState,
pu );
// Rock and fluid init
@ -238,6 +234,11 @@ try
}
std::cout << "\n\n================ Starting main simulation loop ===============\n"
<< std::flush;
Opm::BlackoilOutputWriter
outputWriter(cGrid, param, eclipseState, pu,
new_props->permeability());
SimulatorReport fullReport;
// Create and run simulator.
Opm::DerivedGeology geology(*grid->c_grid(), *new_props, eclipseState, grav);