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

Finishing compliation.

Browse Source
This commit is contained in:
Kai Bao 2014-07-27 17:31:00 +02:00
parent 1e8d5e65b7
commit eb3445e6a1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/sim_fibo_ad.cpp
View File

@ -198,7 +198,7 @@ try
// since number of wells may change etc. // since number of wells may change etc.
SimulatorFullyImplicitBlackoil simulator(param, SimulatorFullyImplicitBlackoil<UnstructuredGrid> simulator(param,
*grid->c_grid(), *grid->c_grid(),
*new_props, *new_props,
rock_comp->isActive() ? rock_comp.get() : 0, rock_comp->isActive() ? rock_comp.get() : 0,

10
opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp
View File

@ -65,7 +65,6 @@ namespace Opm
const Grid& grid, const Grid& grid,
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
WellsManager& wells_manager,
NewtonIterationBlackoilInterface& linsolver, NewtonIterationBlackoilInterface& linsolver,
const double* gravity, const double* gravity,
bool has_disgas, bool has_disgas,
@ -114,7 +113,6 @@ namespace Opm
const Grid& grid, const Grid& grid,
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
WellsManager& wells_manager,
NewtonIterationBlackoilInterface& linsolver, NewtonIterationBlackoilInterface& linsolver,
const double* gravity, const double* gravity,
const bool has_disgas, const bool has_disgas,
@ -123,7 +121,7 @@ namespace Opm
EclipseWriter& output_writer) EclipseWriter& output_writer)
{ {
pimpl_.reset(new Impl(param, grid, props, rock_comp_props, wells_manager, linsolver, gravity, has_disgas, has_vapoil, eclipse_state, output_writer)); pimpl_.reset(new Impl(param, grid, props, rock_comp_props, linsolver, gravity, has_disgas, has_vapoil, eclipse_state, output_writer));
} }
@ -215,7 +213,7 @@ namespace Opm
gravity_(gravity), gravity_(gravity),
geo_(grid_, props_, gravity_), geo_(grid_, props_, gravity_),
// solver_(param, grid_, props_, geo_, rock_comp_props, *wells_manager.c_wells(), linsolver, has_disgas, has_vapoil) // solver_(param, grid_, props_, geo_, rock_comp_props, *wells_manager.c_wells(), linsolver, has_disgas, has_vapoil)
slover_(linsolver), solver_(linsolver),
has_disgas_(has_disgas), has_disgas_(has_disgas),
has_vapoil_(has_vapoil), has_vapoil_(has_vapoil),
eclipse_state_(eclipse_state), eclipse_state_(eclipse_state),
@ -294,7 +292,7 @@ namespace Opm
if (timer.currentStepNum() == 0) { if (timer.currentStepNum() == 0) {
well_state.init(wells, state); well_state.init(wells, state);
output_writer_.writeInit(timer, state, well_state.basicWellState()); 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.
} }
@ -310,7 +308,7 @@ namespace Opm
SimulatorReport sreport; SimulatorReport sreport;
FullyImplicitBlackoilSolver solver( param_, grid_, props_, geo_, rock_comp_props_, *wells, linsolver_, has_disgas_, has_vapoil_); FullyImplicitBlackoilSolver<UnstructuredGrid> solver(param_, grid_, props_, geo_, rock_comp_props_, *wells, solver_, has_disgas_, has_vapoil_);
// Run solver. // Run solver.
solver_timer.start(); solver_timer.start();