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 EclWellModel property to WellModel

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

2
ebos/ebos.hh
View File

@@ -66,7 +66,7 @@ struct EnableExperiments<TypeTag, TTag::EbosTypeTag> {
// use flow's well model for now // use flow's well model for now
template<class TypeTag> template<class TypeTag>
struct EclWellModel<TypeTag, TTag::EbosTypeTag> { struct WellModel<TypeTag, TTag::EbosTypeTag> {
using type = BlackoilWellModel<TypeTag>; using type = BlackoilWellModel<TypeTag>;
}; };

8
ebos/eclproblem.hh
View File

@@ -172,7 +172,7 @@ class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
using Evaluation = GetPropType<TypeTag, Properties::Evaluation>; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
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 EclWellModel = GetPropType<TypeTag, Properties::EclWellModel>; using WellModel = GetPropType<TypeTag, Properties::WellModel>;
using EclAquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>; using EclAquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>;
using SolventModule = BlackOilSolventModule<TypeTag>; using SolventModule = BlackOilSolventModule<TypeTag>;
@@ -1493,10 +1493,10 @@ public:
* *
* This can be used for inspecting wells outside of the problem. * This can be used for inspecting wells outside of the problem.
*/ */
const EclWellModel& wellModel() const const WellModel& wellModel() const
{ return wellModel_; } { return wellModel_; }
EclWellModel& wellModel() WellModel& wellModel()
{ return wellModel_; } { return wellModel_; }
const EclAquiferModel& aquiferModel() const const EclAquiferModel& aquiferModel() const
@@ -2771,7 +2771,7 @@ private:
bool enableDriftCompensation_; bool enableDriftCompensation_;
GlobalEqVector drift_; GlobalEqVector drift_;
EclWellModel wellModel_; WellModel wellModel_;
EclAquiferModel aquiferModel_; EclAquiferModel aquiferModel_;
bool enableEclOutput_; bool enableEclOutput_;

4
ebos/eclproblem_properties.hh
View File

@@ -65,9 +65,9 @@ struct EclBaseProblem {
}; };
} }
// The class which deals with ECL wells // The class which deals with wells
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct EclWellModel { struct WellModel {
using type = UndefinedProperty; using type = UndefinedProperty;
}; };

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

@@ -142,7 +142,7 @@ struct EnableDispersion<TypeTag, TTag::FlowProblem> {
}; };
template<class TypeTag> template<class TypeTag>
struct EclWellModel<TypeTag, TTag::FlowProblem> { struct WellModel<TypeTag, TTag::FlowProblem> {
using type = BlackoilWellModel<TypeTag>; using type = BlackoilWellModel<TypeTag>;
}; };
template<class TypeTag> template<class TypeTag>

4
opm/simulators/linalg/ISTLSolver.hpp
View File

@@ -66,7 +66,7 @@ struct FlowIstlSolver {
} }
template <class TypeTag, class MyTypeTag> template <class TypeTag, class MyTypeTag>
struct EclWellModel; struct WellModel;
//! Set the type of a global jacobian matrix for linear solvers that are based on //! Set the type of a global jacobian matrix for linear solvers that are based on
//! dune-istl. //! dune-istl.
@@ -148,7 +148,7 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>; using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>; using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>;
using Indices = GetPropType<TypeTag, Properties::Indices>; using Indices = GetPropType<TypeTag, Properties::Indices>;
using WellModel = GetPropType<TypeTag, Properties::EclWellModel>; using WellModel = GetPropType<TypeTag, Properties::WellModel>;
using Simulator = GetPropType<TypeTag, Properties::Simulator>; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using Matrix = typename SparseMatrixAdapter::IstlMatrix; using Matrix = typename SparseMatrixAdapter::IstlMatrix;
using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>; using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;

2
opm/simulators/linalg/ISTLSolverBda.hpp
View File

@@ -107,7 +107,7 @@ protected:
using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>; using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>; using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>;
using Indices = GetPropType<TypeTag, Properties::Indices>; using Indices = GetPropType<TypeTag, Properties::Indices>;
using WellModel = GetPropType<TypeTag, Properties::EclWellModel>; using WellModel = GetPropType<TypeTag, Properties::WellModel>;
using Simulator = GetPropType<TypeTag, Properties::Simulator>; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using Matrix = typename SparseMatrixAdapter::IstlMatrix; using Matrix = typename SparseMatrixAdapter::IstlMatrix;
using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>; using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;

4
tests/test_equil.cc
View File

@@ -85,7 +85,7 @@ struct TestEquilVapwatTypeTag {
} }
template<class TypeTag> template<class TypeTag>
struct EclWellModel<TypeTag, TTag::TestEquilTypeTag> { struct WellModel<TypeTag, TTag::TestEquilTypeTag> {
using type = BlackoilWellModel<TypeTag>; using type = BlackoilWellModel<TypeTag>;
}; };
template<class TypeTag> template<class TypeTag>
@@ -93,7 +93,7 @@ struct EnableVapwat<TypeTag, TTag::TestEquilTypeTag> {
static constexpr bool value = true; static constexpr bool value = true;
}; };
template<class TypeTag> template<class TypeTag>
struct EclWellModel<TypeTag, TTag::TestEquilVapwatTypeTag> { struct WellModel<TypeTag, TTag::TestEquilVapwatTypeTag> {
using type = BlackoilWellModel<TypeTag>; using type = BlackoilWellModel<TypeTag>;
}; };
template<class TypeTag> template<class TypeTag>