diff --git a/test/freeflow/navierstokes/angelitestproblem.hh b/test/freeflow/navierstokes/angelitestproblem.hh
index 074367cde12e22f8a83b21981d746059b9652632..a4d1305c666d8e8bfae5bd2db0ec668cf293ed2b 100644
--- a/test/freeflow/navierstokes/angelitestproblem.hh
+++ b/test/freeflow/navierstokes/angelitestproblem.hh
@@ -86,8 +86,6 @@ class AngeliTestProblem : public NavierStokesProblem<TypeTag>
enum {
massBalanceIdx = Indices::massBalanceIdx,
momentumBalanceIdx = Indices::momentumBalanceIdx,
- momentumXBalanceIdx = Indices::momentumXBalanceIdx,
- momentumYBalanceIdx = Indices::momentumYBalanceIdx,
pressureIdx = Indices::pressureIdx,
velocityXIdx = Indices::velocityXIdx,
velocityYIdx = Indices::velocityYIdx
@@ -95,18 +93,10 @@ class AngeliTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
-
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
- using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
-
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
diff --git a/test/freeflow/navierstokes/channeltestproblem.hh b/test/freeflow/navierstokes/channeltestproblem.hh
index 89719b323e671119445fafe45cb2715210d1986e..bc893ef8cb21c0c219aceaad9c3a9dbfdbeb6d86 100644
--- a/test/freeflow/navierstokes/channeltestproblem.hh
+++ b/test/freeflow/navierstokes/channeltestproblem.hh
@@ -88,19 +88,12 @@ class ChannelTestProblem : public NavierStokesProblem<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
-
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
+ enum { dimWorld = GridView::dimensionworld };
enum {
massBalanceIdx = Indices::massBalanceIdx,
momentumBalanceIdx = Indices::momentumBalanceIdx,
- momentumXBalanceIdx = Indices::momentumXBalanceIdx,
- momentumYBalanceIdx = Indices::momentumYBalanceIdx,
pressureIdx = Indices::pressureIdx,
#if NONISOTHERMAL
temperatureIdx = Indices::temperatureIdx,
@@ -112,11 +105,7 @@ class ChannelTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using Element = typename GridView::template Codim<0>::Entity;
-
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/freeflow/navierstokes/closedsystemtestproblem.hh b/test/freeflow/navierstokes/closedsystemtestproblem.hh
index a102491fe30c56256b000d8767e148fd854c9309..35c455f70e434cdd952e6fc4b6017f85a170ea4f 100644
--- a/test/freeflow/navierstokes/closedsystemtestproblem.hh
+++ b/test/freeflow/navierstokes/closedsystemtestproblem.hh
@@ -75,16 +75,10 @@ class ClosedSystemTestProblem : public NavierStokesProblem<TypeTag>
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
+ enum { dimWorld = GridView::dimensionworld };
enum {
massBalanceIdx = Indices::massBalanceIdx,
momentumBalanceIdx = Indices::momentumBalanceIdx,
- momentumXBalanceIdx = Indices::momentumXBalanceIdx,
- momentumYBalanceIdx = Indices::momentumYBalanceIdx,
pressureIdx = Indices::pressureIdx,
velocityXIdx = Indices::velocityXIdx,
velocityYIdx = Indices::velocityYIdx
@@ -92,11 +86,6 @@ class ClosedSystemTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
-
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
@@ -105,10 +94,6 @@ class ClosedSystemTestProblem : public NavierStokesProblem<TypeTag>
using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
- typename DofTypeIndices::CellCenterIdx cellCenterIdx;
- typename DofTypeIndices::FaceIdx faceIdx;
-
public:
ClosedSystemTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
: ParentType(fvGridGeometry), eps_(1e-6)
diff --git a/test/freeflow/navierstokes/doneatestproblem.hh b/test/freeflow/navierstokes/doneatestproblem.hh
index 4ae48104ad871b82079c35374229312bdc6f2535..1613a194de8984a89b084f571bf8b73affd86b9f 100644
--- a/test/freeflow/navierstokes/doneatestproblem.hh
+++ b/test/freeflow/navierstokes/doneatestproblem.hh
@@ -98,11 +98,6 @@ class DoneaTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
-
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/freeflow/navierstokes/kovasznaytestproblem.hh b/test/freeflow/navierstokes/kovasznaytestproblem.hh
index bd80a6a270d1312c0f8358ece421775696d2ad9e..27f3925dd81b3cfddfbbfe7ac2ba1f432a147aa4 100644
--- a/test/freeflow/navierstokes/kovasznaytestproblem.hh
+++ b/test/freeflow/navierstokes/kovasznaytestproblem.hh
@@ -84,8 +84,6 @@ class KovasznayTestProblem : public NavierStokesProblem<TypeTag>
enum {
massBalanceIdx = Indices::massBalanceIdx,
momentumBalanceIdx = Indices::momentumBalanceIdx,
- momentumXBalanceIdx = Indices::momentumXBalanceIdx,
- momentumYBalanceIdx = Indices::momentumYBalanceIdx,
pressureIdx = Indices::pressureIdx,
velocityXIdx = Indices::velocityXIdx,
velocityYIdx = Indices::velocityYIdx
@@ -93,11 +91,6 @@ class KovasznayTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
-
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/freeflow/navierstokesnc/channeltestproblem.hh b/test/freeflow/navierstokesnc/channeltestproblem.hh
index 8d862bd4a6f21a98a310df9b78f14e8a7a2d8341..f999ee6f8e6c9697908b8b621fbbf1fae84d8119 100644
--- a/test/freeflow/navierstokesnc/channeltestproblem.hh
+++ b/test/freeflow/navierstokesnc/channeltestproblem.hh
@@ -100,17 +100,11 @@ class ChannelNCTestProblem : public NavierStokesProblem<TypeTag>
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
+ enum { dimWorld = GridView::dimensionworld };
enum {
massBalanceIdx = Indices::massBalanceIdx,
transportEqIdx = 1,
momentumBalanceIdx = Indices::momentumBalanceIdx,
- momentumXBalanceIdx = Indices::momentumXBalanceIdx,
- momentumYBalanceIdx = Indices::momentumYBalanceIdx,
pressureIdx = Indices::pressureIdx,
velocityXIdx = Indices::velocityXIdx,
velocityYIdx = Indices::velocityYIdx,
@@ -123,17 +117,10 @@ class ChannelNCTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using Element = typename GridView::template Codim<0>::Entity;
-
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
- using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
-
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
diff --git a/test/freeflow/navierstokesnc/densityflowproblem.hh b/test/freeflow/navierstokesnc/densityflowproblem.hh
index ba93090c907b23075ce704abe9df2146af6f19ae..3af036a487b05175aa95a7ecadec0cad01773d1e 100644
--- a/test/freeflow/navierstokesnc/densityflowproblem.hh
+++ b/test/freeflow/navierstokesnc/densityflowproblem.hh
@@ -94,17 +94,11 @@ class DensityDrivenFlowProblem : public NavierStokesProblem<TypeTag>
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
+ enum { dimWorld = GridView::dimensionworld };
enum {
massBalanceIdx = Indices::massBalanceIdx,
transportEqIdx = 1,
momentumBalanceIdx = Indices::momentumBalanceIdx,
- momentumXBalanceIdx = Indices::momentumXBalanceIdx,
- momentumYBalanceIdx = Indices::momentumYBalanceIdx,
pressureIdx = Indices::pressureIdx,
velocityXIdx = Indices::velocityXIdx,
velocityYIdx = Indices::velocityYIdx,
@@ -112,17 +106,13 @@ class DensityDrivenFlowProblem : public NavierStokesProblem<TypeTag>
};
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using Element = typename GridView::template Codim<0>::Entity;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- using TimeLoopPtr = std::shared_ptr<CheckPointTimeLoop<Scalar>>;
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
diff --git a/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh b/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
index 89607f8026c29f24b24d5025dade582eac1a55db..9f55cb50b241729627299a2da5f6b14da201b518 100644
--- a/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
+++ b/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
@@ -82,8 +82,8 @@ class MaxwellStefanFluidSystem: public FluidSystems::BaseFluidSystem<typename GE
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- typedef MaxwellStefanFluidSystem<TypeTag> ThisType;
- typedef FluidSystems::BaseFluidSystem <Scalar, ThisType> Base;
+ using ThisType = MaxwellStefanFluidSystem<TypeTag>;
+ using Base = FluidSystems::BaseFluidSystem<Scalar, ThisType>;
public:
//! The number of phases
@@ -187,18 +187,12 @@ class MaxwellStefanNCTestProblem : public NavierStokesProblem<TypeTag>
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
+ enum { dimWorld = GridView::dimensionworld };
enum {
massBalanceIdx = Indices::massBalanceIdx,
compTwoIdx = FluidSystem::N2Idx,
compThreeIdx = FluidSystem::CO2Idx,
momentumBalanceIdx = Indices::momentumBalanceIdx,
- momentumXBalanceIdx = Indices::momentumXBalanceIdx,
- momentumYBalanceIdx = Indices::momentumYBalanceIdx,
pressureIdx = Indices::pressureIdx,
velocityXIdx = Indices::velocityXIdx,
velocityYIdx = Indices::velocityYIdx,
@@ -209,21 +203,14 @@ class MaxwellStefanNCTestProblem : public NavierStokesProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
- using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
-
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
public:
MaxwellStefanNCTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
diff --git a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
index 188466a951d6eb9689e1791c52512858195605c6..a9e2128b9806e27be82a3e95b6303e66c369e596 100644
--- a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
@@ -108,23 +108,15 @@ class OnePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using IapwsH2O = H2O<Scalar>;
+ enum { dimWorld = GridView::dimensionworld };
+
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // world dimension
- dimWorld = GridView::dimensionworld
- };
-
enum {
// indices of the primary variables
pressureIdx = Indices::pressureIdx,
temperatureIdx = Indices::temperatureIdx
};
- enum {
- // index of the transport equation
- conti0EqIdx = Indices::conti0EqIdx,
- energyEqIdx = Indices::energyEqIdx
- };
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
diff --git a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
index e3dc534e3ff950e146ad43f76c96d7f0d3e21df1..25670344271c4551efaa2218fbd9d7c7bfd6c0fa 100644
--- a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
@@ -101,24 +101,19 @@ class OnePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using IapwsH2O = H2O<Scalar>;
+ enum { dimWorld = GridView::dimensionworld };
+
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // world dimension
- dimWorld = GridView::dimensionworld
- };
-
enum {
// indices of the primary variables
pressureIdx = Indices::pressureIdx,
@@ -132,7 +127,6 @@ class OnePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
diff --git a/test/porousmediumflow/1p/implicit/1ptestproblem.hh b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
index 411e2825ce0b3c7b6c2ff4d07a34efa215abe6ce..0ca7e0c7ec41adc413fcca515496c289fee8791f 100644
--- a/test/porousmediumflow/1p/implicit/1ptestproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
@@ -97,24 +97,15 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
-// enum {
-// // Grid and world dimension
-// dim = GridView::dimension,
-// dimWorld = GridView::dimensionworld
-// };
+
enum {
- // indices of the primary variables
- conti0EqIdx = Indices::conti0EqIdx,
+ // index of the primary variable
pressureIdx = Indices::pressureIdx
};
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
static constexpr int dimWorld = GridView::dimensionworld;
diff --git a/test/porousmediumflow/1p/implicit/compressible/problem.hh b/test/porousmediumflow/1p/implicit/compressible/problem.hh
index 47f4f0f5872c472247c4957bfb926ff926eb0b19..6297acc5229e7cb74fdef006b8992c7391cc91be 100644
--- a/test/porousmediumflow/1p/implicit/compressible/problem.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/problem.hh
@@ -89,10 +89,7 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
static constexpr int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
index cf17ccaa3cec2b0ee2ac8b47e2e1e1a21397d8c8..536e058674ec8316df1cabf5308cf4bbd461c1bf 100644
--- a/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
@@ -44,9 +44,9 @@ class OnePTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
static constexpr int dimWorld = GridView::dimensionworld;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
using PermeabilityType = Scalar;
diff --git a/test/porousmediumflow/1p/implicit/fractureproblem.hh b/test/porousmediumflow/1p/implicit/fractureproblem.hh
index 24bb819224ca7ba6a448df704d956aea4337876f..bdc87a53484a585af3b3c20d4877f462fa61f801 100644
--- a/test/porousmediumflow/1p/implicit/fractureproblem.hh
+++ b/test/porousmediumflow/1p/implicit/fractureproblem.hh
@@ -83,14 +83,10 @@ class FractureProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ enum { dimWorld = GridView::dimensionworld };
+
enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
- enum {
- // indices of the primary variables
- conti0EqIdx = Indices::conti0EqIdx,
+ // index of the primary variable
pressureIdx = Indices::pressureIdx
};
diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
index c4b2fed8620e0ab55774a75c70efddc321c21812..e1cf6d40414b442e0847419a872c81a4a722be64 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
@@ -90,14 +90,8 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using PointSource = typename GET_PROP_TYPE(TypeTag, PointSource);
static constexpr int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
index cd59f142662270e556905bbd50ac9d5e45612da2..fbb7fad7871cf79d7c00feff99fb7c4f520fe575 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
@@ -44,9 +44,9 @@ class OnePTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
static constexpr int dimWorld = GridView::dimensionworld;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
using PermeabilityType = Scalar;
diff --git a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh
index 016482ff0f01918fb7d011adb68c57a56a337dd1..569f4f9e5c7e02216859d9d5c8147de23b8d89bf 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh
@@ -85,14 +85,9 @@ class OnePSingularityProblem : public PorousMediumFlowProblem<TypeTag>
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ enum { dimWorld = GridView::dimensionworld };
enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
- enum {
- // indices of the primary variables
- conti0EqIdx = Indices::conti0EqIdx,
+ // index of the primary variable
pressureIdx = Indices::pressureIdx
};
diff --git a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh
index db614f066769e7b857948f37d8a99084ce954e9e..dccf3d9f19ffe5cb5d415bcee70dd606b23dd342 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh
@@ -73,9 +73,6 @@ class OnePSingularityProblemTimeDependent : public OnePSingularityProblem<TypeTa
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- static const int dimWorld = GridView::dimensionworld;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-
public:
OnePSingularityProblemTimeDependent(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
: ParentType(fvGridGeometry)
diff --git a/test/porousmediumflow/1pnc/implicit/1p2cniconductionproblem.hh b/test/porousmediumflow/1pnc/implicit/1p2cniconductionproblem.hh
index a670d5b1ea9db40645923b0d65c31a473d504889..6a3cc069c552a27ac72ae65e619504c1388860fe 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2cniconductionproblem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2cniconductionproblem.hh
@@ -107,13 +107,9 @@ class OnePTwoCNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using Element = typename GridView::template Codim<0>::Entity;
- using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
@@ -126,17 +122,11 @@ class OnePTwoCNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
pressureIdx = Indices::pressureIdx,
massOrMoleFracIdx = Indices::firstMoleFracIdx,
temperatureIdx = Indices::temperatureIdx,
-
- // indices of the equations
- conti0EqIdx = Indices::conti0EqIdx,
- transportEqIdx = Indices::firstTransportEqIdx,
- energyEqIdx = Indices::energyEqIdx
};
//! property that defines whether mole or mass fractions are used
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static const auto phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx);
- static const bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/porousmediumflow/1pnc/implicit/1p2cniconvectionproblem.hh b/test/porousmediumflow/1pnc/implicit/1p2cniconvectionproblem.hh
index 2a43f8025dd5c2ada07dc71853bedee48a1e546d..144c31a511bfb26a6cd56a60f7227db4198c5477 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2cniconvectionproblem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2cniconvectionproblem.hh
@@ -113,8 +113,6 @@ class OnePTwoCNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using Element = typename GridView::template Codim<0>::Entity;
- using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
- using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using IapwsH2O = H2O<Scalar>;
@@ -126,17 +124,11 @@ class OnePTwoCNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
pressureIdx = Indices::pressureIdx,
massOrMoleFracIdx = Indices::firstMoleFracIdx,
temperatureIdx = Indices::temperatureIdx,
-
- // indices of the equations
- conti0EqIdx = Indices::conti0EqIdx,
- transportEqIdx = Indices::firstTransportEqIdx,
- energyEqIdx = Indices::energyEqIdx
};
//! property that defines whether mole or mass fractions are used
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static const auto phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx);
- static const bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh b/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
index dfaa61e90c903b86b245b9e955b9d9a12a1c5e44..f3e452ffc6e775923ed7f848218d964b09322538 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
@@ -113,7 +113,6 @@ class OnePTwoCTestProblem : public PorousMediumFlowProblem<TypeTag>
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using Element = typename GridView::template Codim<0>::Entity;
// copy some indices for convenience
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
index bc8a59ca963746250ce03aa366ede7b1ef8d5d5d..ec74493fdf0052035fed487014d762aed2af5a78 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
@@ -93,7 +93,6 @@ class ThermoChemProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);;
using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
@@ -103,14 +102,11 @@ class ThermoChemProblem : public PorousMediumFlowProblem<TypeTag>
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using ReactionRate =ThermoChemReaction<TypeTag>;
-
enum { dim = GridView::dimension };
enum { dimWorld = GridView::dimensionworld };
enum
{
- numComponents = FluidSystem::numComponents,
-
// Indices of the primary variables
pressureIdx = Indices::pressureIdx, //gas-phase pressure
firstMoleFracIdx = Indices::firstMoleFracIdx, // mole fraction water
@@ -118,14 +114,11 @@ class ThermoChemProblem : public PorousMediumFlowProblem<TypeTag>
CaOIdx = FluidSystem::numComponents,
CaO2H2Idx = FluidSystem::numComponents+1,
- //Equation Indices
+ // Equation Indices
conti0EqIdx = Indices::conti0EqIdx,
- firstTransportEqIdx = Indices::firstTransportEqIdx,
// Phase Indices
- phaseIdx = FluidSystem::gPhaseIdx,
cPhaseIdx = FluidSystem::cPhaseIdx,
- hPhaseIdx = FluidSystem::hPhaseIdx,
temperatureIdx = Indices::temperatureIdx,
energyEqIdx = Indices::energyEqIdx
@@ -133,7 +126,6 @@ class ThermoChemProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-
public:
/*!
* \brief The constructor
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh b/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
index 1cb2907002fc7616b825a5e5b1e983f4c5d430ca..30dbfe70b02b9b324dc8b783527ac0663eb2f65d 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
@@ -59,7 +59,6 @@ SET_TYPE_PROP(ThermoChemSpatialParams, SpatialParams, Dumux::ThermoChemSpatialPa
template<class TypeTag>
class ThermoChemSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ThisType = ThermoChemSpatialParams<TypeTag>;
using ParentType = FVSpatialParamsOneP<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -67,22 +66,16 @@ class ThermoChemSpatialParams : public FVSpatialParamsOneP<TypeTag>
using CoordScalar = typename GridView::ctype;
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
enum {
- dim=GridView::dimension,
dimWorld=GridView::dimensionworld,
numSPhases = GET_PROP_VALUE(TypeTag, NumSPhases),
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
- phaseIdx = FluidSystem::gPhaseIdx,
cPhaseIdx = FluidSystem::cPhaseIdx,
hPhaseIdx = FluidSystem::hPhaseIdx
};
- using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
- using Tensor = Dune::FieldMatrix<CoordScalar, dimWorld, dimWorld>;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh
index 8e656f8f9dc758ad2e2e52e7130d1b55f28e343c..7dab629e6f8fd3132b4cb4e0941839c2ff4e9d94 100644
--- a/test/porousmediumflow/2p/implicit/fracture/problem.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh
@@ -98,16 +98,9 @@ class FractureProblem : public PorousMediumFlowProblem<TypeTag>
snIdx = Indices::snIdx,
// equation indices
- contiWEqIdx = Indices::contiWEqIdx,
contiNEqIdx = Indices::contiNEqIdx,
- // phase indices
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
-
-
// world dimension
- dim = GridView::dimension,
dimWorld = GridView::dimensionworld
};
diff --git a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
index 23d892dc22df4d895e24fc9decb3e92108026eee..9a98055ae09d23da6645f61290629dee308fbb0e 100644
--- a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
@@ -73,14 +73,9 @@ class FractureSpatialParams : public FVSpatialParams<TypeTag>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
+ enum { dimWorld=GridView::dimensionworld };
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using Element = typename GridView::template Codim<0>::Entity;
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
//get the material law from the property system
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
index af2c02516885d8c8d24a2b3262de4834cd86211c..5abe543119a0676e029b1c7b2aedbc14839b5707 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
@@ -87,16 +87,16 @@ class TwoPTestProblem : public PorousMediumFlowProblem<TypeTag>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
+ using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimensionworld>;
using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
-
- static constexpr int dimWorld = GridView::dimensionworld;
+ enum {
+ pwIdx = Indices::pwIdx,
+ snIdx = Indices::snIdx,
+ contiNEqIdx = Indices::contiNEqIdx
+ };
public:
TwoPTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
@@ -144,8 +144,8 @@ public:
Scalar factor = (width*alpha + (1.0 - alpha)*globalPos[0])/width;
// hydrostatic pressure scaled by alpha
- values[Indices::pwIdx] = 1e5 - factor*densityW*this->gravity()[1]*depth;
- values[Indices::snIdx] = 0.0;
+ values[pwIdx] = 1e5 - factor*densityW*this->gravity()[1]*depth;
+ values[snIdx] = 0.0;
return values;
}
@@ -165,7 +165,7 @@ public:
{
NeumannFluxes values(0.0);
if (onInlet_(globalPos))
- values[Indices::contiNEqIdx] = -0.04; // kg / (m * s)
+ values[contiNEqIdx] = -0.04; // kg / (m * s)
return values;
}
@@ -189,8 +189,8 @@ public:
Scalar depth = this->fvGridGeometry().bBoxMax()[1] - globalPos[1];
// hydrostatic pressure
- values[Indices::pwIdx] = 1e5 - densityW*this->gravity()[1]*depth;
- values[Indices::snIdx] = 0.0;
+ values[pwIdx] = 1e5 - densityW*this->gravity()[1]*depth;
+ values[snIdx] = 0.0;
return values;
}
diff --git a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
index bb4ecfbff5483b56fff0d974e408119a07d56242..ddba9968fd7ee529761e94b127e88907352d465e 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
@@ -71,11 +71,11 @@ class TwoPTestSpatialParams : public FVSpatialParams<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
static constexpr int dimWorld = GridView::dimensionworld;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
using PermeabilityType = Scalar;
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
index 4d90f5fe868d2df0cb704821e089603e40541448..65c935f1ac588643984535dd0c84161cec9fa5cd 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
@@ -99,7 +99,6 @@ class InjectionProblem2PNI : public PorousMediumFlowProblem<TypeTag>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum
diff --git a/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh b/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
index 0160373b0285917bfc37c87be7cbfd738322e003..e7fc0be088c508778a4a75a237dcf9ccbfddae8a 100644
--- a/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
+++ b/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
@@ -101,19 +101,13 @@ class InjectionProblem : public PorousMediumFlowProblem<TypeTag>
pressureIdx = Indices::pressureIdx,
switch1Idx = Indices::switch1Idx,
+ conti0EqIdx = Indices::conti0EqIdx,
energyEqIdx = Indices::energyEqIdx,
- // phase and component indices
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
-
- // Phase State
- wPhaseOnly = Indices::wPhaseOnly,
- nPhaseOnly = Indices::nPhaseOnly,
- twoPhases = Indices::twoPhases,
+ // phase state
+ wPhaseOnly = Indices::wPhaseOnly
};
- static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
@@ -211,8 +205,8 @@ public:
if(ipGlobal[1] > 2.0 - eps_ && ipGlobal[1] < 3.0 + eps_)
{
const Scalar massRate = 1e-1;
- values[Indices::conti0EqIdx] = -massRate;
- values[Indices::energyEqIdx] = -massRate * 2690e3;
+ values[conti0EqIdx] = -massRate;
+ values[energyEqIdx] = -massRate * 2690e3;
}
}
return values;
diff --git a/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh b/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
index 12fa98c64737477f1b5f59e56f69fa03e17e7742..8cd1624e81b8abdb1e54fcb0b89679eec4c6be35 100644
--- a/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
+++ b/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
@@ -68,7 +68,6 @@ class InjectionProblemSpatialParams : public FVSpatialParams<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);
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
@@ -77,9 +76,7 @@ class InjectionProblemSpatialParams : public FVSpatialParams<TypeTag>
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
- static constexpr int wPhaseIdx = FluidSystem::wPhaseIdx;
using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
diff --git a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
index 680d83176a969af211ea2fd70331242217fd4ca4..b8ecdbfd61f5724df464cadd9db4fb7ce14d7f70 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
@@ -97,16 +97,16 @@ class InjectionProblem : public PorousMediumFlowProblem<TypeTag>
enum {
pressureIdx = Indices::pressureIdx,
+ switchIdx = Indices::switchIdx,
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
enum {
- wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
+ wPhaseOnly = Indices::wPhaseOnly,
wCompIdx = FluidSystem::wCompIdx,
nCompIdx = FluidSystem::nCompIdx,
@@ -117,7 +117,6 @@ class InjectionProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using Element = typename GridView::template Codim<0>::Entity;
@@ -290,7 +289,7 @@ private:
PrimaryVariables initial_(const GlobalPosition &globalPos) const
{
PrimaryVariables priVars(0.0);
- priVars.setState(Indices::wPhaseOnly);
+ priVars.setState(wPhaseOnly);
Scalar densityW = FluidSystem::H2O::liquidDensity(temperature_, 1e5);
@@ -304,15 +303,15 @@ private:
if(useMoles)
{
//mole-fraction formulation
- priVars[Indices::switchIdx] = moleFracLiquidN2;
+ priVars[switchIdx] = moleFracLiquidN2;
}
else
{
//mass fraction formulation
Scalar massFracLiquidN2 = moleFracLiquidN2*FluidSystem::molarMass(nCompIdx)/meanM;
- priVars[Indices::switchIdx] = massFracLiquidN2;
+ priVars[switchIdx] = massFracLiquidN2;
}
- priVars[Indices::pressureIdx] = pl;
+ priVars[pressureIdx] = pl;
return priVars;
}
diff --git a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
index e7ee572c4f54474ca10f0a0cacc1b2e5f8b51318..6ea53545fc8d26dc434045d546e4ee5ea0240488 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
@@ -68,16 +68,11 @@ class InjectionSpatialParams : public FVSpatialParams<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
using CoordScalar = typename Grid::ctype;
- using GlobalPosition = Dune::FieldVector<CoordScalar,dimWorld>;
- using Element = typename GridView::template Codim<0>::Entity;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
public:
using PermeabilityType = Scalar;
diff --git a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
index 8ed321de7a1307c4bf6029bb42e555d46ee2fd8b..13f80251a2cf247f9eadf02af7367d5c12f2b48b 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
@@ -112,17 +112,15 @@ class WaterAirProblem : public PorousMediumFlowProblem<TypeTag>
pressureIdx = Indices::pressureIdx,
switchIdx = Indices::switchIdx,
- wCompIdx = FluidSystem::wCompIdx,
nCompIdx = FluidSystem::nCompIdx,
temperatureIdx = Indices::temperatureIdx,
energyEqIdx = Indices::energyEqIdx,
- // Phase State
+ // phase state
wPhaseOnly = Indices::wPhaseOnly,
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld,
conti0EqIdx = Indices::conti0EqIdx,
@@ -135,10 +133,8 @@ class WaterAirProblem : public PorousMediumFlowProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
@@ -295,7 +291,7 @@ private:
PrimaryVariables initial_(const GlobalPosition &globalPos) const
{
PrimaryVariables priVars(0.0);
- priVars.setState(Indices::wPhaseOnly);
+ priVars.setState(wPhaseOnly);
Scalar densityW = 1000.0;
priVars[pressureIdx] = 1e5 + (maxDepth_ - globalPos[1])*densityW*9.81;
priVars[switchIdx] = 0.0;
diff --git a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
index 0f1bc76868fa3c76c73452244e67d8276a76c283..46063b26ef4b538f45138c91c704181ef32caeaf 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
@@ -76,7 +76,7 @@ class WaterAirSpatialParams : public FVSpatialParams<TypeTag>
using CoordScalar = typename GridView::ctype;
static constexpr int dimWorld = GridView::dimensionworld;
- using GlobalPosition = Dune::FieldVector<CoordScalar,dimWorld>;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
public:
using PermeabilityType = Scalar;
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
index e02c695ff053e7b4448ff0117380173257938341..a632c12b61cc23e9265564f2f4b3afbde63a48f6 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
@@ -61,13 +61,11 @@ public:
template<class TypeTag>
class Test2P2CSpatialParams : public SequentialFVSpatialParams<TypeTag>
{
- using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- enum
- {dim=Grid::dimension};
- using Element = typename Grid::Traits::template Codim<0>::Entity;
+ enum { dim = GridView::dimension };
+ using Element = typename GridView::Traits::template Codim<0>::Entity;
using FieldMatrix = Dune::FieldMatrix<Scalar, dim, dim>;
diff --git a/test/porousmediumflow/2pnc/implicit/2pncdiffusion.hh b/test/porousmediumflow/2pnc/implicit/2pncdiffusion.hh
index d033419a2d11d846b04fd34dd283a9fe80e8caf2..3539d15ebf72947aadfa3a301e6499bfd8e265b8 100644
--- a/test/porousmediumflow/2pnc/implicit/2pncdiffusion.hh
+++ b/test/porousmediumflow/2pnc/implicit/2pncdiffusion.hh
@@ -91,12 +91,17 @@ class TwoPNCDiffusionProblem : public PorousMediumFlowProblem<TypeTag>
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
+ pressureIdx = Indices::pressureIdx,
+ switchIdx = Indices::switchIdx,
+
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
wCompIdx = FluidSystem::wCompIdx,
nCompIdx = FluidSystem::nCompIdx,
+ wPhaseOnly = Indices::wPhaseOnly,
+
contiH2OEqIdx = Indices::contiWEqIdx,
contiN2EqIdx = Indices::contiNEqIdx
};
@@ -187,12 +192,12 @@ public:
PrimaryVariables dirichletAtPos(const GlobalPosition &globalPos) const
{
PrimaryVariables priVars;
- priVars.setState(Indices::wPhaseOnly);
- priVars[Indices::pressureIdx] = 1e5;
- priVars[Indices::switchIdx] = 1e-5 ;
+ priVars.setState(wPhaseOnly);
+ priVars[pressureIdx] = 1e5;
+ priVars[switchIdx] = 1e-5 ;
if (globalPos[0] < this->fvGridGeometry().bBoxMin()[0] + eps_)
- priVars[Indices::switchIdx] = 1e-3;
+ priVars[switchIdx] = 1e-3;
return priVars;
}
@@ -247,11 +252,11 @@ private:
PrimaryVariables initial_(const GlobalPosition &globalPos) const
{
PrimaryVariables priVars(0.0);
- priVars.setState(Indices::wPhaseOnly);
+ priVars.setState(wPhaseOnly);
//mole-fraction formulation
- priVars[Indices::switchIdx] = 1e-5;
- priVars[Indices::pressureIdx] = 1e5;
+ priVars[switchIdx] = 1e-5;
+ priVars[pressureIdx] = 1e5;
return priVars;
}
diff --git a/test/porousmediumflow/2pnc/implicit/2pncdiffusionspatialparams.hh b/test/porousmediumflow/2pnc/implicit/2pncdiffusionspatialparams.hh
index 4ea817a75577408987553db2c218167c57de666a..554dcfd07f795867d87bd361279d11b787ab345b 100644
--- a/test/porousmediumflow/2pnc/implicit/2pncdiffusionspatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/2pncdiffusionspatialparams.hh
@@ -77,7 +77,6 @@ class TwoPNCDiffusionSpatialParams : public FVSpatialParams<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using CoordScalar = typename GridView::ctype;
- static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
index 541bf3b69a291698601acdcec8ec956dfe19a721..62ce76f91eb252319499b6fab788a2bd8a6008b5 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
@@ -88,7 +88,6 @@ class FuelCellProblem : public PorousMediumFlowProblem<TypeTag>
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
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 GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
@@ -98,29 +97,17 @@ class FuelCellProblem : public PorousMediumFlowProblem<TypeTag>
// Select the electrochemistry method
using ElectroChemistry = typename Dumux::ElectroChemistry<TypeTag, ElectroChemistryModel::Ochs>;
- enum
- {
- numComponents = FluidSystem::numComponents,
- numSecComponents = FluidSystem::numSecComponents,
- };
- // phase indices
- enum
- {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
- // component indices
- enum
- {
- wCompIdx = FluidSystem::wCompIdx, //major component of the liquid phase
- nCompIdx = FluidSystem::nCompIdx, //major component of the gas phase
- };
+ enum { numComponents = FluidSystem::numComponents };
+
+ enum { wPhaseIdx = Indices::wPhaseIdx };
+
+ enum { bothPhases = Indices::bothPhases };
+
// privar indices
enum
{
pressureIdx = Indices::pressureIdx, //gas-phase pressure
- switchIdx = Indices::switchIdx, //liquid saturation or mole fraction
- conti0EqIdx = Indices::conti0EqIdx
+ switchIdx = Indices::switchIdx //liquid saturation or mole fraction
};
static constexpr int dim = GridView::dimension;
@@ -323,7 +310,7 @@ private:
PrimaryVariables initial_(const GlobalPosition &globalPos) const
{
PrimaryVariables priVars(0.0);
- priVars.setState(Indices::bothPhases);
+ priVars.setState(bothPhases);
Scalar pn = 1.0e5;
priVars[pressureIdx] = pn;
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
index 27084bbe36de46ea579a1700a92d250d9913b44e..35f823b1cc47ee4273f61674a1ae7c4700cef080 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
@@ -81,16 +81,13 @@ class FuelCellSpatialParams : public FVSpatialParams<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);
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
using CoordScalar = typename GridView::ctype;
using Element = typename GridView::template Codim<0>::Entity;
- static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
- static constexpr int wPhaseIdx = FluidSystem::wPhaseIdx;
using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
diff --git a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
index ee7131ce6a9a98e831e54e4e294891f5a8a2d307..73e2955087dcd87bff39e33e494e075adf712806 100644
--- a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
+++ b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
@@ -105,7 +105,6 @@ class DissolutionProblem : public PorousMediumFlowProblem<TypeTag>
//Indices of the components
wCompIdx = FluidSystem::H2OIdx,
- nCompIdx = FluidSystem::AirIdx,
NaClIdx = FluidSystem::NaClIdx,
//Indices of the phases
@@ -115,13 +114,9 @@ class DissolutionProblem : public PorousMediumFlowProblem<TypeTag>
//Index of the primary component of G and L phase
conti0EqIdx = Indices::conti0EqIdx,
- contiTotalMassIdx = conti0EqIdx + FluidSystem::AirIdx,
precipNaClEqIdx = Indices::conti0EqIdx + FluidSystem::numComponents,
- contiWEqIdx = conti0EqIdx + FluidSystem::H2OIdx,
// Phase State
- wPhaseOnly = Indices::wPhaseOnly,
- nPhaseOnly = Indices::nPhaseOnly,
bothPhases = Indices::bothPhases,
// Grid and world dimension
@@ -137,8 +132,6 @@ class DissolutionProblem : public PorousMediumFlowProblem<TypeTag>
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using Vertex = typename GridView::template Codim<dim>::Entity;
- using Intersection = typename GridView::Intersection;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
index 841e2f7963cf2909d1c655d72a8fa5600b622e17..a258407ab5710b5d601f65e5a75d2699247bf697 100644
--- a/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
+++ b/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
@@ -67,29 +67,17 @@ public:
template<class TypeTag>
class DissolutionSpatialparams : public FVSpatialParams<TypeTag>
{
- using ThisType = DissolutionSpatialparams<TypeTag>;
using ParentType = FVSpatialParams<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params;
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using CoordScalar = typename GridView::ctype;
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
- };
-
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- wPhaseIdx = FluidSystem::wPhaseIdx,
- nPhaseIdx = FluidSystem::nPhaseIdx,
- };
+ enum { dimWorld=GridView::dimensionworld };
using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
using Tensor = Dune::FieldMatrix<CoordScalar, dimWorld, dimWorld>;
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using Element = typename GridView::template Codim<0>::Entity;
@@ -121,7 +109,7 @@ public:
// set main diagonal entries of the permeability tensor to a value
// setting to one value means: isotropic, homogeneous
- for (int i = 0; i < dim; i++) //TODO make this nice and dependend on PermeabilityType!
+ for (int i = 0; i < dimWorld; i++) //TODO make this nice and dependend on PermeabilityType!
initK_[i][i] = initialPermeability_;
//! Intitialize the parameter laws
diff --git a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
index 7f38323df366c916726f6cc830f1b839b1a10a03..d93cd2d90b85fed61ac5b38cf0137e4dbafaf712 100644
--- a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
@@ -107,28 +107,19 @@ class ThreePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using IapwsH2O = H2O<Scalar>;
using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // world dimension
- dimWorld = GridView::dimensionworld,
- dim=GridView::dimension
- };
-
enum {
// index of the primary variables
pressureIdx = Indices::pressureIdx,
@@ -138,8 +129,9 @@ class ThreePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
wPhaseIdx = Indices::wPhaseIdx
};
+ enum { dimWorld = GridView::dimensionworld };
+
using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
diff --git a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
index 00c13884192c3eb0a341b8e075379b47c13edd81..18fd4f4d2e60f50b334ab3d98d529a548a9098c9 100644
--- a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
@@ -110,7 +110,6 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
@@ -120,11 +119,6 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // world dimension
- dimWorld = GridView::dimensionworld
- };
-
enum {
// index of the primary variables
pressureIdx = Indices::pressureIdx,
@@ -136,8 +130,9 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
energyEqIdx = Indices::energyEqIdx
};
+ enum { dimWorld = GridView::dimensionworld };
+
using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
diff --git a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
index 631f4295cdd53bf9a615cee3500e9561c2c63b3a..e92675783dfa9403785c3d3692ddd6725a61ede0 100644
--- a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
@@ -72,14 +72,9 @@ class ThreePNISpatialParams : public FVSpatialParams<TypeTag>
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using Element = typename GridView::template Codim<0>::Entity;
- enum {
- dimWorld=GridView::dimensionworld
- };
+ enum { dimWorld=GridView::dimensionworld };
using CoordScalar = typename Grid::ctype;
- using GlobalPosition = Dune::FieldVector<CoordScalar,dimWorld>;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
public:
// export permeability type
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
index e83341ba161317b3b2d266f668e64ba95cd853e3..c7f7e9a8ea0dc118b78d5b4ffdca384c13c8406f 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
@@ -108,8 +108,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
swIdx = Indices::swIdx,
snIdx = Indices::snIdx,
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
index 70f5d82cb921c5f90cc9bd3a1dce2b5d15e556a3..13305ef00bd10fcbbd5800cff9ce5bbb5d70a0ae 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
@@ -82,9 +82,7 @@ class InfiltrationThreePSpatialParams : public FVSpatialParams<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag,ElementSolutionVector);
- enum {
- dimWorld=GridView::dimensionworld
- };
+ enum { dimWorld=GridView::dimensionworld };
using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
index 0718f21839f4a584de20d80e0a0cd568fa0c20b5..691d11a59abe1023b75818df6f396e9b47498ca4 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
@@ -97,18 +97,19 @@ class ColumnProblem : public PorousMediumFlowProblem<TypeTag>
using ParentType = PorousMediumFlowProblem<TypeTag>;
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
-
pressureIdx = Indices::pressureIdx,
switch1Idx = Indices::switch1Idx,
switch2Idx = Indices::switch2Idx,
temperatureIdx = Indices::temperatureIdx,
+ contiWEqIdx = Indices::contiWEqIdx,
+ contiGEqIdx = Indices::contiGEqIdx,
+ contiNEqIdx = Indices::contiNEqIdx,
energyEqIdx = Indices::energyEqIdx,
// Phase State
threePhases = Indices::threePhases,
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
@@ -212,10 +213,10 @@ public:
// negative values for injection
if (globalPos[1] > this->fvGridGeometry().bBoxMax()[1] - eps_)
{
- values[Indices::contiWEqIdx] = -0.395710;
- values[Indices::contiGEqIdx] = -0.000001;
- values[Indices::contiNEqIdx] = -0.00;
- values[Indices::energyEqIdx] = -17452.97;
+ values[contiWEqIdx] = -0.395710;
+ values[contiGEqIdx] = -0.000001;
+ values[contiNEqIdx] = -0.00;
+ values[energyEqIdx] = -17452.97;
}
return values;
}
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh b/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
index 43c6a5c153147da047974572c86d375952948908..8144399b65bbea927db44091bd229719b9712809 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
@@ -70,10 +70,7 @@ class ColumnSpatialParams : public FVSpatialParams<TypeTag>
using ParentType = FVSpatialParams<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- enum {
- dimWorld=GridView::dimensionworld,
- dim=GridView::dimension
- };
+ enum { dimWorld=GridView::dimensionworld };
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh b/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
index fc5dfe2b987bd88556a2fecc02c18d461aab5af9..2ac4f5212d9f39fda116763571063af6716c5eb1 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
@@ -108,15 +108,14 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem<TypeTag>
switch1Idx = Indices::switch1Idx,
switch2Idx = Indices::switch2Idx,
- // Phase State
+ // phase state
wgPhaseOnly = Indices::wgPhaseOnly,
contiWEqIdx = Indices::conti0EqIdx, //!< Index of the mass conservation equation for the water component
contiNEqIdx = Indices::conti1EqIdx,//!< Index of the mass conservation equation for the contaminant component
contiAEqIdx = Indices::conti2EqIdx,//!< Index of the mass conservation equation for the gas component
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh b/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh
index 3f785c769add55dfdde3f744491ffb5c9e860e43..7d25be8faa3c60268af7bbd3a04a9283d702f3f7 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh
@@ -77,10 +77,7 @@ class InfiltrationThreePThreeCSpatialParams : public FVSpatialParams<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- enum {
- dim = GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
+ enum { dimWorld=GridView::dimensionworld };
using GlobalPosition = Dune::FieldVector<typename GridView::ctype, dimWorld>;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
diff --git a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
index d520d3123be55cd96cda15c96e29a9a55612792a..8f039f1c913a95721f8f477c502b6d0293ef3f19 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
@@ -116,14 +116,16 @@ class KuevetteProblem : public PorousMediumFlowProblem<TypeTag>
switch1Idx = Indices::switch1Idx,
switch2Idx = Indices::switch2Idx,
temperatureIdx = Indices::temperatureIdx,
+ contiWEqIdx = Indices::contiWEqIdx,
+ contiGEqIdx = Indices::contiGEqIdx,
+ contiNEqIdx = Indices::contiNEqIdx,
energyEqIdx = Indices::energyEqIdx,
- // Phase State
+ // phase states
threePhases = Indices::threePhases,
wgPhaseOnly = Indices::wgPhaseOnly,
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
@@ -228,10 +230,10 @@ public:
// negative values for injection
if (globalPos[0] < eps_)
{
- values[Indices::contiWEqIdx] = -0.1435; // 0.3435 [mol/(s m)] in total
- values[Indices::contiGEqIdx] = -0.2;
- values[Indices::contiNEqIdx] = 0.0;
- values[Indices::energyEqIdx] = -6929.;
+ values[contiWEqIdx] = -0.1435; // 0.3435 [mol/(s m)] in total
+ values[contiGEqIdx] = -0.2;
+ values[contiNEqIdx] = 0.0;
+ values[energyEqIdx] = -6929.;
}
return values;
}
diff --git a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
index 0e1fb9a47bb0bc5ce6ed8bb35c23ce7f1d2bddd4..799c2e7f19bbfe407c2b331ad81a546da3484ecf 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
@@ -74,17 +74,8 @@ class KuevetteSpatialParams : public FVSpatialParams<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
-
- enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
+ enum { dimWorld=GridView::dimensionworld };
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
diff --git a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
index ec746506441ef4beec445b9af567f51bf78d64db..9480c1e702842a7979cf56186fea5d9d1411b188 100644
--- a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
@@ -85,30 +85,23 @@ class SagdProblem : public PorousMediumFlowProblem<TypeTag>
switch1Idx = Indices::switch1Idx,
switch2Idx = Indices::switch2Idx,
+ contiWEqIdx = Indices::contiWEqIdx,
+ contiNEqIdx = Indices::contiNEqIdx,
energyEqIdx = Indices::energyEqIdx,
- temperatureIdx = Indices::temperatureIdx,
- // phase and component indices
+ // phase indices
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
- gPhaseIdx = Indices::gPhaseIdx,
- wCompIdx = Indices::wCompIdx,
- nCompIdx = Indices::nCompIdx,
- // Phase State
- wPhaseOnly = Indices::wPhaseOnly,
+ // phase state
wnPhaseOnly = Indices::wnPhaseOnly,
- wgPhaseOnly = Indices::wgPhaseOnly,
- threePhases = Indices::threePhases,
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using Element = typename GridView::template Codim<0>::Entity;
@@ -234,9 +227,9 @@ public:
// negative values for injection at injection well
if (globalPos[1] > 8.5 - eps_ && globalPos[1] < 9.5 + eps_)
{
- values[Indices::contiNEqIdx] = -0.0;
- values[Indices::contiWEqIdx] = -0.193;//*0.5; // (55.5 mol*12.5)/3600 mol/s m = 0.193
- values[Indices::energyEqIdx] = -9132;//*0.5; // J/sec m 9132
+ values[contiNEqIdx] = -0.0;
+ values[contiWEqIdx] = -0.193;//*0.5; // (55.5 mol*12.5)/3600 mol/s m = 0.193
+ values[energyEqIdx] = -9132;//*0.5; // J/sec m 9132
}
else if (globalPos[1] > 2.5 - eps_ && globalPos[1] < 3.5 + eps_) // production well
{
@@ -282,9 +275,9 @@ public:
}
- values[Indices::contiWEqIdx] = qW;
- values[Indices::contiNEqIdx] = qN;
- values[Indices::energyEqIdx] = qE;
+ values[contiWEqIdx] = qW;
+ values[contiNEqIdx] = qN;
+ values[energyEqIdx] = qE;
massProducedOil_ = qN;
massProducedWater_ = qW;
}
@@ -318,7 +311,7 @@ private:
PrimaryVariables initial_(const GlobalPosition &globalPos) const
{
PrimaryVariables values(0.0);
- values.setState(Indices::wnPhaseOnly);
+ values.setState(wnPhaseOnly);
Scalar densityW = 1000.0;
values[pressureIdx] = 101300.0 + (maxDepth_ - globalPos[1])*densityW*9.81;
diff --git a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh
index 1a217f300d5895d59952dc5d553796602bee8740..2d47684d3dce4332109115f2449a46e64e2b830f 100644
--- a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh
@@ -80,19 +80,8 @@ class SagdSpatialParams : public FVSpatialParams<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
-
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
+ enum { dimWorld=GridView::dimensionworld };
using CoordScalar = typename Grid::ctype;
using GlobalPosition = Dune::FieldVector<CoordScalar,dimWorld>;
@@ -263,7 +252,7 @@ public:
private:
bool isFineMaterial_(const GlobalPosition &pos) const
{
- return pos[dim-1] > layerBottom_ - eps_;
+ return pos[dimWorld-1] > layerBottom_ - eps_;
};
Scalar layerBottom_;
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
index 92415f8515a0e70a771588663da3b79f8d726bad..fb81046f79ef8c9eb0c7efbd960875a7fd854990 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
@@ -118,29 +118,25 @@ class HeterogeneousProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
+ enum { dimWorld = GridView::dimensionworld };
// copy some indices for convenience
enum {
- lPhaseIdx = Indices::wPhaseIdx,
- gPhaseIdx = Indices::nPhaseIdx
- };
- enum {
- wCompIdx = FluidSystem::wCompIdx,
- nCompIdx = FluidSystem::nCompIdx
- };
- enum {
+ pressureIdx = Indices::pressureIdx,
+ switchIdx = Indices::switchIdx,
+
+ wPhaseIdx = Indices::wPhaseIdx,
+ nPhaseIdx = Indices::nPhaseIdx,
+
+ wPhaseOnly = Indices::wPhaseOnly,
+
+ nCompIdx = FluidSystem::nCompIdx,
BrineIdx = FluidSystem::BrineIdx,
CO2Idx = FluidSystem::CO2Idx
};
@@ -243,8 +239,8 @@ public:
vtk.addField(vtkBoxVolume_, "boxVolume");
#if !ISOTHERMAL
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.enthalpy(Indices::wPhaseIdx); }, "enthalpyW");
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.enthalpy(Indices::nPhaseIdx); }, "enthalpyN");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.enthalpy(wPhaseIdx); }, "enthalpyW");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.enthalpy(nPhaseIdx); }, "enthalpyN");
#else
vtkTemperature_.resize(numDofs, 0.0);
vtk.addField(vtkTemperature_, "temperature");
@@ -423,7 +419,7 @@ private:
PrimaryVariables initial_(const GlobalPosition &globalPos) const
{
PrimaryVariables values(0.0);
- values.setState(Indices::wPhaseOnly);
+ values.setState(wPhaseOnly);
const Scalar temp = initialTemperatureField_(globalPos);
const Scalar densityW = FluidSystem::Brine::liquidDensity(temp, 1e7);
@@ -435,11 +431,11 @@ private:
+ FluidSystem::molarMass(CO2Idx)*moleFracLiquidCO2;
if(useMoles) // mole-fraction formulation
- values[Indices::switchIdx] = moleFracLiquidCO2;
+ values[switchIdx] = moleFracLiquidCO2;
else // mass-fraction formulation
- values[Indices::switchIdx] = moleFracLiquidCO2*FluidSystem::molarMass(CO2Idx)/meanM;
+ values[switchIdx] = moleFracLiquidCO2*FluidSystem::molarMass(CO2Idx)/meanM;
- values[Indices::pressureIdx] = 1.0e5 - densityW*this->gravity()[dimWorld-1]*(depthBOR_ - globalPos[dimWorld-1]);
+ values[pressureIdx] = 1.0e5 - densityW*this->gravity()[dimWorld-1]*(depthBOR_ - globalPos[dimWorld-1]);
#if !ISOTHERMAL
values[temperatureIdx] = temp;
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index 40a1cc1d4ea30bb064f77974a9d64056bfaef880..4a5df4cf5ffab43e5c9b31dba9feda76a88b30cd 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -117,7 +117,6 @@ class CombustionProblemOneComponent: public PorousMediumFlowProblem<TypeTag>
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -125,34 +124,26 @@ class CombustionProblemOneComponent: public PorousMediumFlowProblem<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using ParameterCache = typename FluidSystem::ParameterCache;
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
- enum {dim = GridView::dimension}; // Grid and world dimension
enum {dimWorld = GridView::dimensionworld};
enum {numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
enum {numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
- enum {s0EqIdx = Indices::s0Idx};
- enum {p0EqIdx = Indices::p0Idx};
+ enum {s0Idx = Indices::s0Idx};
+ enum {p0Idx = Indices::p0Idx};
enum {conti00EqIdx = Indices::conti0EqIdx};
- enum {temperature0Idx = Indices::temperatureIdx};
enum {energyEq0Idx = Indices::energyEqIdx};
enum {numEnergyEqFluid = GET_PROP_VALUE(TypeTag, NumEnergyEqFluid)};
enum {numEnergyEqSolid = GET_PROP_VALUE(TypeTag, NumEnergyEqSolid)};
enum {energyEqSolidIdx = energyEq0Idx + numEnergyEqFluid + numEnergyEqSolid - 1};
enum {wPhaseIdx = FluidSystem::wPhaseIdx};
enum {nPhaseIdx = FluidSystem::nPhaseIdx};
- enum {sPhaseIdx = FluidSystem::sPhaseIdx};
enum {wCompIdx = FluidSystem::H2OIdx};
enum {nCompIdx = FluidSystem::N2Idx};
- enum {numEq = GET_PROP_VALUE(TypeTag, NumEq)};
-
// formulations
enum {
pressureFormulation = GET_PROP_VALUE(TypeTag, PressureFormulation),
@@ -160,7 +151,6 @@ class CombustionProblemOneComponent: public PorousMediumFlowProblem<TypeTag>
leastWettingFirst = MpNcPressureFormulation::leastWettingFirst
};
- using DimVector = Dune::FieldVector<typename GridView::Grid::ctype, dim>;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
@@ -380,7 +370,7 @@ private:
// Set saturation
//////////////////////////////////////
for (int i = 0; i < numPhases - 1; ++i) {
- priVars[s0EqIdx + i] = S[i];
+ priVars[s0Idx + i] = S[i];
}
FluidState fluidState;
@@ -422,12 +412,12 @@ private:
if(pressureFormulation == mostWettingFirst) {
// This means that the pressures are sorted from the most wetting to the least wetting-1 in the primary variables vector.
// For two phases this means that there is one pressure as primary variable: pw
- priVars[p0EqIdx] = p[wPhaseIdx];
+ priVars[p0Idx] = p[wPhaseIdx];
}
else if(pressureFormulation == leastWettingFirst) {
// This means that the pressures are sorted from the least wetting to the most wetting-1 in the primary variables vector.
// For two phases this means that there is one pressure as primary variable: pn
- priVars[p0EqIdx] = p[nPhaseIdx];
+ priVars[p0Idx] = p[nPhaseIdx];
}
else DUNE_THROW(Dune::InvalidStateException, "Formulation: " << pressureFormulation << " is invalid.");
diff --git a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
index dd0bb1e7430a8b4a4496150ce8142087a1937db7..47a35710b34c2c56d654eaea5afc914bea739bdf 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
@@ -84,16 +84,11 @@ class CombustionSpatialParams : public FVSpatialParams<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- enum {dim=GridView::dimension };
- enum {dimWorld=GridView::dimensionworld};
- enum {wPhaseIdx = FluidSystem::wPhaseIdx};
- enum {nPhaseIdx = FluidSystem::nPhaseIdx};
- enum {sPhaseIdx = FluidSystem::sPhaseIdx};
+ enum {dimWorld = GridView::dimensionworld};
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
using PermeabilityType = Scalar;
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
index 6ad18d94b7381a6b3ab8ffd414f7fe6a659ee4d6..42a2d233e2e3163b40d8ecf08b9d133cd5198ba0 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
@@ -105,7 +105,6 @@ class EvaporationAtmosphereProblem: public PorousMediumFlowProblem<TypeTag>
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -113,38 +112,26 @@ class EvaporationAtmosphereProblem: public PorousMediumFlowProblem<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using ParameterCache = typename FluidSystem::ParameterCache;
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
- /*!
- * \brief The fluid state which is used by the volume variables to
- * store the thermodynamic state. This should be chosen
- * appropriately for the model ((non-)isothermal, equilibrium, ...).
- * This can be done in the problem.
- */
- enum { dim = GridView::dimension}; // Grid and world dimension
enum { dimWorld = GridView::dimensionworld};
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
- enum { S0Idx = Indices::s0Idx};
+ enum { s0Idx = Indices::s0Idx};
enum { p0Idx = Indices::p0Idx};
enum { conti00EqIdx = Indices::conti0EqIdx };
enum { energyEq0Idx = Indices::energyEqIdx};
enum { wPhaseIdx = FluidSystem::wPhaseIdx};
enum { nPhaseIdx = FluidSystem::nPhaseIdx};
- enum { sPhaseIdx = FluidSystem::sPhaseIdx};
enum { wCompIdx = FluidSystem::H2OIdx};
enum { nCompIdx = FluidSystem::N2Idx};
enum { numEnergyEqFluid = GET_PROP_VALUE(TypeTag, NumEnergyEqFluid)};
enum { numEnergyEqSolid = GET_PROP_VALUE(TypeTag, NumEnergyEqSolid)};
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq)};
static constexpr bool enableChemicalNonEquilibrium = GET_PROP_VALUE(TypeTag, EnableChemicalNonEquilibrium);
- static constexpr bool enableThermalNonEquilibrium = GET_PROP_VALUE(TypeTag, EnableChemicalNonEquilibrium);
// formulations
enum {
@@ -377,7 +364,7 @@ private:
"You should not be here: x=" << globalPos[0] << " y= "<< globalPos[dimWorld-1]);
for (int i = 0; i < numPhases - 1; ++i)
- priVars[S0Idx + i] = S[i];
+ priVars[s0Idx + i] = S[i];
// capillary pressure Params
FluidState equilibriumFluidState;
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
index 5c4f688a42c981bf45646854493e463afe189fdb..2a5b031a6eb06031123eb97f2727c993f65f9148 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
@@ -157,21 +157,14 @@ class EvaporationAtmosphereSpatialParams : public FVSpatialParams<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- enum {dim=GridView::dimension };
- enum {dimWorld=GridView::dimensionworld};
- enum {wPhaseIdx = FluidSystem::wPhaseIdx};
- enum {nPhaseIdx = FluidSystem::nPhaseIdx};
- enum {sPhaseIdx = FluidSystem::sPhaseIdx};
- enum { numEnergyEqFluid = GET_PROP_VALUE(TypeTag, NumEnergyEqFluid)};
- enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
- enum { enableThermalNonEquilibrium = GET_PROP_VALUE(TypeTag,EnableThermalNonEquilibrium)};
+ enum { dimWorld = GridView::dimensionworld };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- using DimVector = Dune::FieldVector<Scalar,dim>;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
public:
diff --git a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
index 88c5a5fdabbdc0256e7e909665c0e2cba5e3609c..57d785033e30180a273f81492fa66569519c500b 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
@@ -113,7 +113,6 @@ class ObstacleProblem
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -121,14 +120,10 @@ class ObstacleProblem
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using ParameterCache = typename FluidSystem::ParameterCache;
- // world dimension
enum {dimWorld = GridView::dimensionworld};
enum {numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
enum {numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
@@ -140,10 +135,8 @@ class ObstacleProblem
enum {s0Idx = Indices::s0Idx};
enum {p0Idx = Indices::p0Idx};
-
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PhaseVector = Dune::FieldVector<Scalar, numPhases>;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
public:
/*!
diff --git a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
index 4b6037caeaa439b00ee161d63d6ac461ae8f0b17..dba91bcb03c357099f341ca9009c297ec9c2e91f 100644
--- a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
@@ -81,11 +81,11 @@ class ObstacleSpatialParams : public FVSpatialParams<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
enum {dimWorld=GridView::dimensionworld};
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
using PermeabilityType = Scalar;
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
index df8aad3b09762054dcf732600073d24cc5a921e1..1a83dbddfffe1b564e06c1ec4512a26e3ea6d22a 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
@@ -90,7 +90,6 @@ class RichardsAnalyticalProblem : public PorousMediumFlowProblem<TypeTag>
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -99,7 +98,6 @@ class RichardsAnalyticalProblem : public PorousMediumFlowProblem<TypeTag>
enum {
// copy some indices for convenience
pwIdx = Indices::pressureIdx,
- conti0EqIdx = Indices::conti0EqIdx,
bothPhases = Indices::bothPhases,
};
// Grid and world dimension
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
index 3bfce80e1211b6c0cabe9cbbb8c0fc2e1226c9ac..710a17e729b791166df230dd438c321c6d378cb1 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
@@ -75,10 +75,7 @@ class RichardsAnalyticalSpatialParams : public FVSpatialParams<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
+ enum { dimWorld=GridView::dimensionworld };
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
@@ -86,7 +83,7 @@ class RichardsAnalyticalSpatialParams : public FVSpatialParams<TypeTag>
public:
- // export permeability type
+ // export permeability type
using PermeabilityType = Scalar;
diff --git a/test/porousmediumflow/richards/implicit/richardslensproblem.hh b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
index e911a19755282924e285649d370eb48541b60c10..1acf47f5f63e99f8b188bc128839577ecc9db899 100644
--- a/test/porousmediumflow/richards/implicit/richardslensproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
@@ -106,7 +106,7 @@ class RichardsLensProblem : public PorousMediumFlowProblem<TypeTag>
conti0EqIdx = Indices::conti0EqIdx,
bothPhases = Indices::bothPhases,
- // Grid and world dimension
+ // world dimension
dimWorld = GridView::dimensionworld
};
diff --git a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
index 617e93cf6ea4ac142a3e769c113cc662abb60443..33f6292e5de5a3471199fac2d416fc38399f9f56 100644
--- a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
@@ -74,10 +74,7 @@ class RichardsLensSpatialParams : public FVSpatialParams<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
+ enum { dimWorld=GridView::dimensionworld };
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
diff --git a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
index 0e42afae255d4be80a362e5536e66621fe097dda..4f1510a00a7738b2393547d00ae97f42335923af 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
@@ -103,32 +103,21 @@ class RichardsNIConductionProblem :public PorousMediumFlowProblem<TypeTag>
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using IapwsH2O = H2O<Scalar>;
- // copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // world dimension
- dimWorld = GridView::dimensionworld
- };
-
+ enum { dimWorld = GridView::dimensionworld };
enum {
- // indices of the primary variables
pressureIdx = Indices::pressureIdx,
- conti0EqIdx = Indices::conti0EqIdx,
wPhaseOnly = Indices::wPhaseOnly,
wPhaseIdx = Indices::wPhaseIdx,
- temperatureIdx = Indices::temperatureIdx,
- energyEqIdx = Indices::energyEqIdx
+ temperatureIdx = Indices::temperatureIdx
};
using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
index ada08924db5bb951e97cd133d639a304da051ff7..76949884f2bc24a2df4cbb80aef70db38dfdbaa7 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
@@ -117,24 +117,16 @@ class RichardsNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- // world dimension
- dimWorld = GridView::dimensionworld
- };
-
+ enum { dimWorld = GridView::dimensionworld };
enum {
- // indices of the primary variables
pressureIdx = Indices::pressureIdx,
- conti0EqIdx = Indices::conti0EqIdx,
wPhaseOnly = Indices::wPhaseOnly,
wPhaseIdx = Indices::wPhaseIdx,
- temperatureIdx = Indices::temperatureIdx,
- energyEqIdx = Indices::energyEqIdx
+ temperatureIdx = Indices::temperatureIdx
};
using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
index fefecf6b5d0d747931d6d63b1140c88f3ed17b2a..06f1bf117366b34acc2faf9483d253351c1cdee1 100644
--- a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
@@ -74,20 +74,12 @@ class RichardsNISpatialParams : public FVSpatialParams<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
-
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using Element = typename GridView::template Codim<0>::Entity;
- enum {
- dimWorld=GridView::dimensionworld
- };
+ enum { dimWorld=GridView::dimensionworld };
using CoordScalar = typename Grid::ctype;
- using GlobalPosition = Dune::FieldVector<CoordScalar,dimWorld>;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
- //using EffMaterialLaw = LinearMaterial<Scalar>;
public:
- // export permeability type
+ // export permeability type
using PermeabilityType = Scalar;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh b/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
index b5a55866788e7f49725a05b2632155022937b110..c24e033026455c8a5ab8061b87e1933f37b08531 100644
--- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
+++ b/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
@@ -109,13 +109,10 @@ class RichardsWellTracerProblem : public PorousMediumFlowProblem<TypeTag>
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
enum {
- // copy some indices for convenience
pressureIdx = Indices::pressureIdx,
- conti0EqIdx = Indices::conti0EqIdx,
compIdx = Indices::compMainIdx + 1,
wPhaseIdx = Indices::wPhaseIdx,
- // Grid and world dimension
dimWorld = GridView::dimensionworld
};
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh b/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
index a476e514dbdbf6649867beb975c8958de6b97cb4..bc37f894de6a0ead920da11aab200da02dc9fd18 100644
--- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
+++ b/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
@@ -73,10 +73,7 @@ class RichardsWellTracerSpatialParams : public FVSpatialParams<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
+ enum { dimWorld=GridView::dimensionworld };
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh b/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
index d01686d35506f487755a1a82cd379f03cac4e821..2720ee0ccee4ec4ddcb87ce101ac8da8305cca3e 100644
--- a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
@@ -77,15 +77,9 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
static constexpr int dimWorld = GridView::dimensionworld;
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
index df3a8cfb0f5a1ca95607c1517822333be91fc44f..d7b982bafb1e7f3a1dd7a3e309fb5dcbb68ed5c3 100644
--- a/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
+++ b/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
@@ -43,9 +43,9 @@ class OnePTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
static constexpr int dimWorld = GridView::dimensionworld;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
using PermeabilityType = Scalar;
diff --git a/tutorial/ex1/injection2pspatialparams.hh b/tutorial/ex1/injection2pspatialparams.hh
index f9961826228e9601a9fffc5537ac7f732b6c9f9d..30de88989388cc0782e955a5676702b4c80fc96a 100644
--- a/tutorial/ex1/injection2pspatialparams.hh
+++ b/tutorial/ex1/injection2pspatialparams.hh
@@ -69,7 +69,6 @@ class InjectionSpatialParams : public FVSpatialParams<TypeTag>
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/tutorial/ex2/injection2p2cspatialparams.hh b/tutorial/ex2/injection2p2cspatialparams.hh
index 14609f07a673e25c8efbc59250a8ae6edb51954e..1467c696beb4e974421e302c40a32a55b4ceed5a 100644
--- a/tutorial/ex2/injection2p2cspatialparams.hh
+++ b/tutorial/ex2/injection2p2cspatialparams.hh
@@ -79,7 +79,6 @@ class InjectionSpatialParams : public FVSpatialParams<TypeTag>
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using CoorinateType = typename GridView::ctype;
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/tutorial/solution/ex1/injection2pspatialparams.hh b/tutorial/solution/ex1/injection2pspatialparams.hh
index 2673f737482c4f113d9bfd9988156ac2539a6365..0741103053f0600a77e156125b59d2ef3e47face 100644
--- a/tutorial/solution/ex1/injection2pspatialparams.hh
+++ b/tutorial/solution/ex1/injection2pspatialparams.hh
@@ -69,7 +69,6 @@ class InjectionSpatialParams : public FVSpatialParams<TypeTag>
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/tutorial/solution/ex2/injection2p2cspatialparams.hh b/tutorial/solution/ex2/injection2p2cspatialparams.hh
index 512f34da8aabe285417edef6c3fb090924f78c59..3c4d63d8ac54cc0501df2167b53b2be5fbb2f8a0 100644
--- a/tutorial/solution/ex2/injection2p2cspatialparams.hh
+++ b/tutorial/solution/ex2/injection2p2cspatialparams.hh
@@ -79,7 +79,6 @@ class InjectionSpatialParams : public FVSpatialParams<TypeTag>
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- typedef typename GridView::ctype CoordinateType;
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
@@ -91,8 +90,6 @@ public:
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
-public:
-
/*!
* \brief The constructor
*