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

Merge pull request #1015 from andlaus/flow_ebos-remove-redundancy

Browse Source 
FlowMainEbos: remove the redundant pointer to the MaterialLawManager
This commit is contained in:
Atgeirr Flø Rasmussen
2017-01-12 10:25:47 +01:00
committed by GitHub
parent eb8132453f 8c76bf5b9b
commit af2c9a8200
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/autodiff/FlowMainEbos.hpp
View File

@@ -376,18 +376,16 @@ namespace Opm
// Create grid and property objects. // Create grid and property objects.
// Writes to: // Writes to:
// material_law_manager_
// fluidprops_ // fluidprops_
// gravity_ // gravity_
void setupGridAndProps() void setupGridAndProps()
{ {
Dune::CpGrid& grid = ebosSimulator_->gridManager().grid(); Dune::CpGrid& grid = ebosSimulator_->gridManager().grid();
material_law_manager_ = ebosSimulator_->problem().materialLawManager();
// create the legacy properties objects // create the legacy properties objects
fluidprops_.reset(new BlackoilPropsAdFromDeck(deck(), fluidprops_.reset(new BlackoilPropsAdFromDeck(deck(),
eclState(), eclState(),
material_law_manager_, materialLawManager(),
grid)); grid));
// Gravity. // Gravity.
@@ -427,7 +425,7 @@ namespace Opm
// Need old-style fluid object for init purposes (only). // Need old-style fluid object for init purposes (only).
BlackoilPropertiesFromDeck props(deck(), BlackoilPropertiesFromDeck props(deck(),
eclState(), eclState(),
material_law_manager_, materialLawManager(),
grid.size(/*codim=*/0), grid.size(/*codim=*/0),
grid.globalCell().data(), grid.globalCell().data(),
grid.logicalCartesianSize().data(), grid.logicalCartesianSize().data(),
@@ -709,6 +707,9 @@ namespace Opm
Grid& grid() Grid& grid()
{ return ebosSimulator_->gridManager().grid(); } { return ebosSimulator_->gridManager().grid(); }
std::shared_ptr<MaterialLawManager> materialLawManager()
{ return ebosSimulator_->problem().materialLawManager(); }
std::unordered_set<std::string> defunctWellNames() const std::unordered_set<std::string> defunctWellNames() const
{ return ebosSimulator_->gridManager().defunctWellNames(); } { return ebosSimulator_->gridManager().defunctWellNames(); }
@@ -719,7 +720,6 @@ namespace Opm
parameter::ParameterGroup param_; parameter::ParameterGroup param_;
bool output_to_files_ = false; bool output_to_files_ = false;
std::string output_dir_ = std::string("."); std::string output_dir_ = std::string(".");
std::shared_ptr<MaterialLawManager> material_law_manager_;
std::unique_ptr<BlackoilPropsAdFromDeck> fluidprops_; std::unique_ptr<BlackoilPropsAdFromDeck> fluidprops_;
std::array<double, 3> gravity_; std::array<double, 3> gravity_;
std::unique_ptr<DerivedGeology> geoprops_; std::unique_ptr<DerivedGeology> geoprops_;