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

rename EclAquiferModel property to AquiferModel

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-06 08:18:32 +01:00
parent 991f89816e
commit 6b0dbfdf2d
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/ebos.hh
View File

@ -103,7 +103,7 @@ struct UseVolumetricResidual<TypeTag, TTag::EbosTypeTag> {
// by default use flow's aquifer model for now // by default use flow's aquifer model for now
template<class TypeTag> template<class TypeTag>
struct EclAquiferModel<TypeTag, TTag::EbosTypeTag> { struct AquiferModel<TypeTag, TTag::EbosTypeTag> {
using type = BlackoilAquiferModel<TypeTag>; using type = BlackoilAquiferModel<TypeTag>;
}; };

8
ebos/eclproblem.hh
View File

@ -173,7 +173,7 @@ class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
using Indices = GetPropType<TypeTag, Properties::Indices>; using Indices = GetPropType<TypeTag, Properties::Indices>;
using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>; using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
using WellModel = GetPropType<TypeTag, Properties::WellModel>; using WellModel = GetPropType<TypeTag, Properties::WellModel>;
using EclAquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>; using AquiferModel = GetPropType<TypeTag, Properties::AquiferModel>;
using SolventModule = BlackOilSolventModule<TypeTag>; using SolventModule = BlackOilSolventModule<TypeTag>;
using PolymerModule = BlackOilPolymerModule<TypeTag>; using PolymerModule = BlackOilPolymerModule<TypeTag>;
@ -1499,10 +1499,10 @@ public:
WellModel& wellModel() WellModel& wellModel()
{ return wellModel_; } { return wellModel_; }
const EclAquiferModel& aquiferModel() const const AquiferModel& aquiferModel() const
{ return aquiferModel_; } { return aquiferModel_; }
EclAquiferModel& mutableAquiferModel() AquiferModel& mutableAquiferModel()
{ return aquiferModel_; } { return aquiferModel_; }
// temporary solution to facilitate output of initial state from flow // temporary solution to facilitate output of initial state from flow
@ -2772,7 +2772,7 @@ private:
GlobalEqVector drift_; GlobalEqVector drift_;
WellModel wellModel_; WellModel wellModel_;
EclAquiferModel aquiferModel_; AquiferModel aquiferModel_;
bool enableEclOutput_; bool enableEclOutput_;
std::unique_ptr<EclWriterType> eclWriter_; std::unique_ptr<EclWriterType> eclWriter_;

4
ebos/eclproblem_properties.hh
View File

@ -115,7 +115,7 @@ struct EnableApiTracking {
// The class which deals with ECL aquifers // The class which deals with ECL aquifers
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct EclAquiferModel { struct AquiferModel {
using type = UndefinedProperty; using type = UndefinedProperty;
}; };
@ -241,7 +241,7 @@ public:
// by default use the dummy aquifer "model" // by default use the dummy aquifer "model"
template<class TypeTag> template<class TypeTag>
struct EclAquiferModel<TypeTag, TTag::EclBaseProblem> { struct AquiferModel<TypeTag, TTag::EclBaseProblem> {
using type = EclBaseAquiferModel<TypeTag>; using type = EclBaseAquiferModel<TypeTag>;
}; };

2
opm/simulators/flow/BlackoilModel.hpp
View File

@ -98,7 +98,7 @@ struct UseVolumetricResidual<TypeTag, TTag::FlowProblem> {
}; };
template<class TypeTag> template<class TypeTag>
struct EclAquiferModel<TypeTag, TTag::FlowProblem> { struct AquiferModel<TypeTag, TTag::FlowProblem> {
using type = BlackoilAquiferModel<TypeTag>; using type = BlackoilAquiferModel<TypeTag>;
}; };

2
opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
View File

@ -151,7 +151,7 @@ public:
using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>; using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
using AquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>; using AquiferModel = GetPropType<TypeTag, Properties::AquiferModel>;
using TimeStepper = AdaptiveTimeStepping<TypeTag>; using TimeStepper = AdaptiveTimeStepping<TypeTag>;
using PolymerModule = BlackOilPolymerModule<TypeTag>; using PolymerModule = BlackOilPolymerModule<TypeTag>;