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

make Opm::DerivedGeology as a direct arguement for simulator.

Browse Source
This commit is contained in:
Liu Ming
2014-09-25 16:40:01 +08:00
parent fb0f4f7a92
commit e22398c098
3 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.cpp
View File

@@ -161,6 +161,7 @@ namespace Opm
// \TODO: Treat bcs.
SimulatorFullyImplicitCompressiblePolymer::Impl::Impl(const parameter::ParameterGroup& param,
const UnstructuredGrid& grid,
const DerivedGeology& geo,
const BlackoilPropsAdInterface& props,
const PolymerPropsAd& polymer_props,
const RockCompressibility* rock_comp_props,
@@ -176,7 +177,7 @@ namespace Opm
wells_(wells_manager.c_wells()),
polymer_inflow_(polymer_inflow),
gravity_(gravity),
geo_(grid_, props_, gravity_),
geo_(geo),
solver_(grid_, props_, geo_, rock_comp_props, polymer_props, *wells_manager.c_wells(), linsolver)
/* param.getDefault("nl_pressure_residual_tolerance", 0.0),

2
opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp
View File

@@ -32,6 +32,7 @@ namespace Opm
namespace parameter { class ParameterGroup; }
class BlackoilPropsAdInterface;
class RockCompressibility;
class DerivedGeology;
class WellsManager;
class LinearSolverInterface;
class SimulatorTimer;
@@ -71,6 +72,7 @@ namespace Opm
/// \param[in] gravity if non-null, gravity vector
SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param,
const UnstructuredGrid& grid,
const DerivedGeology& geo,
const BlackoilPropsAdInterface& props,
const PolymerPropsAd& polymer_props,
const RockCompressibility* rock_comp_props,