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

changed: remove SET_TYPE_PROP macro usage

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-08-27 11:38:38 +02:00
parent 93a3ebf8f7
commit 3b21a8a481
8 changed files with 105 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@@ -95,7 +95,10 @@ struct UseVolumetricResidual<TypeTag, TTag::EclFlowProblem> {
static constexpr bool value = false;
};
SET_TYPE_PROP(EclFlowProblem, EclAquiferModel, Opm::BlackoilAquiferModel<TypeTag>);
template<class TypeTag>
struct EclAquiferModel<TypeTag, TTag::EclFlowProblem> {
using type = Opm::BlackoilAquiferModel<TypeTag>;
};
// disable all extensions supported by black oil model. this should not really be
// necessary but it makes things a bit more explicit
@@ -124,7 +127,10 @@ struct EnableBrine<TypeTag, TTag::EclFlowProblem> {
static constexpr bool value = false;
};
SET_TYPE_PROP(EclFlowProblem, EclWellModel, Opm::BlackoilWellModel<TypeTag>);
template<class TypeTag>
struct EclWellModel<TypeTag, TTag::EclFlowProblem> {
using type = Opm::BlackoilWellModel<TypeTag>;
};
SET_TAG_PROP(EclFlowProblem, LinearSolverSplice, FlowIstlSolver);
} // namespace Opm::Properties

5
opm/simulators/linalg/FlowLinearSolverParameters.hpp
View File

@@ -212,7 +212,10 @@ template<class TypeTag>
struct UseCpr<TypeTag, TTag::FlowIstlSolverParams> {
static constexpr bool value = false;
};
SET_TYPE_PROP(FlowIstlSolverParams, LinearSolverBackend, Opm::ISTLSolverEbos<TypeTag>);
template<class TypeTag>
struct LinearSolverBackend<TypeTag, TTag::FlowIstlSolverParams> {
using type = Opm::ISTLSolverEbos<TypeTag>;
};
template<class TypeTag>
struct PreconditionerAddWellContributions<TypeTag, TTag::FlowIstlSolverParams> {
static constexpr bool value = false;