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

no reason for GasLiftWellState to be typetag dependent

Browse Source
This commit is contained in:
Arne Morten Kvarving 2021-05-20 12:15:58 +02:00
parent e5ab36e0f1
commit 31cb01ae24
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/wells/BlackoilWellModel.hpp
View File

@ -109,7 +109,7 @@ namespace Opm {
typedef typename BaseAuxiliaryModule<TypeTag>::NeighborSet NeighborSet; typedef typename BaseAuxiliaryModule<TypeTag>::NeighborSet NeighborSet;
using GasLiftSingleWell = ::Opm::GasLiftSingleWell<TypeTag>; using GasLiftSingleWell = ::Opm::GasLiftSingleWell<TypeTag>;
using GasLiftStage2 = ::Opm::GasLiftStage2<TypeTag>; using GasLiftStage2 = ::Opm::GasLiftStage2<TypeTag>;
using GLiftWellState = ::Opm::GasLiftWellState<TypeTag>; using GLiftWellState = GasLiftWellState;
using GLiftWellStateMap = using GLiftWellStateMap =
std::map<std::string,std::unique_ptr<GLiftWellState>>; std::map<std::string,std::unique_ptr<GLiftWellState>>;
using GLiftOptWells = using GLiftOptWells =

4
opm/simulators/wells/GasLiftSingleWell.hpp
View File

@ -60,8 +60,8 @@ namespace Opm
{ {
using Simulator = GetPropType<TypeTag, Properties::Simulator>; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using WellState = WellStateFullyImplicitBlackoil; using WellState = WellStateFullyImplicitBlackoil;
using StdWell = Opm::StandardWell<TypeTag>; using StdWell = StandardWell<TypeTag>;
using GLiftWellState = Opm::GasLiftWellState<TypeTag>; using GLiftWellState = GasLiftWellState;
// TODO: same definition with WellInterface, and // TODO: same definition with WellInterface, and
// WellStateFullyImplicitBlackoil eventually they should go // WellStateFullyImplicitBlackoil eventually they should go
// to a common header file. // to a common header file.

2
opm/simulators/wells/GasLiftStage2.hpp
View File

@ -61,7 +61,7 @@ namespace Opm
using WellState = WellStateFullyImplicitBlackoil; using WellState = WellStateFullyImplicitBlackoil;
using BlackoilWellModel = ::Opm::BlackoilWellModel<TypeTag>; using BlackoilWellModel = ::Opm::BlackoilWellModel<TypeTag>;
using GasLiftSingleWell = ::Opm::GasLiftSingleWell<TypeTag>; using GasLiftSingleWell = ::Opm::GasLiftSingleWell<TypeTag>;
using GLiftWellState = ::Opm::GasLiftWellState<TypeTag>; using GLiftWellState = GasLiftWellState;
using GLiftOptWells = typename BlackoilWellModel::GLiftOptWells; using GLiftOptWells = typename BlackoilWellModel::GLiftOptWells;
using GLiftProdWells = typename BlackoilWellModel::GLiftProdWells; using GLiftProdWells = typename BlackoilWellModel::GLiftProdWells;
using GLiftWellStateMap = typename BlackoilWellModel::GLiftWellStateMap; using GLiftWellStateMap = typename BlackoilWellModel::GLiftWellStateMap;

1
opm/simulators/wells/GasLiftWellState.hpp
View File

@ -27,7 +27,6 @@
namespace Opm namespace Opm
{ {
template<class TypeTag>
class GasLiftWellState class GasLiftWellState
{ {
public: public: