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_TAG_PROP macro usage

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-08-27 11:38:38 +02:00
parent 3b21a8a481
commit 9a000c6d07
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ebos/ebos.hh
View File

@ -107,7 +107,10 @@ struct EclAquiferModel<TypeTag, TTag::EbosTypeTag> {
}; };
// use flow's linear solver backend for now // use flow's linear solver backend for now
SET_TAG_PROP(EbosTypeTag, LinearSolverSplice, FlowIstlSolver); template<class TypeTag>
struct LinearSolverSplice<TypeTag, TTag::EbosTypeTag> {
using type = TTag::FlowIstlSolver;
};
// the default for the allowed volumetric error for oil per second // the default for the allowed volumetric error for oil per second
template<class TypeTag> template<class TypeTag>

10
ebos/eclproblem.hh
View File

@ -219,10 +219,16 @@ struct Problem<TypeTag, TTag::EclBaseProblem> {
}; };
// Select the element centered finite volume method as spatial discretization // Select the element centered finite volume method as spatial discretization
SET_TAG_PROP(EclBaseProblem, SpatialDiscretizationSplice, EcfvDiscretization); template<class TypeTag>
struct SpatialDiscretizationSplice<TypeTag, TTag::EclBaseProblem> {
using type = TTag::EcfvDiscretization;
};
//! for ebos, use automatic differentiation to linearize the system of PDEs //! for ebos, use automatic differentiation to linearize the system of PDEs
SET_TAG_PROP(EclBaseProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer); template<class TypeTag>
struct LocalLinearizerSplice<TypeTag, TTag::EclBaseProblem> {
using type = TTag::AutoDiffLocalLinearizer;
};
// Set the material law for fluid fluxes // Set the material law for fluid fluxes
template<class TypeTag> template<class TypeTag>

10
flow/flow_blackoil_dunecpr.cpp
View File

@ -105,7 +105,10 @@ namespace Opm {
// struct LinearSolverBackend<TypeTag, TTag::EclFlowProblemSimple> { // struct LinearSolverBackend<TypeTag, TTag::EclFlowProblemSimple> {
// using type = Opm::ISTLSolverEbos<TypeTag>; // using type = Opm::ISTLSolverEbos<TypeTag>;
// }; // };
//SET_TAG_PROP(EclFlowProblemSimple, LinearSolverSplice, ParallelBiCGStabLinearSolver); // template<class TypeTag>
// struct LinearSolverSplice<TypeTag, TTag::EclFlowProblemSimple> {
// using type = TTag::ParallelBiCGStabLinearSolver;
// };
// template<class TypeTag> // template<class TypeTag>
// struct LinearSolverBackend<TypeTag, TTag::EclFlowProblemSimple> { // struct LinearSolverBackend<TypeTag, TTag::EclFlowProblemSimple> {
// using type = Opm::Linear::ParallelBiCGStabSolverBackend<TypeTag>; // not work // using type = Opm::Linear::ParallelBiCGStabSolverBackend<TypeTag>; // not work
@ -114,7 +117,10 @@ namespace Opm {
// struct LinearSolverBackend<TypeTag, TTag::EclFlowProblemSimple> { // struct LinearSolverBackend<TypeTag, TTag::EclFlowProblemSimple> {
// using type = Opm::Linear::SuperLUBackend<TypeTag>; // not work // using type = Opm::Linear::SuperLUBackend<TypeTag>; // not work
// }; // };
//SET_TAG_PROP(EclFlowProblem, FluidState, Opm::BlackOilFluidState); // template<class TypeTag>
// struct FluidState<TypeTag, TTag::EclFlowProblem> {
// using type = Opm::BlackOilFluidState;
// };
template<class TypeTag> template<class TypeTag>
struct LinearSolverBackend<TypeTag, TTag::EclFlowProblemSimple> { struct LinearSolverBackend<TypeTag, TTag::EclFlowProblemSimple> {

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

@ -131,7 +131,10 @@ template<class TypeTag>
struct EclWellModel<TypeTag, TTag::EclFlowProblem> { struct EclWellModel<TypeTag, TTag::EclFlowProblem> {
using type = Opm::BlackoilWellModel<TypeTag>; using type = Opm::BlackoilWellModel<TypeTag>;
}; };
SET_TAG_PROP(EclFlowProblem, LinearSolverSplice, FlowIstlSolver); template<class TypeTag>
struct LinearSolverSplice<TypeTag, TTag::EclFlowProblem> {
using type = TTag::FlowIstlSolver;
};
} // namespace Opm::Properties } // namespace Opm::Properties