From 8c76bf5b9b2d49511852fe890b10600957d05b56 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Wed, 11 Jan 2017 17:16:46 +0100 Subject: [PATCH] FlowMainEbos: remove the redundant pointer to the MaterialLawManager --- opm/autodiff/FlowMainEbos.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opm/autodiff/FlowMainEbos.hpp b/opm/autodiff/FlowMainEbos.hpp index d03b26c74..cdd9938ba 100644 --- a/opm/autodiff/FlowMainEbos.hpp +++ b/opm/autodiff/FlowMainEbos.hpp @@ -376,18 +376,16 @@ namespace Opm // Create grid and property objects. // Writes to: - // material_law_manager_ // fluidprops_ // gravity_ void setupGridAndProps() { Dune::CpGrid& grid = ebosSimulator_->gridManager().grid(); - material_law_manager_ = ebosSimulator_->problem().materialLawManager(); // create the legacy properties objects fluidprops_.reset(new BlackoilPropsAdFromDeck(deck(), eclState(), - material_law_manager_, + materialLawManager(), grid)); // Gravity. @@ -427,7 +425,7 @@ namespace Opm // Need old-style fluid object for init purposes (only). BlackoilPropertiesFromDeck props(deck(), eclState(), - material_law_manager_, + materialLawManager(), grid.size(/*codim=*/0), grid.globalCell().data(), grid.logicalCartesianSize().data(), @@ -709,6 +707,9 @@ namespace Opm Grid& grid() { return ebosSimulator_->gridManager().grid(); } + std::shared_ptr materialLawManager() + { return ebosSimulator_->problem().materialLawManager(); } + std::unordered_set defunctWellNames() const { return ebosSimulator_->gridManager().defunctWellNames(); } @@ -719,7 +720,6 @@ namespace Opm parameter::ParameterGroup param_; bool output_to_files_ = false; std::string output_dir_ = std::string("."); - std::shared_ptr material_law_manager_; std::unique_ptr fluidprops_; std::array gravity_; std::unique_ptr geoprops_;