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

flow_ebos: only instantiate a single deck and a single EclipseState

Browse Source
This commit is contained in:
Andreas Lauser
2016-08-08 15:26:09 +02:00
parent 17c1e1083e
commit 626d3e1da5
3 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilModelEbos.hpp
View File

@@ -139,7 +139,6 @@ namespace Opm {
const RockCompressibility* rock_comp_props,
const StandardWells& well_model,
const NewtonIterationBlackoilInterface& linsolver,
Opm::EclipseStateConstPtr eclState,
const bool has_disgas,
const bool has_vapoil,
const bool terminal_output)
@@ -149,8 +148,8 @@ namespace Opm {
, geo_ (geo)
, rock_comp_props_(rock_comp_props)
, vfp_properties_(
eclState->getTableManager().getVFPInjTables(),
eclState->getTableManager().getVFPProdTables())
eclState().getTableManager().getVFPInjTables(),
eclState().getTableManager().getVFPProdTables())
, linsolver_ (linsolver)
, active_(detail::activePhases(fluid.phaseUsage()))
, canph_ (detail::active2Canonical(fluid.phaseUsage()))
@@ -184,6 +183,9 @@ namespace Opm {
global_nc_ = Opm::AutoDiffGrid::numCells(grid_);
}
const EclipseState& eclState() const
{ return *ebosSimulator_.gridManager().eclState(); }
/// Called once before each time step.
/// \param[in] timer simulation timer
/// \param[in, out] reservoir_state reservoir state variables