Commit 323024b1 authored by Timo Koch's avatar Timo Koch
Browse files

[1p][2p][2pnc] Get perm type from spatial params

parent 40ab1e09
......@@ -45,6 +45,8 @@ class OnePVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using PermeabilityType = typename SpatialParams::PermeabilityType;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
......@@ -58,7 +60,6 @@ class OnePVolumeVariables : public ImplicitVolumeVariables<TypeTag>
public:
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using typename ParentType::PermeabilityType;
/*!
* \copydoc ImplicitVolumeVariables::update
......
......@@ -47,6 +47,8 @@ class TwoPVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using PermeabilityType = typename SpatialParams::PermeabilityType;
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
......@@ -74,7 +76,6 @@ class TwoPVolumeVariables : public ImplicitVolumeVariables<TypeTag>
public:
// export type of fluid state for non-isothermal models
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using typename ParentType::PermeabilityType;
/*!
* \copydoc ImplicitVolumeVariables::update
......
......@@ -56,6 +56,7 @@ class TwoPNCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using PermeabilityType = typename SpatialParams::PermeabilityType;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
......@@ -108,7 +109,6 @@ class TwoPNCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
public:
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using PermeabilityType = typename SpatialParams::PermeabilityType;
/*!
* \copydoc ImplicitVolumeVariables::update
......
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