Skip to content
GitLab
Commit 8b53cdae authored by Bernd Flemisch's avatar Bernd Flemisch Committed by Timo Koch
Browse files

remove unused private alias declarations, enums and static numbers 

Treat all files `*volumevariables*` and `*localresidual*`.
parent 5abda34f
Hide whitespace changes
Inline Side-by-side
dumux/assembly/boxlocalresidual.hh
View file @ 8b53cdae
......@@ -46,22 +46,12 @@ class BoxLocalResidual : public FVLocalResidual<TypeTag>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
enum {
numEq = GET_PROP_VALUE(TypeTag, NumEq),
dim = GridView::dimension
};
using Element = typename GridView::template Codim<0>::Entity;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementResidualVector = Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, NumEqVector)>;
......
dumux/assembly/fvlocalresidual.hh
View file @ 8b53cdae
......@@ -53,9 +53,7 @@ class FVLocalResidual
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementResidualVector = Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, NumEqVector)>;
using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
......
dumux/assembly/staggeredlocalresidual.hh
View file @ 8b53cdae
......@@ -40,42 +40,23 @@ class StaggeredLocalResidual
{
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Implementation = typename GET_PROP_TYPE(TypeTag, LocalResidual);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Element = typename GridView::template Codim<0>::Entity;
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using CellCenterSolutionVector = typename GET_PROP_TYPE(TypeTag, CellCenterSolutionVector);
using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using CellCenterResidual = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FaceResidual = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
using FaceResidualVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
typename DofTypeIndices::FaceIdx faceIdx;
enum {
// grid and world dimension
dim = GridView::dimension,
dimWorld = GridView::dimensionworld
};
using TimeLoop = TimeLoopBase<Scalar>;
public:
......
dumux/freeflow/navierstokes/staggered/localresidual.hh
View file @ 8b53cdae
......@@ -56,32 +56,21 @@ class NavierStokesResidualImpl<TypeTag, DiscretizationMethods::Staggered>
using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
typename DofTypeIndices::FaceIdx faceIdx;
using CellCenterResidual = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FaceResidual = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
static constexpr auto numEqCellCenter = GET_PROP_VALUE(TypeTag, NumEqCellCenter);
enum {
// grid and world dimension
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
pressureIdx = Indices::pressureIdx,
massBalanceIdx = Indices::massBalanceIdx,
......@@ -90,7 +79,6 @@ class NavierStokesResidualImpl<TypeTag, DiscretizationMethods::Staggered>
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
static constexpr bool navierStokes = GET_PROP_VALUE(TypeTag, EnableInertiaTerms);
static constexpr bool normalizePressure = GET_PROP_VALUE(TypeTag, NormalizePressure);
public:
......@@ -144,7 +132,7 @@ public:
const VolumeVariables& volVars) const
{
CellCenterPrimaryVariables storage;
storage[Indices::massBalanceIdx] = volVars.density();
storage[massBalanceIdx] = volVars.density();
computeStorageForCellCenterNonIsothermal_(std::integral_constant<bool, GET_PROP_VALUE(TypeTag, EnableEnergyBalance) >(),
problem, scv, volVars, storage);
......
dumux/freeflow/navierstokesnc/staggered/localresidual.hh
View file @ 8b53cdae
......@@ -57,9 +57,6 @@ class NavierStokesNCResidualImpl<TypeTag, DiscretizationMethods::Staggered>
using CellCenterResidual = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
enum {
conti0EqIdx = Indices::conti0EqIdx,
phaseIdx = Indices::phaseIdx,
......
dumux/freeflow/navierstokesnc/volumevariables.hh
View file @ 8b53cdae
......@@ -45,7 +45,6 @@ class NavierStokesNCVolumeVariables : public NavierStokesVolumeVariables<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 FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
......@@ -53,8 +52,6 @@ class NavierStokesNCVolumeVariables : public NavierStokesVolumeVariables<TypeTag
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using ParameterCache = typename FluidSystem::ParameterCache;
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
numPhases = FluidSystem::numPhases,
mainCompIdx = Indices::mainCompIdx,
......
dumux/porousmediumflow/1p/incompressiblelocalresidual.hh
View file @ 8b53cdae
......@@ -42,7 +42,6 @@ class OnePIncompressibleLocalResidual : public ImmiscibleLocalResidual<TypeTag>
using ParentType = ImmiscibleLocalResidual<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementResidualVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
......@@ -54,14 +53,11 @@ class OnePIncompressibleLocalResidual : public ImmiscibleLocalResidual<TypeTag>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using EnergyLocalResidual = typename GET_PROP_TYPE(TypeTag, EnergyLocalResidual);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
// first index for the mass balance
enum { conti0EqIdx = Indices::conti0EqIdx };
enum { pressureIdx = Indices::pressureIdx };
static const int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
public:
using ParentType::ParentType;
......
dumux/porousmediumflow/1p/volumevariables.hh
View file @ 8b53cdae
......@@ -45,7 +45,6 @@ class OnePVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
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);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
......
dumux/porousmediumflow/1pnc/volumevariables.hh
View file @ 8b53cdae
......@@ -56,7 +56,6 @@ class OnePNCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
......@@ -65,12 +64,10 @@ class OnePNCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
enum
{
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
phaseIdx = Indices::phaseIdx,
phaseCompIdx = Indices::phaseCompIdx,
firstTransportEqIdx = Indices::firstTransportEqIdx,
// primary variable indices
pressureIdx = Indices::pressureIdx,
......@@ -78,13 +75,7 @@ class OnePNCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
};
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
using Element = typename GridView::template Codim<0>::Entity;
using DimVector = Dune::FieldVector<Scalar,dim>;
using GlobalPosition = Dune::FieldVector<Scalar,dimWorld>;
public:
......
dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
View file @ 8b53cdae
......@@ -45,7 +45,6 @@ class TwoPIncompressibleLocalResidual : public ImmiscibleLocalResidual<TypeTag>
using ParentType = ImmiscibleLocalResidual<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementResidualVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
......@@ -56,7 +55,6 @@ class TwoPIncompressibleLocalResidual : public ImmiscibleLocalResidual<TypeTag>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using EnergyLocalResidual = typename GET_PROP_TYPE(TypeTag, EnergyLocalResidual);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
// first index for the mass balance
......@@ -69,8 +67,6 @@ class TwoPIncompressibleLocalResidual : public ImmiscibleLocalResidual<TypeTag>
saturationIdx = Indices::saturationIdx
};
static const int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
public:
using ParentType::ParentType;
......
dumux/porousmediumflow/2p/volumevariables.hh
View file @ 8b53cdae
......@@ -49,7 +49,6 @@ class TwoPVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
......
dumux/porousmediumflow/2p1c/volumevariables.hh
View file @ 8b53cdae
......@@ -41,7 +41,6 @@ class TwoPOneCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
......@@ -50,14 +49,10 @@ class TwoPOneCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params;
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
dim = GridView::dimension,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
......
dumux/porousmediumflow/2p2c/volumevariables.hh
View file @ 8b53cdae
......@@ -100,7 +100,6 @@ class TwoPTwoCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
using MiscibleMultiPhaseComposition = Dumux::MiscibleMultiPhaseComposition<Scalar, FluidSystem, useKelvinEquation>;
static constexpr int dim = GridView::dimension;
static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
public:
......
dumux/porousmediumflow/2pnc/volumevariables.hh
View file @ 8b53cdae
......@@ -53,7 +53,6 @@ class TwoPNCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
......@@ -62,13 +61,10 @@ class TwoPNCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params;
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum
{
dim = GridView::dimension,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
numMajorComponents = GET_PROP_VALUE(TypeTag, NumMajorComponents),
......@@ -97,13 +93,10 @@ class TwoPNCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
};
using Element = typename GridView::template Codim<0>::Entity;
using CoordScalar = typename Grid::ctype;
using Miscible2pNCComposition = Dumux::Miscible2pNCComposition<Scalar, FluidSystem>;
using ComputeFromReferencePhase = Dumux::ComputeFromReferencePhase<Scalar, FluidSystem>;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static_assert(useMoles, "use moles has to be set true in the 2pnc model");
static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
enum { dofCodim = isBox ? dim : 0 };
public:
......@@ -130,7 +123,7 @@ public:
/////////////
// calculate the remaining quantities
/////////////
const MaterialLawParams &materialParams = problem.spatialParams().materialLawParams(element, scv, elemSol);
const auto &materialParams = problem.spatialParams().materialLawParams(element, scv, elemSol);
// Second instance of a parameter cache.
// Could be avoided if diffusion coefficients also
......
dumux/porousmediumflow/3p/volumevariables.hh
View file @ 8b53cdae
......@@ -50,15 +50,12 @@ class ThreePVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
enum {
dim = GridView::dimension,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
wPhaseIdx = Indices::wPhaseIdx,
......@@ -70,11 +67,6 @@ class ThreePVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
pressureIdx = Indices::pressureIdx
};
static const Scalar R; // universal gas constant
enum { isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box };
enum { dofCodim = isBox ? dim : 0 };
public:
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
......@@ -274,13 +266,6 @@ private:
const Implementation &asImp_() const
{ return *static_cast<const Implementation*>(this); }
};
/*!
* \brief The ideal gas constant \f$\mathrm{[J/(mol K)]}\f$
*/
template <class TypeTag>
const typename ThreePVolumeVariables<TypeTag>::Scalar ThreePVolumeVariables<TypeTag>::R = Constants<typename GET_PROP_TYPE(TypeTag, Scalar)>::R;
} // end namespace
#endif
dumux/porousmediumflow/3p3c/localresidual.hh
View file @ 8b53cdae
......@@ -45,12 +45,10 @@ class ThreePThreeCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
......
dumux/porousmediumflow/3p3c/volumevariables.hh
View file @ 8b53cdae
......@@ -50,22 +50,16 @@ class ThreePThreeCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeT
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
// constraint solvers
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using PermeabilityType = typename SpatialParams::PermeabilityType;
using MiscibleMultiPhaseComposition = Dumux::MiscibleMultiPhaseComposition<Scalar, FluidSystem>;
using ComputeFromReferencePhase = Dumux::ComputeFromReferencePhase<Scalar, FluidSystem>;
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
dim = GridView::dimension,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
......@@ -94,9 +88,6 @@ class ThreePThreeCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeT
using Element = typename GridView::template Codim<0>::Entity;
// universial gas constant
static constexpr Scalar R = Dumux::Constants<Scalar>::R;
public:
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
......@@ -122,7 +113,7 @@ public:
bool useConstraintSolver = GET_PROP_VALUE(TypeTag, UseConstraintSolver);
// capillary pressure parameters
const MaterialLawParams &materialParams =
const auto &materialParams =
problem.spatialParams().materialLawParams(element, scv, elemSol);
......
dumux/porousmediumflow/3pwateroil/localresidual.hh
View file @ 8b53cdae
......@@ -47,12 +47,10 @@ protected:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
......
dumux/porousmediumflow/3pwateroil/volumevariables.hh
View file @ 8b53cdae
......@@ -59,22 +59,15 @@ class ThreePWaterOilVolumeVariables : public PorousMediumFlowVolumeVariables<Typ
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
// constraint solvers
using MiscibleMultiPhaseComposition = Dumux::MiscibleMultiPhaseComposition<Scalar, FluidSystem>;
using ComputeFromReferencePhase = Dumux::ComputeFromReferencePhase<Scalar, FluidSystem>;
enum {
dim = GridView::dimension,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
wCompIdx = Indices::wCompIdx,
nCompIdx = Indices::nCompIdx,
gCompIdx = Indices::gCompIdx,
wPhaseIdx = Indices::wPhaseIdx,
gPhaseIdx = Indices::gPhaseIdx,
......@@ -97,11 +90,6 @@ class ThreePWaterOilVolumeVariables : public PorousMediumFlowVolumeVariables<Typ
using Element = typename GridView::template Codim<0>::Entity;
static const Scalar R; // universial gas constant
enum { isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box };
enum { dofCodim = isBox ? dim : 0 };
public:
//! The type of the object returned by the fluidState() method
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
......@@ -857,10 +845,6 @@ private:
const Implementation &asImp_() const
{ return *static_cast<const Implementation*>(this); }
};
template <class TypeTag>
const typename ThreePWaterOilVolumeVariables<TypeTag>::Scalar ThreePWaterOilVolumeVariables<TypeTag>::R = Constants<typename GET_PROP_TYPE(TypeTag, Scalar)>::R;
} // end namespace
#endif
dumux/porousmediumflow/co2/volumevariables.hh
View file @ 8b53cdae
......@@ -43,17 +43,13 @@ class TwoPTwoCCO2VolumeVariables : public TwoPTwoCVolumeVariables<TypeTag>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents)
};
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum {
wCompIdx = Indices::wCompIdx,
......
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