changed: remove GET_PROP_TYPE / GET_PROP macro usage

This commit is contained in:
Arne Morten Kvarving
2020-08-26 10:49:52 +02:00
parent 82a35e53b7
commit 74fac38d85
58 changed files with 300 additions and 303 deletions

View File

@@ -43,7 +43,7 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful.
typedef typename GET_PROP_TYPE(TTag::EbosTypeTag, FluidSystem) FluidSystem;
using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>;
public:
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -65,7 +65,7 @@ void ebosOilWaterPolymerSetDeck(Opm::Deck* deck,
double externalSetupTime)
{
using ProblemTypeTag = Properties::TTag::EbosOilWaterPolymerTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext);