diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
index 182b4d8a0f34fe02246b4b2ba8174306f9eeacad..0d382e713cef31f8f535e32c06775aeca04d5907 100644
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
@@ -62,8 +62,6 @@ class OnePTwoCFluxVariables
typedef typename GET_PROP_TYPE(TypeTag, OnePTwoCIndices) Indices;
enum {
- phaseIdx = Indices::phaseIdx,
- comp0Idx = Indices::comp0Idx,
comp1Idx = Indices::comp1Idx
};
diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
index 86650517636702860f1599709072a0f894c14d62..7d3904ab6acff25fde45acc883fb7c10d0ded4c1 100644
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
@@ -74,16 +74,10 @@ protected:
enum
{
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
numEq = GET_PROP_VALUE(TypeTag, NumEq),
// indices of the primary variables
- pressureIdx = Indices::pressureIdx,
- x1Idx = Indices::x1Idx,
- phaseIdx = Indices::phaseIdx,
- comp0Idx = Indices::comp0Idx,
comp1Idx = Indices::comp1Idx,
// indices of the equations
diff --git a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
index 76b31c4af62f13c77fbb7e29ffe423b5ca0ddf7f..2cd4ca9fb434d0d40f88b0e81c4f4df28773846c 100644
--- a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
@@ -62,10 +62,7 @@ class OnePTwoCVolumeVariables : public BoxVolumeVariables<TypeTag>
comp1Idx = Indices::comp1Idx,
pressureIdx = Indices::pressureIdx,
- x1Idx = Indices::x1Idx,
-
- contiEqIdx = Indices::contiEqIdx,
- transEqIdx = Indices::transEqIdx
+ x1Idx = Indices::x1Idx
};
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
index e7ea257a1da5c1f55d6290054e146abab4ae5856..e3dc0d3ab2577be0622d9c399967b5183cf1daaa 100644
--- a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
@@ -56,7 +56,6 @@ class TwoPTwoCNILocalResidual : public TwoPTwoCLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
diff --git a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
index 877a2f13bf0ffb1d447e0a67279bfc8e6b9e3ea4..80655534c572977596a936943a42901cf3f4602f 100644
--- a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
+++ b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
@@ -73,7 +73,6 @@ class ThreePThreeCFluxVariables
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- typedef typename FVElementGeometry::SubControlVolume SCV;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
typedef Dune::FieldVector<CoordScalar, dimWorld> Vector;
diff --git a/dumux/boxmodels/3p3c/3p3clocalresidual.hh b/dumux/boxmodels/3p3c/3p3clocalresidual.hh
index abc62f5ea0a672d4512104e8f46be0eff451a388..c9be2cba68ffa40a6b0b4d73dd2b05b5fd679868 100644
--- a/dumux/boxmodels/3p3c/3p3clocalresidual.hh
+++ b/dumux/boxmodels/3p3c/3p3clocalresidual.hh
@@ -57,35 +57,21 @@ template<class TypeTag>
class ThreePThreeCLocalResidual: public BoxLocalResidual<TypeTag>
{
protected:
- typedef ThreePThreeCLocalResidual<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
- typedef BoxLocalResidual<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, ElementSolutionVector) ElementSolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
enum
{
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
- pressureIdx = Indices::pressureIdx,
- switch1Idx = Indices::switch1Idx,
- switch2Idx = Indices::switch2Idx,
contiWEqIdx = Indices::contiWEqIdx,
contiCEqIdx = Indices::contiCEqIdx,
@@ -97,29 +83,15 @@ protected:
wCompIdx = Indices::wCompIdx,
cCompIdx = Indices::cCompIdx,
- aCompIdx = Indices::aCompIdx,
-
- threePhases = Indices::threePhases,
- wPhaseOnly = Indices::wPhaseOnly,
- gnPhaseOnly = Indices::gnPhaseOnly,
- wnPhaseOnly = Indices::wnPhaseOnly,
- gPhaseOnly = Indices::gPhaseOnly,
- wgPhaseOnly = Indices::wgPhaseOnly
+ aCompIdx = Indices::aCompIdx
+
};
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::ctype CoordScalar;
- typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
public:
/*!
diff --git a/dumux/boxmodels/3p3c/3p3cmodel.hh b/dumux/boxmodels/3p3c/3p3cmodel.hh
index cc32b1c576482a4e206f8b8d5da485b6d67a1a95..a2780a927e17ddab1484472355d32b8ba61fe589 100644
--- a/dumux/boxmodels/3p3c/3p3cmodel.hh
+++ b/dumux/boxmodels/3p3c/3p3cmodel.hh
@@ -97,7 +97,6 @@ namespace Dumux
template<class TypeTag>
class ThreePThreeCModel: public BoxModel<TypeTag>
{
- typedef ThreePThreeCModel<TypeTag> ThisType;
typedef BoxModel<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -108,11 +107,6 @@ class ThreePThreeCModel: public BoxModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
@@ -120,7 +114,6 @@ class ThreePThreeCModel: public BoxModel<TypeTag>
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
@@ -128,9 +121,6 @@ class ThreePThreeCModel: public BoxModel<TypeTag>
switch1Idx = Indices::switch1Idx,
switch2Idx = Indices::switch2Idx,
- contiWEqIdx = Indices::contiWEqIdx,
- contiCEqIdx = Indices::contiCEqIdx,
- contiAEqIdx = Indices::contiAEqIdx,
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
@@ -149,14 +139,12 @@ class ThreePThreeCModel: public BoxModel<TypeTag>
};
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> FluidState;
typedef typename GridView::template Codim<dim>::Entity Vertex;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
/*!
@@ -294,7 +282,6 @@ public:
MultiWriter &writer)
{
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar, dim> > VectorField;
// create the required scalar fields
unsigned numVertices = this->problem_().gridView().size(dim);
diff --git a/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh b/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh
index 0171040bfc85e530e622499b253642cbd622b5ce..4c4299c04bb214b421466f00237aad8115f6da52 100644
--- a/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh
+++ b/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh
@@ -49,25 +49,9 @@ template <class TypeTag>
class ThreePThreeCNewtonController : public NewtonController<TypeTag>
{
typedef NewtonController<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonController) Implementation;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
-
- enum {
- pressureIdx = Indices::pressureIdx,
- switch1Idx = Indices::switch1Idx,
- switch2Idx = Indices::switch2Idx
- };
-
- enum { enablePartialReassemble = GET_PROP_VALUE(TypeTag, EnablePartialReassemble) };
-
public:
ThreePThreeCNewtonController(const Problem &problem)
: ParentType(problem)
diff --git a/dumux/boxmodels/3p3c/3p3cvolumevariables.hh b/dumux/boxmodels/3p3c/3p3cvolumevariables.hh
index 8fb5668025676dba919131d05300d06290e1d933..249c9fe8502c152271c92d13bbd61b5ccee9256a 100644
--- a/dumux/boxmodels/3p3c/3p3cvolumevariables.hh
+++ b/dumux/boxmodels/3p3c/3p3cvolumevariables.hh
@@ -75,7 +75,6 @@ class ThreePThreeCVolumeVariables : public BoxVolumeVariables<TypeTag>
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
- formulation = GET_PROP_VALUE(TypeTag, Formulation),
wCompIdx = Indices::wCompIdx,
aCompIdx = Indices::aCompIdx,
diff --git a/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh b/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh
index b081c062f76a81d50b3037cc151e11627f578754..c5d88884cccdad61ce8f963b2f2efbcfff284407 100644
--- a/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh
@@ -57,7 +57,6 @@ class ThreePThreeCNIFluxVariables : public ThreePThreeCFluxVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GridView::ctype CoordScalar;
typedef typename GridView::template Codim<0>::Entity Element;
@@ -65,14 +64,10 @@ class ThreePThreeCNIFluxVariables : public ThreePThreeCFluxVariables<TypeTag>
enum {
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
-
- numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
+ dimWorld = GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename FVElementGeometry::SubControlVolume SCV;
- typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
typedef Dune::FieldVector<CoordScalar, dimWorld> Vector;
diff --git a/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh b/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
index 69a857e59c6bcead47052300477dc842b7b165af..2c0c98664185d18b2059c7522e6af6d75752e0e2 100644
--- a/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
@@ -51,11 +51,8 @@ namespace Dumux
template<class TypeTag>
class ThreePThreeCNILocalResidual : public ThreePThreeCLocalResidual<TypeTag>
{
- typedef ThreePThreeCNILocalResidual<TypeTag> ThisType;
typedef ThreePThreeCLocalResidual<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -64,8 +61,6 @@ class ThreePThreeCNILocalResidual : public ThreePThreeCLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
@@ -82,8 +77,6 @@ class ThreePThreeCNILocalResidual : public ThreePThreeCLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
static constexpr Scalar massUpwindWeight = GET_PROP_VALUE(TypeTag, MassUpwindWeight);
diff --git a/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh b/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh
index 4089422134a26baf9b125f0245000afcfc8768e5..2b83d4ed5bd93c6dbf77fcecf7424c9e514d26d7 100644
--- a/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh
@@ -58,18 +58,14 @@ class ThreePThreeCNIVolumeVariables : public ThreePThreeCVolumeVariables<TypeTag
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { temperatureIdx = Indices::temperatureIdx };
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
//! \endcond
public:
diff --git a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
index 849d35634f9b8175ab8c71cb94f63f99541e321e..89333760abb3e6c30fbdb26406f8f2497eae514d 100644
--- a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
@@ -65,7 +65,6 @@ class MPNCFluxVariables
enum {
dimWorld = GridView::dimensionworld,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
- numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion),
enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy),
diff --git a/dumux/boxmodels/MpNc/MpNclocalresidual.hh b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
index d90de9a009866ababd74256e7927ee449a43f9b9..9774a03f391122e53a982676b38dce3e94d870a7 100644
--- a/dumux/boxmodels/MpNc/MpNclocalresidual.hh
+++ b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
@@ -56,19 +56,13 @@ protected:
enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
- numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy),
enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy),
- enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion),
enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic),
- enableSmoothUpwinding = GET_PROP_VALUE(TypeTag, EnableSmoothUpwinding),
phase0NcpIdx = Indices::phase0NcpIdx
};
diff --git a/dumux/boxmodels/MpNc/MpNcmodel.hh b/dumux/boxmodels/MpNc/MpNcmodel.hh
index 718b67ba4d005e6c123e9bd7ddb1f81d91f83565..f1f05de3ffeab2adacbcc8e1965fbac7b44327fe 100644
--- a/dumux/boxmodels/MpNc/MpNcmodel.hh
+++ b/dumux/boxmodels/MpNc/MpNcmodel.hh
@@ -138,9 +138,7 @@ class MPNCModel : public BoxModel<TypeTag>
numDiffMethod = GET_PROP_VALUE(TypeTag, NumericDifferenceMethod),
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- dimWorld = GridView::dimensionworld,
- dim = GridView::dimension
+ numEq = GET_PROP_VALUE(TypeTag, NumEq)
};
public:
diff --git a/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh b/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
index 945d612c33bab14fe445094d9b1c441fcf3c0951..2e8cca11b7ff24462d3a41f6c321248a99c9eadd 100644
--- a/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
+++ b/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
@@ -174,9 +174,7 @@ class MPNCNewtonController : public NewtonController<TypeTag>
enum {
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
- enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy),
enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic),
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
p0Idx = Indices::p0Idx,
S0Idx = Indices::S0Idx
diff --git a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
index 8361a665998895eea29d55c74d1cfb105316cefc..ca75a251cd70bc349740004b129be7d795c96550 100644
--- a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
@@ -70,14 +70,12 @@ class MPNCVolumeVariables
enum {
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
- dimWorld = GridView::dimensionworld,
enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy),
enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic),
enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy),
enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion) || enableKinetic,
- numEnergyEqs = Indices::NumPrimaryEnergyVars,
S0Idx = Indices::S0Idx,
p0Idx = Indices::p0Idx
diff --git a/dumux/boxmodels/common/boxlocaljacobian.hh b/dumux/boxmodels/common/boxlocaljacobian.hh
index 2fc5243793b460053a3ff2e19a4d81c26e9975f1..39b9fd0f53993a89a4b42bd605584b8e32e22a86 100644
--- a/dumux/boxmodels/common/boxlocaljacobian.hh
+++ b/dumux/boxmodels/common/boxlocaljacobian.hh
@@ -82,8 +82,6 @@ private:
numEq = GET_PROP_VALUE(TypeTag, NumEq),
dim = GridView::dimension,
- Red = JacobianAssembler::Red,
- Yellow = JacobianAssembler::Yellow,
Green = JacobianAssembler::Green
};
diff --git a/dumux/boxmodels/richards/richardsfluxvariables.hh b/dumux/boxmodels/richards/richardsfluxvariables.hh
index 6384a6d985a13c97bb6b723cd8fa27e6a2cfca2b..01b289ccc934039fd4ac4fce0715370f4077c406 100644
--- a/dumux/boxmodels/richards/richardsfluxvariables.hh
+++ b/dumux/boxmodels/richards/richardsfluxvariables.hh
@@ -50,8 +50,7 @@ class RichardsFluxVariables
typedef typename GET_PROP_TYPE(TypeTag, RichardsIndices) Indices;
enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
+ wPhaseIdx = Indices::wPhaseIdx
};
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/dumux/boxmodels/richards/richardslocalresidual.hh b/dumux/boxmodels/richards/richardslocalresidual.hh
index 7d5e74e2cbd733d40118b030be24a512183f8cc4..c808bffa0ba74c08c9cf20b498182de918b992c0 100644
--- a/dumux/boxmodels/richards/richardslocalresidual.hh
+++ b/dumux/boxmodels/richards/richardslocalresidual.hh
@@ -51,8 +51,7 @@ class RichardsLocalResidual : public BoxLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, RichardsIndices) Indices;
enum {
contiEqIdx = Indices::contiEqIdx,
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
+ wPhaseIdx = Indices::wPhaseIdx
};
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/dumux/freeflow/stokes/stokesfluxvariables.hh b/dumux/freeflow/stokes/stokesfluxvariables.hh
index 08a5f25fc31805ddaffb18db8b90100b2b34a2c7..0802a3f8e29b4ff8f4301a742501ad7af6345945 100644
--- a/dumux/freeflow/stokes/stokesfluxvariables.hh
+++ b/dumux/freeflow/stokes/stokesfluxvariables.hh
@@ -56,7 +56,6 @@ class StokesFluxVariables
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
enum { dim = GridView::dimension };
diff --git a/dumux/freeflow/stokes/stokeslocaljacobian.hh b/dumux/freeflow/stokes/stokeslocaljacobian.hh
index 81a7c56791cc66ce7aa178f07c9e6d571310cc0e..f97ecce8e00bf0812a6f87edd24a367b3c44a45d 100644
--- a/dumux/freeflow/stokes/stokeslocaljacobian.hh
+++ b/dumux/freeflow/stokes/stokeslocaljacobian.hh
@@ -44,16 +44,9 @@ namespace Dumux
template<class TypeTag>
class StokesLocalJacobian : public BoxLocalJacobian<TypeTag>
{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
+public:
//! \copydoc BoxLocalJacobian::numericEpsilon()
Scalar numericEpsilon(int scvIdx,
int pvIdx) const
diff --git a/dumux/freeflow/stokes/stokeslocalresidual.hh b/dumux/freeflow/stokes/stokeslocalresidual.hh
index 726a6de29b774ebf689d18abab35030a135dc1f1..434dd2b0019487ed3b550bf06a150825a0dcb697 100644
--- a/dumux/freeflow/stokes/stokeslocalresidual.hh
+++ b/dumux/freeflow/stokes/stokeslocalresidual.hh
@@ -74,21 +74,12 @@ protected:
massBalanceIdx = Indices::massBalanceIdx, //!< Index of the mass balance
momentumXIdx = Indices::momentumXIdx, //!< Index of the x-component of the momentum balance
- momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
- momentumZIdx = Indices::momentumZIdx, //!< Index of the z-component of the momentum balance
lastMomentumIdx = Indices::lastMomentumIdx //!< Index of the last component of the momentum balance
};
- enum {
- dimXIdx = Indices::dimXIdx, //!< Index for the first component of a vector
- dimYIdx = Indices::dimYIdx, //!< Index for the second component of a vector
- dimZIdx = Indices::dimZIdx //!< Index for the third component of a vector
- };
- typedef typename GridView::ctype CoordScalar;
typedef Dune::GenericReferenceElements<Scalar, dim> ReferenceElements;
typedef Dune::GenericReferenceElement<Scalar, dim> ReferenceElement;
- typedef Dune::FieldVector<CoordScalar, dim> GlobalPosition;
typedef Dune::FieldVector<Scalar, dim> ScalarGradient;
typedef Dune::FieldVector<Scalar, dim> FieldVector;
diff --git a/dumux/freeflow/stokes/stokesmodel.hh b/dumux/freeflow/stokes/stokesmodel.hh
index 287415b84bcb0adeb2e4839b6bb42b809d71166d..7bc02692e595a14a3de70a2b79d5d33ed1d88f51 100644
--- a/dumux/freeflow/stokes/stokesmodel.hh
+++ b/dumux/freeflow/stokes/stokesmodel.hh
@@ -66,9 +66,7 @@ class StokesModel : public BoxModel<TypeTag>
enum {
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
-
- numEq = GET_PROP_VALUE(TypeTag, NumEq)
+ dimWorld = GridView::dimensionworld
};
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
@@ -79,7 +77,6 @@ class StokesModel : public BoxModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, DofMapper) DofMapper;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
diff --git a/dumux/freeflow/stokes/stokesvolumevariables.hh b/dumux/freeflow/stokes/stokesvolumevariables.hh
index dab172949da2bf92dcf3717c0e0f391f2aac1714..ed029aaedcf761a69796993e996b2c8653cbc650 100644
--- a/dumux/freeflow/stokes/stokesvolumevariables.hh
+++ b/dumux/freeflow/stokes/stokesvolumevariables.hh
@@ -54,16 +54,14 @@ class StokesVolumeVariables : public BoxVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, StokesIndices) Indices;
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
enum {
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
- enum {
+
momentumXIdx = Indices::momentumXIdx,
lastMomentumIdx = Indices::lastMomentumIdx,
pressureIdx = Indices::pressureIdx
};
+
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
diff --git a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
index c4cacb84cdb90015286bcd5fd85f114b280ef686..64f6197293a0c6480ad845a501de79b1864619be 100644
--- a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
@@ -61,22 +61,17 @@ class Stokes2cFluxVariables : public StokesFluxVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
enum { dim = GridView::dimension };
- enum {
- lCompIdx = Indices::lCompIdx,
- gCompIdx = Indices::gCompIdx
- };
+ enum { lCompIdx = Indices::lCompIdx };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
typedef typename GridView::template Codim<0>::Entity Element;
typedef Dune::FieldVector<Scalar, dim> ScalarGradient;
- typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
public:
Stokes2cFluxVariables(const Problem &problem,
diff --git a/dumux/freeflow/stokes2c/stokes2clocalresidual.hh b/dumux/freeflow/stokes2c/stokes2clocalresidual.hh
index cf00c3ff313ade57a49a62ce8ec16689a6c1f775..38f42ca2c29ca6143758fa6f3a9d4326aaa52f89 100644
--- a/dumux/freeflow/stokes2c/stokes2clocalresidual.hh
+++ b/dumux/freeflow/stokes2c/stokes2clocalresidual.hh
@@ -54,23 +54,18 @@ class Stokes2cLocalResidual : public StokesLocalResidual<TypeTag>
enum { dim = GridView::dimension };
enum {
- momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
- massBalanceIdx = Indices::massBalanceIdx, //!< Index of the mass balance
transportIdx = Indices::transportIdx //!< Index of the transport equation
};
enum {
- lCompIdx = Indices::lCompIdx,
- gCompIdx = Indices::gCompIdx
+ lCompIdx = Indices::lCompIdx
};
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex)};
- enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
public:
/*!
diff --git a/dumux/freeflow/stokes2c/stokes2cmodel.hh b/dumux/freeflow/stokes2c/stokes2cmodel.hh
index 80f0d85e4b363fe60159bde10b09f9dffefc2744..837b8a9b9c70f127ad44e6282a1c1d4089352b27 100644
--- a/dumux/freeflow/stokes2c/stokes2cmodel.hh
+++ b/dumux/freeflow/stokes2c/stokes2cmodel.hh
@@ -77,11 +77,7 @@ class Stokes2cModel : public StokesModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
enum { dim = GridView::dimension };
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- enum {
- lCompIdx = Indices::lCompIdx,
- gCompIdx = Indices::gCompIdx
- };
+ enum { lCompIdx = Indices::lCompIdx };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
diff --git a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
index f270a4215c46b2998b72052b7035f78969ca8a68..bf20450e3d5d8e26e072409e87c054d2ca5b633a 100644
--- a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
@@ -56,7 +56,6 @@ class Stokes2cVolumeVariables : public StokesVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
- enum { dim = GridView::dimension };
enum {
lCompIdx = Indices::lCompIdx,
gCompIdx = Indices::gCompIdx
diff --git a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
index e418744621b21fbb63ee9325fde8771a9dcbba5e..6b43eee058799fd73b7d34a5a6b4d7f21734c164 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
@@ -64,7 +64,6 @@ class Stokes2cniFluxVariables : public Stokes2cFluxVariables<TypeTag>
typedef Dune::FieldVector<Scalar, dim> ScalarGradient;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
public:
Stokes2cniFluxVariables(const Problem &problem,
diff --git a/dumux/freeflow/stokes2cni/stokes2cnilocalresidual.hh b/dumux/freeflow/stokes2cni/stokes2cnilocalresidual.hh
index 55f7735aeb5c79136454a9e37bc7c3a3380e6b55..01a89badf9b8fa1f4108aceda04075ec7499a1b8 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnilocalresidual.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnilocalresidual.hh
@@ -54,10 +54,7 @@ class Stokes2cniLocalResidual : public Stokes2cLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices) Indices;
- enum {
- dim = GridView::dimension,
- numEq = GET_PROP_VALUE(TypeTag, NumEq)
- };
+ enum { dim = GridView::dimension };
enum { energyIdx = Indices::energyIdx }; //!< Index of the transport equation
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
@@ -65,7 +62,6 @@ class Stokes2cniLocalResidual : public Stokes2cLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
public:
/*!
diff --git a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
index 0459b28fddfeeaaedfcdaedc3df6b95846082cec..b0050f424df3eff4b739142ffc012b4d86200572 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
@@ -84,15 +84,8 @@ class Stokes2cniModel : public Stokes2cModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices) Indices;
- enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- enum {
- lCompIdx = Indices::lCompIdx,
- gCompIdx = Indices::gCompIdx
- };
+ enum { dim = GridView::dimension };
+ enum { lCompIdx = Indices::lCompIdx };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
diff --git a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
index 94f55d11409f6583c40a31fa0ed1281a398e9c2e..a334bb12913964393454a4926ec77c4e1fd8185e 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
@@ -54,8 +54,6 @@ class Stokes2cniVolumeVariables : public Stokes2cVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices) Indices;
- enum { dim = GridView::dimension };
- enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
enum { energyIdx = Indices::energyIdx };
diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh
index 4e008cb75414b669439d19e785b8d67b22b11d00..d55ef982f501b87f5a39328e57a7cb0b22724df1 100644
--- a/dumux/io/vtkmultiwriter.hh
+++ b/dumux/io/vtkmultiwriter.hh
@@ -56,7 +56,6 @@ namespace Dumux {
template<class GridView>
class VtkMultiWriter
{
- typedef typename GridView::Grid Grid;
enum { dim = GridView::dimension };
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGVertexLayout> VertexMapper;
diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index 77a4437432090334e2658d93d6b15f397b8267dd..1e83f40978da1e2b9d0e2cf32dc90d6df9a34e9c 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -36,7 +36,6 @@ namespace Dumux
template <class Scalar>
class Mesitylene : public Component<Scalar, Mesitylene<Scalar> >
{
- typedef Component<Scalar, Mesitylene<Scalar> > ParentType;
public:
/*!
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index adb248a77b25d5214e7bf9228fdf8a3387d2b2df..749fae4beadb800e6a88b05af6951ec84120576a 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -38,7 +38,6 @@ namespace Dumux
template <class Scalar>
class Xylene : public Component<Scalar, Xylene<Scalar> >
{
- typedef Component<Scalar, Xylene<Scalar> > ParentType;
public:
/*!
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
index d64ed5d41f1f43ae271d1320a5d2e114834b4284..b4e3f94a303e98304189c618dfcea6b4d279d143 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
@@ -48,9 +48,6 @@ namespace Dumux
template <class ScalarT, class ParamsT = ParkerVanGen3PParams<ScalarT> >
class ParkerVanGen3P
{
- static const int wPhaseIdx = 0;
- static const int nPhaseIdx = 1;
- static const int gPhaseIdx = 2;
public:
typedef ParamsT Params;
diff --git a/dumux/material/fluidsystems/h2o_air_xylene_system.hh b/dumux/material/fluidsystems/h2o_air_xylene_system.hh
index 69969c535424df66ed9935d46852e10d6c07e544..426f4ea6162a6de72c41a9372b77ac28e54b7725 100644
--- a/dumux/material/fluidsystems/h2o_air_xylene_system.hh
+++ b/dumux/material/fluidsystems/h2o_air_xylene_system.hh
@@ -55,10 +55,8 @@ NEW_PROP_TAG(Scalar);
template <class TypeTag>
class H2O_Air_Xylene_System
{
- typedef H2O_Air_Xylene_System<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dumux::IdealGas<Scalar> IdealGas;
public:
typedef Dumux::H2O<Scalar> H2O;
diff --git a/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh b/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
index 134e25b9800656f431576da4f408c0234c95a111..2ebc21c06481f1c74f7f06329a48e7622c159ee5 100644
--- a/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
@@ -57,8 +57,6 @@ class H2OAirMesitylene
typedef H2OAirMesitylene<Scalar> ThisType;
typedef BaseFluidSystem<Scalar, ThisType> Base;
- typedef Dumux::IdealGas<Scalar> IdealGas;
- typedef Dumux::Constants<Scalar> Constants;
public:
typedef Dumux::H2O<Scalar> H2O;
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index bfa92de23943ebdf033a49aba09c8a491fc0d201..46eb94dfbd78712d384ba156a0f4454658ea8e19 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -162,16 +162,12 @@ class LensProblem : public TwoPProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
// primary variable indices
- pressureIdx = Indices::pressureIdx,
- saturationIdx = Indices::saturationIdx,
pwIdx = Indices::pwIdx,
SnIdx = Indices::SnIdx,
// equation indices
- contiWEqIdx = Indices::contiWEqIdx,
contiNEqIdx = Indices::contiNEqIdx,
// phase indices
diff --git a/test/boxmodels/2p/lensspatialparameters.hh b/test/boxmodels/2p/lensspatialparameters.hh
index 79f5eca9ba602d0e636b097edee8a446bd4f7f1e..cb06071d61d35705bc2f6911a5ff41eef9c158c3 100644
--- a/test/boxmodels/2p/lensspatialparameters.hh
+++ b/test/boxmodels/2p/lensspatialparameters.hh
@@ -81,14 +81,9 @@ class LensSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename Grid::ctype CoordScalar;
- typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
-
enum {
dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
-
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
+ dimWorld=GridView::dimensionworld
};
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index d22f5e5217f729d8852c80cb90a4b90fa12e70df..6900fb51235a612653cd6a40ac8b2395e53c1db2 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -114,14 +114,11 @@ class InjectionProblem : public TwoPTwoCProblem<TypeTag>
lPhaseIdx = Indices::lPhaseIdx,
gPhaseIdx = Indices::gPhaseIdx,
- lCompIdx = Indices::lCompIdx,
- gCompIdx = Indices::gCompIdx,
H2OIdx = FluidSystem::H2OIdx,
N2Idx = FluidSystem::N2Idx,
conti0EqIdx = Indices::conti0EqIdx,
- contiH2OEqIdx = conti0EqIdx + H2OIdx,
contiN2EqIdx = conti0EqIdx + N2Idx
};
diff --git a/test/boxmodels/2p2c/injectionspatialparameters.hh b/test/boxmodels/2p2c/injectionspatialparameters.hh
index 3f034308031d920556c6a372b5924d3ba102fff1..5876c554ac3bd8a871b58e0b2643e1bb95f8be58 100644
--- a/test/boxmodels/2p2c/injectionspatialparameters.hh
+++ b/test/boxmodels/2p2c/injectionspatialparameters.hh
@@ -86,16 +86,12 @@ class InjectionSpatialParameters : public BoxSpatialParameters<TypeTag>
dim=GridView::dimension,
dimWorld=GridView::dimensionworld,
- lPhaseIdx = FluidSystem::lPhaseIdx,
- gPhaseIdx = FluidSystem::gPhaseIdx
+ lPhaseIdx = FluidSystem::lPhaseIdx
};
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
-
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
@@ -140,17 +136,6 @@ public:
~InjectionSpatialParameters()
{}
-
- /*!
- * \brief Update the spatial parameters with the flow solution
- * after a timestep.
- *
- * \param globalSolution The global solution vector
- */
- void update(const SolutionVector &globalSolution)
- {
- };
-
/*!
* \brief Apply the intrinsic permeability tensor to a pressure
* potential gradient.
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index c9b1600e2188fd53798fead63cdd5fede2ea1ab5..caed597e133ce5e7ba0d776825e11c651f2f1240 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -121,7 +121,6 @@ class WaterAirProblem : public TwoPTwoCNIProblem<TypeTag>
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
pressureIdx = Indices::pressureIdx,
switchIdx = Indices::switchIdx,
@@ -132,8 +131,6 @@ class WaterAirProblem : public TwoPTwoCNIProblem<TypeTag>
// Phase State
lPhaseOnly = Indices::lPhaseOnly,
- gPhaseOnly = Indices::gPhaseOnly,
- bothPhases = Indices::bothPhases,
// Grid and world dimension
dim = GridView::dimension,
diff --git a/test/boxmodels/2p2cni/waterairspatialparameters.hh b/test/boxmodels/2p2cni/waterairspatialparameters.hh
index ec669d029ec5918fba33a0030d6f24f6b99bcce0..180004739cdfeb8bb531fc80a763fd1e67c21722 100644
--- a/test/boxmodels/2p2cni/waterairspatialparameters.hh
+++ b/test/boxmodels/2p2cni/waterairspatialparameters.hh
@@ -85,23 +85,18 @@ class WaterAirSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
- lPhaseIdx = Indices::lPhaseIdx,
- gPhaseIdx = Indices::gPhaseIdx
+ lPhaseIdx = Indices::lPhaseIdx
};
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
-
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
-
public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
@@ -140,17 +135,6 @@ public:
~WaterAirSpatialParameters()
{}
-
- /*!
- * \brief Update the spatial parameters with the flow solution
- * after a timestep.
- *
- * \param globalSolution The global solution vector
- */
- void update(const SolutionVector &globalSolution)
- {
- };
-
/*!
* \brief Apply the intrinsic permeability tensor to a pressure
* potential gradient.
diff --git a/test/boxmodels/2pni/injectionproblem2pni.hh b/test/boxmodels/2pni/injectionproblem2pni.hh
index 72342ae5c4a11655e9543c6fa581dd4179c36908..4d3e0b78e5e51a74c657727f7ad1cac5cfec9ff7 100644
--- a/test/boxmodels/2pni/injectionproblem2pni.hh
+++ b/test/boxmodels/2pni/injectionproblem2pni.hh
@@ -154,11 +154,9 @@ class InjectionProblem2PNI
typedef typename GET_PROP_TYPE(TypeTag, TwoPNIIndices) Indices;
#endif
enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
- contiWEqIdx = Indices::contiWEqIdx,
contiNEqIdx = Indices::contiNEqIdx,
#if !ISOTHERMAL
diff --git a/test/boxmodels/3p3c/infiltrationproblem.hh b/test/boxmodels/3p3c/infiltrationproblem.hh
index e83134bb26a1d50f72d865e8ad2954c6c6802684..1d0f028a528d959542d78dc3b66921045dad9d1e 100644
--- a/test/boxmodels/3p3c/infiltrationproblem.hh
+++ b/test/boxmodels/3p3c/infiltrationproblem.hh
@@ -88,10 +88,8 @@ class InfiltrationProblem : public ThreePThreeCProblem<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
typedef typename GridView::Grid Grid;
- typedef InfiltrationProblem<TypeTag> ThisType;
typedef ThreePThreeCProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
@@ -101,18 +99,12 @@ class InfiltrationProblem : public ThreePThreeCProblem<TypeTag>
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
pressureIdx = Indices::pressureIdx,
switch1Idx = Indices::switch1Idx,
switch2Idx = Indices::switch2Idx,
// Phase State
- threePhases = Indices::threePhases,
- wPhaseOnly = Indices::wPhaseOnly,
- gnPhaseOnly = Indices::gnPhaseOnly,
- wnPhaseOnly = Indices::wnPhaseOnly,
- gPhaseOnly = Indices::gPhaseOnly,
wgPhaseOnly = Indices::wgPhaseOnly,
// Grid and world dimension
@@ -132,7 +124,6 @@ class InfiltrationProblem : public ThreePThreeCProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/test/boxmodels/3p3c/infiltrationspatialparameters.hh b/test/boxmodels/3p3c/infiltrationspatialparameters.hh
index e7eda7d6305171af4f5438fb349f4aba7cbb583e..c3eb9d33904b27d21074494e7372783b740c64aa 100644
--- a/test/boxmodels/3p3c/infiltrationspatialparameters.hh
+++ b/test/boxmodels/3p3c/infiltrationspatialparameters.hh
@@ -81,25 +81,21 @@ class InfiltrationSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
enum {
wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
- gPhaseIdx = Indices::gPhaseIdx
+ nPhaseIdx = Indices::nPhaseIdx
};
- typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
//get the material law from the property system
diff --git a/test/boxmodels/3p3cni/columnxylolproblem.hh b/test/boxmodels/3p3cni/columnxylolproblem.hh
index 41efed1d6320d6fdebc3ad87674c329ad009f26f..4dfa6aeb8ec7d9751ebb797e5b08206ddafb37da 100644
--- a/test/boxmodels/3p3cni/columnxylolproblem.hh
+++ b/test/boxmodels/3p3cni/columnxylolproblem.hh
@@ -95,16 +95,13 @@ class ColumnProblem : public ThreePThreeCNIProblem<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
typedef typename GridView::Grid Grid;
- typedef ColumnProblem<TypeTag> ThisType;
typedef ThreePThreeCNIProblem<TypeTag> ParentType;
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
pressureIdx = Indices::pressureIdx,
switch1Idx = Indices::switch1Idx,
@@ -114,11 +111,6 @@ class ColumnProblem : public ThreePThreeCNIProblem<TypeTag>
// Phase State
threePhases = Indices::threePhases,
- wPhaseOnly = Indices::wPhaseOnly,
- gnPhaseOnly = Indices::gnPhaseOnly,
- wnPhaseOnly = Indices::wnPhaseOnly,
- gPhaseOnly = Indices::gPhaseOnly,
- wgPhaseOnly = Indices::wgPhaseOnly,
// Grid and world dimension
dim = GridView::dimension,
@@ -137,7 +129,6 @@ class ColumnProblem : public ThreePThreeCNIProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/test/boxmodels/3p3cni/columnxylolspatialparameters.hh b/test/boxmodels/3p3cni/columnxylolspatialparameters.hh
index 8be5721d2dbbb5cb3a4f7725bf253748abf8f301..1d8f8576542e8ef740eab66dea7163dd0355b308 100644
--- a/test/boxmodels/3p3cni/columnxylolspatialparameters.hh
+++ b/test/boxmodels/3p3cni/columnxylolspatialparameters.hh
@@ -80,25 +80,21 @@ class ColumnSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
enum {
wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
- gPhaseIdx = Indices::gPhaseIdx
+ nPhaseIdx = Indices::nPhaseIdx
};
- typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
diff --git a/test/boxmodels/3p3cni/kuevetteproblem.hh b/test/boxmodels/3p3cni/kuevetteproblem.hh
index 8a63f5dc14cd586d76c9b3b2be80ef25d08ec562..515985702e7005db42a4e880beb12e1384e4a17d 100644
--- a/test/boxmodels/3p3cni/kuevetteproblem.hh
+++ b/test/boxmodels/3p3cni/kuevetteproblem.hh
@@ -91,16 +91,13 @@ class KuevetteProblem : public ThreePThreeCNIProblem<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
typedef typename GridView::Grid Grid;
- typedef KuevetteProblem<TypeTag> ThisType;
typedef ThreePThreeCNIProblem<TypeTag> ParentType;
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
pressureIdx = Indices::pressureIdx,
switch1Idx = Indices::switch1Idx,
@@ -110,10 +107,6 @@ class KuevetteProblem : public ThreePThreeCNIProblem<TypeTag>
// Phase State
threePhases = Indices::threePhases,
- wPhaseOnly = Indices::wPhaseOnly,
- gnPhaseOnly = Indices::gnPhaseOnly,
- wnPhaseOnly = Indices::wnPhaseOnly,
- gPhaseOnly = Indices::gPhaseOnly,
wgPhaseOnly = Indices::wgPhaseOnly,
// Grid and world dimension
@@ -133,7 +126,6 @@ class KuevetteProblem : public ThreePThreeCNIProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/test/boxmodels/3p3cni/kuevettespatialparameters.hh b/test/boxmodels/3p3cni/kuevettespatialparameters.hh
index 3f349cdde4c56382e6428aeabd1a8e52092af0ff..32dbfe6c0548d8e9897b7f6ce17212114081c2c1 100644
--- a/test/boxmodels/3p3cni/kuevettespatialparameters.hh
+++ b/test/boxmodels/3p3cni/kuevettespatialparameters.hh
@@ -81,25 +81,21 @@ class KuevetteSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices) Indices;
enum {
wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
- gPhaseIdx = Indices::gPhaseIdx
+ nPhaseIdx = Indices::nPhaseIdx
};
- typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
diff --git a/test/boxmodels/MpNc/obstaclespatialparameters.hh b/test/boxmodels/MpNc/obstaclespatialparameters.hh
index 3c990977ea1faaeac4ead9b7f4c3770dc0254f75..77112027b33ecf24cef06d386481471facc252ee 100644
--- a/test/boxmodels/MpNc/obstaclespatialparameters.hh
+++ b/test/boxmodels/MpNc/obstaclespatialparameters.hh
@@ -54,8 +54,7 @@ SET_PROP(ObstacleSpatialParameters, MaterialLaw)
private:
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum {
- lPhaseIdx = FluidSystem::lPhaseIdx,
- gPhaseIdx = FluidSystem::gPhaseIdx
+ lPhaseIdx = FluidSystem::lPhaseIdx
};
// define the material law
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -87,13 +86,11 @@ class ObstacleSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename Grid::ctype CoordScalar;
enum {
dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
+ dimWorld=GridView::dimensionworld
};
enum {
- lPhaseIdx = FluidSystem::lPhaseIdx,
- gPhaseIdx = FluidSystem::gPhaseIdx
+ lPhaseIdx = FluidSystem::lPhaseIdx
};
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/test/freeflow/stokes/stokestestproblem.hh b/test/freeflow/stokes/stokestestproblem.hh
index e98ab52b361523ad499a33e0a553158609a609e0..fed304039b833b36833afaf158531f6bf23acbc8 100644
--- a/test/freeflow/stokes/stokestestproblem.hh
+++ b/test/freeflow/stokes/stokestestproblem.hh
@@ -113,7 +113,6 @@ SET_BOOL_PROP(StokesTestProblem, EnableGravity, false);
template <class TypeTag>
class StokesTestProblem : public StokesProblem<TypeTag>
{
- typedef StokesTestProblem<TypeTag> ThisType;
typedef StokesProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
@@ -122,18 +121,15 @@ class StokesTestProblem : public StokesProblem<TypeTag>
enum {
// Number of equations and grid dimension
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
dim = GridView::dimension,
// copy some indices for convenience
massBalanceIdx = Indices::massBalanceIdx,
momentumXIdx = Indices::momentumXIdx, //!< Index of the x-component of the momentum balance
- momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
- momentumZIdx = Indices::momentumZIdx //!< Index of the z-component of the momentum balance
+ momentumYIdx = Indices::momentumYIdx //!< Index of the y-component of the momentum balance
};
-
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
diff --git a/test/freeflow/stokes2c/stokes2ctestproblem.hh b/test/freeflow/stokes2c/stokes2ctestproblem.hh
index 7fdbc9f2b828da10c9aca4da6b45c46d67cc21cb..5b4c9291dbbbc8b67e10ba9d7457cfcbfaaeb7ad 100644
--- a/test/freeflow/stokes2c/stokes2ctestproblem.hh
+++ b/test/freeflow/stokes2c/stokes2ctestproblem.hh
@@ -114,7 +114,6 @@ SET_BOOL_PROP(Stokes2cTestProblem, NewtonWriteConvergence, false);
template <class TypeTag>
class Stokes2cTestProblem : public StokesProblem<TypeTag>
{
- typedef Stokes2cTestProblem<TypeTag> ThisType;
typedef StokesProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -124,7 +123,6 @@ class Stokes2cTestProblem : public StokesProblem<TypeTag>
enum {
// Number of equations and grid dimension
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
dim = GridView::dimension
};
enum {
@@ -132,7 +130,6 @@ class Stokes2cTestProblem : public StokesProblem<TypeTag>
massBalanceIdx = Indices::massBalanceIdx,
momentumXIdx = Indices::momentumXIdx, //!< Index of the x-component of the momentum balance
momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
- momentumZIdx = Indices::momentumZIdx, //!< Index of the z-component of the momentum balance
transportIdx = Indices::transportIdx //!< Index of the transport equation (massfraction)
};
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index 5616d5401e799f4eb6be7b02ebad448594c8f725..a875faced5d94326dd2ae290b9f6a93f89acd23e 100644
--- a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
+++ b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
@@ -99,7 +99,6 @@ SET_BOOL_PROP(Stokes2cniTestProblem, EnableGravity, true);
template <class TypeTag>
class Stokes2cniTestProblem : public StokesProblem<TypeTag>
{
- typedef Stokes2cniTestProblem<TypeTag> ThisType;
typedef StokesProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;