OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-22 09:16:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed: remove SET_PROP macro usage

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-08-27 11:38:38 +02:00
parent 7d853d2e05
commit 941e4916f8
14 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ebos/ebos_altidx.cc
View File

@ -60,7 +60,8 @@ struct EbosAltIdxTypeTag {
}
// use a fluid system with different indices than the default
SET_PROP(EbosAltIdxTypeTag, FluidSystem)
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::EbosAltIdxTypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;

3
ebos/ebos_gasoil.cc
View File

@ -39,7 +39,8 @@ struct EbosGasOilTypeTag {
}
//! The indices indices which only enable oil and water
SET_PROP(EbosGasOilTypeTag, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EbosGasOilTypeTag>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

3
ebos/ebos_oilwater.cc
View File

@ -39,7 +39,8 @@ struct EbosOilWaterTypeTag {
}
//! The indices indices which only enable oil and water
SET_PROP(EbosOilWaterTypeTag, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EbosOilWaterTypeTag>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

3
ebos/ebos_oilwaterpolymer.cc
View File

@ -44,7 +44,8 @@ struct EnablePolymer<TypeTag, TTag::EbosOilWaterPolymerTypeTag> {
};
//! The indices indices which only enable oil and water
SET_PROP(EbosOilWaterPolymerTypeTag, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EbosOilWaterPolymerTypeTag>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

12
ebos/eclproblem.hh
View File

@ -183,7 +183,8 @@ SET_TAG_PROP(EclBaseProblem, SpatialDiscretizationSplice, EcfvDiscretization);
SET_TAG_PROP(EclBaseProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
// Set the material law for fluid fluxes
SET_PROP(EclBaseProblem, MaterialLaw)
template<class TypeTag>
struct MaterialLaw<TypeTag, TTag::EclBaseProblem>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@ -201,7 +202,8 @@ public:
};
// Set the material law for energy storage in rock
SET_PROP(EclBaseProblem, SolidEnergyLaw)
template<class TypeTag>
struct SolidEnergyLaw<TypeTag, TTag::EclBaseProblem>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@ -214,7 +216,8 @@ public:
};
// Set the material law for thermal conduction
SET_PROP(EclBaseProblem, ThermalConductionLaw)
template<class TypeTag>
struct ThermalConductionLaw<TypeTag, TTag::EclBaseProblem>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@ -228,7 +231,8 @@ public:
// ebos can use a slightly faster stencil class because it does not need the normals and
// the integration points of intersections
SET_PROP(EclBaseProblem, Stencil)
template<class TypeTag>
struct Stencil<TypeTag, TTag::EclBaseProblem>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;

3
flow/flow_blackoil_dunecpr.cpp
View File

@ -82,7 +82,8 @@ namespace Opm {
static constexpr auto value = "quasiimpes";
};
SET_PROP(EclFlowProblemSimple, FluidSystem)
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::EclFlowProblemSimple>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;

3
flow/flow_ebos_gasoil.cpp
View File

@ -43,7 +43,8 @@ struct EclFlowGasOilProblem {
}
//! The indices required by the model
SET_PROP(EclFlowGasOilProblem, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowGasOilProblem>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

3
flow/flow_ebos_oilwater.cpp
View File

@ -43,7 +43,8 @@ struct EclFlowOilWaterProblem {
}
//! The indices required by the model
SET_PROP(EclFlowOilWaterProblem, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowOilWaterProblem>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

3
flow/flow_ebos_oilwater_brine.cpp
View File

@ -46,7 +46,8 @@ struct EnableBrine<TypeTag, TTag::EclFlowOilWaterBrineProblem> {
static constexpr bool value = true;
};
//! The indices required by the model
SET_PROP(EclFlowOilWaterBrineProblem, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowOilWaterBrineProblem>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

4
flow/flow_ebos_oilwater_polymer.cpp
View File

@ -46,8 +46,8 @@ struct EnablePolymer<TypeTag, TTag::EclFlowOilWaterPolymerProblem> {
static constexpr bool value = true;
};
//! The indices required by the model
//! The indices required by the model
SET_PROP(EclFlowOilWaterPolymerProblem, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowOilWaterPolymerProblem>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

3
flow/flow_ebos_oilwater_polymer_injectivity.cpp
View File

@ -52,7 +52,8 @@ struct EnablePolymerMW<TypeTag, TTag::EclFlowOilWaterPolymerInjectivityProblem>
//! The indices required by the model
// For this case, there will be two primary variables introduced for the polymer
// polymer concentration and polymer molecular weight
SET_PROP(EclFlowOilWaterPolymerInjectivityProblem, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowOilWaterPolymerInjectivityProblem>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

3
flow/flow_onephase.cpp
View File

@ -31,7 +31,8 @@ struct EclFlowProblemSimple {
};
}
//! The indices required by the model
SET_PROP(EclFlowProblemSimple, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowProblemSimple>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

3
flow/flow_onephase_energy.cpp
View File

@ -34,7 +34,8 @@ struct EnableEnergy<TypeTag, TTag::EclFlowProblemSimple> {
static constexpr bool value = true;
};
//! The indices required by the model
SET_PROP(EclFlowProblemSimple, Indices)
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowProblemSimple>
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads

3
opm/simulators/linalg/ISTLSolverEbos.hpp
View File

@ -67,7 +67,8 @@ struct EclWellModel;
//! Set the type of a global jacobian matrix for linear solvers that are based on
//! dune-istl.
SET_PROP(FlowIstlSolver, SparseMatrixAdapter)
template<class TypeTag>
struct SparseMatrixAdapter<TypeTag, TTag::FlowIstlSolver>
{
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;