Use generic WellsManager constructor.

Also fix minor whitespace issues.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-08-12 12:54:16 +02:00
parent bb118a9a39
commit 80b0921ce3

View File

@ -251,7 +251,7 @@ namespace Opm
template<class T> template<class T>
SimulatorReport SimulatorFullyImplicitBlackoil<T>::Impl::run(SimulatorTimer& timer, SimulatorReport SimulatorFullyImplicitBlackoil<T>::Impl::run(SimulatorTimer& timer,
BlackoilState& state) BlackoilState& state)
{ {
WellStateFullyImplicitBlackoil well_state; WellStateFullyImplicitBlackoil well_state;
@ -271,17 +271,23 @@ namespace Opm
timer.report(std::cout); timer.report(std::cout);
WellsManager wells_manager(eclipse_state_, WellsManager wells_manager(eclipse_state_,
timer.currentStepNum(), timer.currentStepNum(),
grid_, Opm::UgGridHelpers::numCells(grid_),
props_.permeability()); Opm::UgGridHelpers::globalCell(grid_),
Opm::UgGridHelpers::cartDims(grid_),
Opm::UgGridHelpers::dimensions(grid_),
Opm::UgGridHelpers::beginCellCentroids(grid_),
Opm::UgGridHelpers::cell2Faces(grid_),
Opm::UgGridHelpers::beginFaceCentroids(grid_),
props_.permeability());
const Wells *wells = wells_manager.c_wells(); const Wells *wells = wells_manager.c_wells();
if (timer.currentStepNum() == 0) { if (timer.currentStepNum() == 0) {
well_state.init(wells, state); well_state.init(wells, state);
output_writer_.writeInit(timer); output_writer_.writeInit(timer);
} else { } else {
// TODO: add a function to update the well_state here. // TODO: add a function to update the well_state here.
} }
if (output_ && (timer.currentStepNum() % output_interval_ == 0)) { if (output_ && (timer.currentStepNum() % output_interval_ == 0)) {