move time iterations to Simulator class and pass deck to create polymer inflows.

This should solve the issues: write the final state to eclipse binaries.
This commit is contained in:
Liu Ming
2014-10-28 13:14:44 +08:00
parent 5535dd99cc
commit 5242d6bbf7
3 changed files with 79 additions and 115 deletions

View File

@@ -86,14 +86,13 @@ namespace Opm
const PolymerPropsAd& polymer_props,
const RockCompressibility* rock_comp_props,
NewtonIterationBlackoilInterface& linsolver,
const PolymerInflowInterface& polymer_inflow,
WellsManager& well_manager,
const double* gravity,
const bool disgas,
const bool vapoil,
const bool polymer,
std::shared_ptr<EclipseState> eclipse_state,
EclipseWriter& output_writer,
Opm::DeckConstPtr& deck,
const std::vector<double>& threshold_pressures_by_face);
/// Run the simulation.
@@ -104,8 +103,7 @@ namespace Opm
/// \param[in,out] well_state state of wells: bhp, perforation rates
/// \return simulation report, with timing data
SimulatorReport run(SimulatorTimer& timer,
PolymerBlackoilState& state,
WellStateFullyImplicitBlackoil& well_state);
PolymerBlackoilState& state);
private:
class Impl;