From 98a6495abc9945bea73e38cab027a3f9786d62dd Mon Sep 17 00:00:00 2001 From: Kai Bao Date: Wed, 29 Jun 2016 17:08:45 +0200 Subject: [PATCH] makeing wellModel public for flow_polymer and flow_solvent. --- opm/autodiff/BlackoilSolventModel.hpp | 3 ++- opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opm/autodiff/BlackoilSolventModel.hpp b/opm/autodiff/BlackoilSolventModel.hpp index 589aeaced..14391daf0 100644 --- a/opm/autodiff/BlackoilSolventModel.hpp +++ b/opm/autodiff/BlackoilSolventModel.hpp @@ -88,6 +88,8 @@ namespace Opm { ReservoirState& reservoir_state, WellState& well_state); + using Base::wellModel; + protected: @@ -129,7 +131,6 @@ namespace Opm { // --------- Protected methods --------- // Need to declare Base members we want to use here. - using Base::wellModel; using Base::wells; using Base::variableState; using Base::computeGasPressure; diff --git a/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp b/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp index cfe157a17..c3ef5cefd 100644 --- a/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp +++ b/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp @@ -125,6 +125,7 @@ namespace Opm { WellState& well_state, const bool initial_assembly); + using Base::wellModel; protected: @@ -180,7 +181,6 @@ namespace Opm { // --------- Protected methods --------- // Need to declare Base members we want to use here. - using Base::wellModel; using Base::wells; using Base::wellsActive; using Base::variableState;