diff --git a/dumux/multidomain/subdomainboxlocalassembler.hh b/dumux/multidomain/subdomainboxlocalassembler.hh index ded63109e131cf54d298b13cacbae307bf5e3168..487912202eea1f03d3904800044f9e2d1cf70632 100644 --- a/dumux/multidomain/subdomainboxlocalassembler.hh +++ b/dumux/multidomain/subdomainboxlocalassembler.hh @@ -561,20 +561,20 @@ class SubDomainBoxLocalAssembler<id, TypeTag, Assembler, DiffMethod::numeric, /* { using ThisType = SubDomainBoxLocalAssembler<id, TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/false>; using ParentType = SubDomainBoxLocalAssemblerBase<id, TypeTag, Assembler, ThisType, /*implicit=*/false>; - using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); - using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); + using Scalar = GetPropType<TypeTag, Properties::Scalar>; + using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>; using ElementResidualVector = typename ParentType::LocalResidual::ElementResidualVector; - using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables)::LocalView; - using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry); + using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView; + using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>; using FVElementGeometry = typename FVGridGeometry::LocalView; using GridView = typename FVGridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - enum { numEq = GET_PROP_TYPE(TypeTag, ModelTraits)::numEq() }; - enum { dim = GET_PROP_TYPE(TypeTag, GridView)::dimension }; + enum { numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq() }; + enum { dim = GetPropType<TypeTag, Properties::GridView>::dimension }; - static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache); - static constexpr bool enableGridVolVarsCache = GET_PROP_VALUE(TypeTag, EnableGridVolumeVariablesCache); + static constexpr bool enableGridFluxVarsCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>(); + static constexpr bool enableGridVolVarsCache = getPropValue<TypeTag, Properties::EnableGridVolumeVariablesCache>(); static constexpr auto domainI = Dune::index_constant<id>(); public: diff --git a/dumux/multidomain/subdomaincclocalassembler.hh b/dumux/multidomain/subdomaincclocalassembler.hh index 5524e9141bf9269d4d6ce3c659d92dbcb93250f4..918e1401c27a6eca2651e53556c02bb79baa1604 100644 --- a/dumux/multidomain/subdomaincclocalassembler.hh +++ b/dumux/multidomain/subdomaincclocalassembler.hh @@ -553,10 +553,10 @@ class SubDomainCCLocalAssembler<id, TypeTag, Assembler, DiffMethod::numeric, /*i using ThisType = SubDomainCCLocalAssembler<id, TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/false>; using ParentType = SubDomainCCLocalAssemblerBase<id, TypeTag, Assembler, ThisType, /*implicit=*/false>; - using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); - using LocalResidualValues = typename GET_PROP_TYPE(TypeTag, NumEqVector); + using Scalar = GetPropType<TypeTag, Properties::Scalar>; + using LocalResidualValues = GetPropType<TypeTag, Properties::NumEqVector>; - static constexpr int numEq = GET_PROP_TYPE(TypeTag, ModelTraits)::numEq(); + static constexpr int numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq(); static constexpr auto domainI = Dune::index_constant<id>(); public: