Commit 4171f665 authored by Timo Koch's avatar Timo Koch Committed by Kilian Weishaupt
Browse files

[cleanup] Replace depr prop macros by GetPropType traits

parent 4cdfd163
...@@ -73,8 +73,8 @@ template<class TypeTag> ...@@ -73,8 +73,8 @@ template<class TypeTag>
struct PrimaryInteractionVolume<TypeTag, TTag::CCMpfaModel> struct PrimaryInteractionVolume<TypeTag, TTag::CCMpfaModel>
{ {
private: private:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using NodalIndexSet = typename GET_PROP_TYPE(TypeTag, DualGridNodalIndexSet); using NodalIndexSet = GetPropType<TypeTag, Properties::DualGridNodalIndexSet>;
// use the default traits // use the default traits
using Traits = CCMpfaODefaultInteractionVolumeTraits< NodalIndexSet, Scalar >; using Traits = CCMpfaODefaultInteractionVolumeTraits< NodalIndexSet, Scalar >;
......
...@@ -42,7 +42,7 @@ class RANSProblemImpl; ...@@ -42,7 +42,7 @@ class RANSProblemImpl;
//! the turbulence-model-specfic RANS problem //! the turbulence-model-specfic RANS problem
template<class TypeTag> template<class TypeTag>
using RANSProblem = RANSProblemImpl<TypeTag, GET_PROP_TYPE(TypeTag, ModelTraits)::turbulenceModel()>; using RANSProblem = RANSProblemImpl<TypeTag, GetPropType<TypeTag, Properties::ModelTraits>::turbulenceModel()>;
/*! /*!
* \ingroup RANSModel * \ingroup RANSModel
......
...@@ -706,8 +706,8 @@ class StokesDarcyCouplingDataImplementation<MDTraits, CouplingManager, enableEne ...@@ -706,8 +706,8 @@ class StokesDarcyCouplingDataImplementation<MDTraits, CouplingManager, enableEne
using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType; using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType;
static constexpr bool isFicksLaw = IsFicksLaw<typename GET_PROP_TYPE(SubDomainTypeTag<stokesIdx>, MolecularDiffusionType)>(); static constexpr bool isFicksLaw = IsFicksLaw<GetPropType<SubDomainTypeTag<stokesIdx>, Properties::MolecularDiffusionType>>();
static_assert(isFicksLaw == IsFicksLaw<typename GET_PROP_TYPE(SubDomainTypeTag<darcyIdx>, MolecularDiffusionType)>(), static_assert(isFicksLaw == IsFicksLaw<GetPropType<SubDomainTypeTag<darcyIdx>,Properties:: MolecularDiffusionType>>(),
"Both submodels must use the same diffusion law."); "Both submodels must use the same diffusion law.");
using ReducedComponentVector = Dune::FieldVector<Scalar, numComponents-1>; using ReducedComponentVector = Dune::FieldVector<Scalar, numComponents-1>;
...@@ -906,7 +906,7 @@ protected: ...@@ -906,7 +906,7 @@ protected:
*/ */
Scalar diffusionCoefficientMS_(const VolumeVariables<darcyIdx>& volVars, int phaseIdx, int compIIdx, int compJIdx) const Scalar diffusionCoefficientMS_(const VolumeVariables<darcyIdx>& volVars, int phaseIdx, int compIIdx, int compJIdx) const
{ {
using EffDiffModel = typename GET_PROP_TYPE(SubDomainTypeTag<darcyIdx>, EffectiveDiffusivityModel); using EffDiffModel = GetPropType<SubDomainTypeTag<darcyIdx>, Properties::EffectiveDiffusivityModel>;
auto fluidState = volVars.fluidState(); auto fluidState = volVars.fluidState();
typename FluidSystem<darcyIdx>::ParameterCache paramCache; typename FluidSystem<darcyIdx>::ParameterCache paramCache;
paramCache.updateAll(fluidState); paramCache.updateAll(fluidState);
......
...@@ -220,7 +220,7 @@ int main(int argc, char** argv) try ...@@ -220,7 +220,7 @@ int main(int argc, char** argv) try
// loop over elements to compute fluxes, saturations, densities for tracer // loop over elements to compute fluxes, saturations, densities for tracer
using FluxVariables = typename GET_PROP_TYPE(TwoPTypeTag, FluxVariables); using FluxVariables = GetPropType<TwoPTypeTag, Properties::FluxVariables>;
auto upwindTerm = [](const auto& volVars) { return volVars.mobility(0); }; auto upwindTerm = [](const auto& volVars) { return volVars.mobility(0); };
for (const auto& element : elements(leafGridView)) for (const auto& element : elements(leafGridView))
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment