diff --git a/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh b/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
index a35207e0d6a5f93f9cdd5d80b129c392d87e9e1d..d5188655e3b14f5a92c042aa78956be4b397f7e3 100644
--- a/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
@@ -59,6 +59,13 @@ class OnePTwoCBoundaryVariables
enum {
dim = GridView::dimension,
+
+ phaseIdx = Indices::phaseIdx,
+
+ comp0Idx = Indices::comp0Idx,
+ comp1Idx = Indices::comp1Idx,
+
+ numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
};
typedef typename GridView::template Codim<0>::Entity Element;
@@ -70,15 +77,6 @@ class OnePTwoCBoundaryVariables
typedef typename FVElementGeometry::SubControlVolume SCV;
typedef typename FVElementGeometry::BoundaryFace BoundaryFace;
- enum {
- phaseIdx = Indices::phaseIdx,
-
- comp0Idx = Indices::comp0Idx,
- comp1Idx = Indices::comp1Idx,
-
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
- };
-
public:
OnePTwoCBoundaryVariables(const Problem &problem,
const Element &element,
diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
index b6b671298b39cb6ce3b0db346761846bc3b31687..9f7c3306c7a4dd404a3630641521aba2ce8d2538 100644
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
@@ -78,7 +78,7 @@ class OnePTwoCFluxVariables
enum {
phaseIdx = Indices::phaseIdx,
comp0Idx = Indices::comp0Idx,
- comp1Idx = Indices::comp1Idx,
+ comp1Idx = Indices::comp1Idx
};
public:
/*
diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
index 66e1d0c275e3763a2c614f2f110c0aeb213d135b..a7854cc3402986bc338c3b25c8a4c818fc525b2e 100644
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
@@ -93,7 +93,7 @@ protected:
// indices of the equations
contiEqIdx = Indices::contiEqIdx,
- transEqIdx = Indices::transEqIdx,
+ transEqIdx = Indices::transEqIdx
};
static const bool useMoles = GET_PROP_VALUE(TypeTag, PTAG(UseMoles));
diff --git a/dumux/boxmodels/2p/2pfluxvariables.hh b/dumux/boxmodels/2p/2pfluxvariables.hh
index 5687ff000ece2673bc9a65dcb10971722a8066c6..8b553f0e34cdb3429c929b7c24529f29868d57a3 100644
--- a/dumux/boxmodels/2p/2pfluxvariables.hh
+++ b/dumux/boxmodels/2p/2pfluxvariables.hh
@@ -66,7 +66,7 @@ class TwoPFluxVariables
enum {
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
+ numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
diff --git a/dumux/boxmodels/2p/2pmodel.hh b/dumux/boxmodels/2p/2pmodel.hh
index 118129aa32c388796f65f114a17c828f3c7fd7b8..66dddbe2dffa6b26a573cc8bb81d090c9d017fa0 100644
--- a/dumux/boxmodels/2p/2pmodel.hh
+++ b/dumux/boxmodels/2p/2pmodel.hh
@@ -103,7 +103,7 @@ class TwoPModel : public BoxModel<TypeTag>
pnSw = Indices::pnSw,
pressureIdx = Indices::pressureIdx,
- saturationIdx = Indices::saturationIdx,
+ saturationIdx = Indices::saturationIdx
};
typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
diff --git a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
index 26ea4e03f09e35853c1c28ed4ae7f5bf70c03044..2b0e6de3f2d4da47c3716f10b14891d903793e33 100644
--- a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
@@ -79,7 +79,7 @@ class TwoPTwoCFluxVariables
gPhaseIdx = Indices::gPhaseIdx,
lCompIdx = Indices::lCompIdx,
- gCompIdx = Indices::gCompIdx,
+ gCompIdx = Indices::gCompIdx
};
public:
diff --git a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
index e95746c86dbf8f58276137c628e4cfb1668d9898..605f21c185b212e9e44d4866f8b6e34a8f606a49 100644
--- a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
@@ -99,7 +99,7 @@ class TwoPTwoCVolumeVariables : public BoxVolumeVariables<TypeTag>
// primary variable indices
enum {
switchIdx = Indices::switchIdx,
- pressureIdx = Indices::pressureIdx,
+ pressureIdx = Indices::pressureIdx
};
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
index d9772f83bbccdad6fbbe2712e1d82fb285455666..c89bcb6c5fef0145eccd8b2e4b82cd68c997a873 100644
--- a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
@@ -67,7 +67,7 @@ class TwoPTwoCNIFluxVariables : public TwoPTwoCFluxVariables<TypeTag>
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
+ numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
diff --git a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh b/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
index a0fab65c5c43bf6ba2e1500ca6e619baa7c2ad34..aed80b7ff3fccdf7efbd4cd3e4312efc87fd4e5f 100644
--- a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
@@ -58,7 +58,7 @@ class TwoPTwoCNIVolumeVariables : public TwoPTwoCVolumeVariables<TypeTag>
enum {
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
+ dimWorld = GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
diff --git a/dumux/boxmodels/2pni/2pnifluxvariables.hh b/dumux/boxmodels/2pni/2pnifluxvariables.hh
index 62d213c466b6a7d31c1f317fd0aba164b133c45d..f541b9da8090e326247f0997b3b1e1d420f3ddc5 100644
--- a/dumux/boxmodels/2pni/2pnifluxvariables.hh
+++ b/dumux/boxmodels/2pni/2pnifluxvariables.hh
@@ -67,7 +67,7 @@ class TwoPNIFluxVariables : public TwoPFluxVariables<TypeTag>
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
+ numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
diff --git a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
index 0ae496399ca53daa03eef3832844dfa40b7804e9..b43381a016919d6ff98b5f6219a96e8e65303614 100644
--- a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
@@ -71,7 +71,7 @@ class MPNCFluxVariables
enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)),
enableKinetic = GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)),
enableKineticEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy)),
- enableGravity = GET_PROP_VALUE(TypeTag, PTAG(EnableGravity)),
+ enableGravity = GET_PROP_VALUE(TypeTag, PTAG(EnableGravity))
};
typedef typename GridView::ctype CoordScalar;
diff --git a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
index c98ae3a50100af564c8a649c4df85697c80a68da..57948b174198351ac53823e81a6c35ccccfb6045 100644
--- a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
@@ -81,7 +81,7 @@ class MPNCVolumeVariables
numEnergyEqs = Indices::NumPrimaryEnergyVars,
S0Idx = Indices::S0Idx,
- p0Idx = Indices::p0Idx,
+ p0Idx = Indices::p0Idx
};
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh b/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
index 1d805f6fb41c4d21e1f65cabec8b74ef3704aafc..7068620c26d082adce0ce5d4a16bf357867df928 100644
--- a/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
+++ b/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
@@ -57,7 +57,7 @@ class MPNCFluxVariablesDiffusion
numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
lPhaseIdx = FluidSystem::lPhaseIdx,
- gPhaseIdx = FluidSystem::gPhaseIdx,
+ gPhaseIdx = FluidSystem::gPhaseIdx
};
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
index 13fca1e124104925054d0e7ab0e3f16bd76369ee..fd734895e1b12acb8e77a52be89a19735f658c74 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
@@ -87,7 +87,7 @@ class MPNCFluxVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTr
dimWorld = GridView::dimensionworld,
gPhaseIdx = FluidSystem::gPhaseIdx,
lPhaseIdx = FluidSystem::lPhaseIdx,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
+ numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
};
typedef Dune::FieldVector<CoordScalar, dimWorld> Vector;
diff --git a/dumux/boxmodels/richards/richardsfluxvariables.hh b/dumux/boxmodels/richards/richardsfluxvariables.hh
index de495931f227e0871f68fbac18c9fb4cb819dc55..1a9d64e2b3453b1406f7b5ad061d1fba2996d57b 100644
--- a/dumux/boxmodels/richards/richardsfluxvariables.hh
+++ b/dumux/boxmodels/richards/richardsfluxvariables.hh
@@ -56,7 +56,7 @@ class RichardsFluxVariables
dimWorld = GridView::dimensionworld,
wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
+ nPhaseIdx = Indices::nPhaseIdx
};
typedef typename FVElementGeometry::SubControlVolume SCV;
diff --git a/dumux/boxmodels/richards/richardslocalresidual.hh b/dumux/boxmodels/richards/richardslocalresidual.hh
index be094928bb7256840d48c649af0e19d6827f7d22..ab47563b6cb4e01ffbf79c97756215934304d8a0 100644
--- a/dumux/boxmodels/richards/richardslocalresidual.hh
+++ b/dumux/boxmodels/richards/richardslocalresidual.hh
@@ -57,7 +57,7 @@ class RichardsLocalResidual : public BoxLocalResidual<TypeTag>
contiEqIdx = Indices::contiEqIdx,
wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
+ nPhaseIdx = Indices::nPhaseIdx
};
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
diff --git a/dumux/boxmodels/richards/richardsmodel.hh b/dumux/boxmodels/richards/richardsmodel.hh
index c6c0309dc2f29cf9efb23781320cd03c9a17c00d..c0955cf348fea63aca90a09a6dfb315db9e3e63d 100644
--- a/dumux/boxmodels/richards/richardsmodel.hh
+++ b/dumux/boxmodels/richards/richardsmodel.hh
@@ -111,7 +111,7 @@ class RichardsModel : public BoxModel<TypeTag>
enum {
dim = GridView::dimension,
nPhaseIdx = Indices::nPhaseIdx,
- wPhaseIdx = Indices::wPhaseIdx,
+ wPhaseIdx = Indices::wPhaseIdx
};
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/richards/richardsnewtoncontroller.hh b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
index 2ad8b210203d5990c69ab42a508fdc5a9097a608..15bdaa35378e5ba3e813c037c332172143d4386b 100644
--- a/dumux/boxmodels/richards/richardsnewtoncontroller.hh
+++ b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
@@ -57,7 +57,7 @@ class RichardsNewtonController : public NewtonController<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PTAG(RichardsIndices)) Indices;
enum {
dim = GridView::dimension,
- pwIdx = Indices::pwIdx,
+ pwIdx = Indices::pwIdx
};
public:
diff --git a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
index 8ae3f4a3fd2478e4472ca166ee6f7c3f8085ac3a..075de22af82e68695c29b45da7b3e951a1d0957c 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
@@ -73,7 +73,7 @@ template<class TypeTag> class FVPressure1P
enum
{
- pressEqIdx = 0,// only one equation!
+ pressEqIdx = 0 // only one equation!
};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
index 195f2c8afbf9619febcaff21543e4c7b69dbf348..986f2d9a01119a41fb25a7b10b9fb6372d40a914 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
@@ -75,7 +75,7 @@ typedef typename GridView::Traits::template Codim<0>::Entity Element;
enum
{
- pressEqIdx = 0,// only one equation!
+ pressEqIdx = 0 // only one equation!
};
typedef Dune::FieldVector<Scalar,dimWorld> GlobalPosition;
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh b/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
index 520be40352f3a7670ffd38813774da8781b291d1..fe0dfec96f58c7db1c1460416da2be16b9a15f8a 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
@@ -80,7 +80,7 @@ private:
vn = Indices::velocityNW,
vt = Indices::velocityTotal,
Sw = Indices::saturationW,
- Sn = Indices::saturationNW,
+ Sn = Indices::saturationNW
};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh b/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
index 2b64a9c7b623e42ca5348be1a68ff20e7455980b..8e8b72e8a7c1922ec4a310af1d7cd08fd6147ff9 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
@@ -69,7 +69,7 @@ private:
vn = Indices::velocityNW,
vt = Indices::velocityTotal,
Sw = Indices::saturationW,
- Sn = Indices::saturationNW,
+ Sn = Indices::saturationNW
};
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index fcd6e0e9ba8b630dc93524ec2b146e6a38b9a711..f43fb75b047da56d6fe03f87b889cc4334472d1b 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -102,7 +102,7 @@ class FVSaturation2P
vn = Indices::velocityNW,
vt = Indices::velocityTotal,
Sw = Indices::saturationW,
- Sn = Indices::saturationNW,
+ Sn = Indices::saturationNW
};
enum
{
diff --git a/dumux/decoupled/2p2c/2p2cproperties.hh b/dumux/decoupled/2p2c/2p2cproperties.hh
index 627e7dd2e0ed62dae976aa8e6acde3474ccc456e..5cafec22898d454443cd3227b35684693c7e66d9 100644
--- a/dumux/decoupled/2p2c/2p2cproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cproperties.hh
@@ -188,7 +188,7 @@ public:
enum BoundaryFormulation
{
saturation=-1,
- concentration=-2,
+ concentration=-2
};
diff --git a/dumux/decoupled/2p2c/boundaryconditions2p2c.hh b/dumux/decoupled/2p2c/boundaryconditions2p2c.hh
index 3d5f82f0ba6d4e9cb08ffc43d3f63ea5fde068bc..525f47daa5f3e840788e37265a99009f79413417 100644
--- a/dumux/decoupled/2p2c/boundaryconditions2p2c.hh
+++ b/dumux/decoupled/2p2c/boundaryconditions2p2c.hh
@@ -47,7 +47,7 @@ struct BoundaryConditions2p2c
enum Flags
{
saturation=1,
- concentration=2,
+ concentration=2
};
};
diff --git a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
index 66ff7c9412eb6ae9bd96bc7ca6d9852eae5b1b17..c70097c648c305f74f3b14ff96554a6c9c6672fc 100644
--- a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
@@ -56,12 +56,12 @@ class DecoupledTwoPTwoCFluidState
nPhaseIdx = Indices::nPhaseIdx,
wCompIdx = Indices::wPhaseIdx,
- nCompIdx = Indices::nPhaseIdx,
+ nCompIdx = Indices::nPhaseIdx
};
public:
enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),};
+ numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents))};
public:
/*!
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index e564419437d611ff48becd1b11d48af9903562c8..3cdc024a85b27fe0e9e90f7d89df631cb3c63169 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -90,7 +90,7 @@ template<class TypeTag> class FVPressure2P2C
pn = Indices::pressureNW,
pglobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
- Sn = Indices::saturationNW,
+ Sn = Indices::saturationNW
};
enum
{
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
index b71893cbbb2fe277e02b8546cd5a7a9ab0d0d8ce..f21b79e642729af008c3bf1656abc92235b003a1 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
@@ -90,7 +90,7 @@ class FVPressure2P2CMultiPhysics : public FVPressure2P2C<TypeTag>
pn = Indices::pressureNW,
pglobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
- Sn = Indices::saturationNW,
+ Sn = Indices::saturationNW
};
enum
{
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index f20c221502c6429fe0fea88adb175aea8f9cffdc..01ed6767622787ee6a494a477d20af4db44d360b 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -77,7 +77,7 @@ class FVTransport2P2C
vn = Indices::velocityNW,
vt = Indices::velocityTotal,
Sw = Indices::saturationW,
- Sn = Indices::saturationNW,
+ Sn = Indices::saturationNW
};
enum
{
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index 51b2a684dce946bcc75aa398f9b3e71008360077..f3ea80c40a425af22e6e404e6b35b53bb412d579 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -81,7 +81,7 @@ class FVTransport2P2CMultiPhysics : public FVTransport2P2C<TypeTag>
vn = Indices::velocityNW,
vt = Indices::velocityTotal,
Sw = Indices::saturationW,
- Sn = Indices::saturationNW,
+ Sn = Indices::saturationNW
};
enum
{
diff --git a/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh b/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
index 369b7b5a45beec29da7abb7a5a64e5f324bd17c6..41c187612ddd0293a0c1e6f3fa2a801e732303c2 100644
--- a/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
@@ -56,7 +56,7 @@ public:
nPhaseIdx = Indices::nPhaseIdx,
wCompIdx = Indices::wPhaseIdx,
- nCompIdx = Indices::nPhaseIdx,
+ nCompIdx = Indices::nPhaseIdx
};
public:
diff --git a/dumux/decoupled/common/impetproblem.hh b/dumux/decoupled/common/impetproblem.hh
index 4b957935f78eeaa1bcee77701962fee64303c2c5..4d7ad4d219bddda56e1fd00fd8772cb85d4c3fab 100644
--- a/dumux/decoupled/common/impetproblem.hh
+++ b/dumux/decoupled/common/impetproblem.hh
@@ -73,7 +73,7 @@ private:
enum
{
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
+ dimWorld = GridView::dimensionworld
};
enum
{
diff --git a/dumux/decoupled/common/onemodelproblem.hh b/dumux/decoupled/common/onemodelproblem.hh
index 1ade1d93dae649259a4d8dbb37c0ad655085b492..bd96e301b409d6aad4f918ea8e802e95192aaf2f 100644
--- a/dumux/decoupled/common/onemodelproblem.hh
+++ b/dumux/decoupled/common/onemodelproblem.hh
@@ -69,7 +69,7 @@ private:
enum
{
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
+ dimWorld = GridView::dimensionworld
};
enum
{
diff --git a/dumux/decoupled/common/onemodelproblem_old.hh b/dumux/decoupled/common/onemodelproblem_old.hh
index af153ce4f5a874b34b57d0eb3fa2e75557ad1d3a..47e3ba65072bfff1170c60ac4bd652c862e92e18 100644
--- a/dumux/decoupled/common/onemodelproblem_old.hh
+++ b/dumux/decoupled/common/onemodelproblem_old.hh
@@ -69,7 +69,7 @@ private:
enum
{
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
+ dimWorld = GridView::dimensionworld
};
enum
{
diff --git a/test/boxmodels/1p2c/tissue_tumor_problem.hh b/test/boxmodels/1p2c/tissue_tumor_problem.hh
index 29604edba0b9cfd48b75e41aa507056962f200f5..8da4f28eeca7c0c0d1e393db061e81fee041b26f 100644
--- a/test/boxmodels/1p2c/tissue_tumor_problem.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_problem.hh
@@ -146,7 +146,7 @@ class TissueTumorProblem : public OnePTwoCBoxProblem<TypeTag>
// indices of the equations
contiEqIdx = Indices::contiEqIdx,
- transEqIdx = Indices::transEqIdx,
+ transEqIdx = Indices::transEqIdx
};
diff --git a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
index b6de317868209a5ac203d1964f82fa28706b5c1e..b178b88847ef23724bacc94cfa97a96fb3709d95 100644
--- a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
@@ -54,7 +54,7 @@ class TissueTumorSpatialParameters : public BoxSpatialParametersOneP<TypeTag>
typedef typename Grid::ctype CoordScalar;
enum {
dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
+ dimWorld=GridView::dimensionworld
};
typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index 3f4f0564a9c2d42ddb3fa989350d7341323966a5..ccdadbc70aeda4c02a4812027ec3fa23967a1f4d 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -106,7 +106,7 @@ class InjectionProblem : public TwoPTwoCProblem<TypeTag>
enum {
// Grid and world dimension
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
+ dimWorld = GridView::dimensionworld
};
// copy some indices for convenience
@@ -123,7 +123,7 @@ class InjectionProblem : public TwoPTwoCProblem<TypeTag>
conti0EqIdx = Indices::conti0EqIdx,
contiH2OEqIdx = conti0EqIdx + H2OIdx,
- contiN2EqIdx = conti0EqIdx + N2Idx,
+ contiN2EqIdx = conti0EqIdx + N2Idx
};
diff --git a/test/boxmodels/2p2c/injectionspatialparameters.hh b/test/boxmodels/2p2c/injectionspatialparameters.hh
index 66c1ea3d3b7fdbf253001ca93584cccf120ed29a..6eaf923812ec2897dfd5f0de2da3cf9cfec29dc4 100644
--- a/test/boxmodels/2p2c/injectionspatialparameters.hh
+++ b/test/boxmodels/2p2c/injectionspatialparameters.hh
@@ -78,15 +78,14 @@ class InjectionSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename Grid::ctype CoordScalar;
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+
enum {
dim=GridView::dimension,
dimWorld=GridView::dimensionworld,
- };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- enum {
lPhaseIdx = FluidSystem::lPhaseIdx,
- gPhaseIdx = FluidSystem::gPhaseIdx,
+ gPhaseIdx = FluidSystem::gPhaseIdx
};
typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index 14a19145106a9192c7c681dafd5544b96d078107..cb5aaa62a4c5648d817879ec877b29d2f1a5f0e1 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -139,7 +139,7 @@ class WaterAirProblem : public TwoPTwoCNIProblem<TypeTag>
// Grid and world dimension
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
+ dimWorld = GridView::dimensionworld
};
diff --git a/test/boxmodels/2p2cni/waterairspatialparameters.hh b/test/boxmodels/2p2cni/waterairspatialparameters.hh
index 86cf2952c1bbe491e2a284567fc56e3984c1e165..14a8b6a89e551d399c9c8823366b51e3343c4cbf 100644
--- a/test/boxmodels/2p2cni/waterairspatialparameters.hh
+++ b/test/boxmodels/2p2cni/waterairspatialparameters.hh
@@ -78,13 +78,13 @@ class WaterAirSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename Grid::ctype CoordScalar;
enum {
dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
+ dimWorld=GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
enum {
lPhaseIdx = Indices::lPhaseIdx,
- gPhaseIdx = Indices::gPhaseIdx,
+ gPhaseIdx = Indices::gPhaseIdx
};
typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
diff --git a/test/boxmodels/2pni/injectionproblem2pni.hh b/test/boxmodels/2pni/injectionproblem2pni.hh
index 4cbb2584e55715d5ceb12437b898742e8b8fddf0..c2b69331952063affe04ea54d8c9e04d8ac11f3f 100644
--- a/test/boxmodels/2pni/injectionproblem2pni.hh
+++ b/test/boxmodels/2pni/injectionproblem2pni.hh
@@ -169,7 +169,7 @@ class InjectionProblem2PNI
// Grid and world dimension
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
+ dimWorld = GridView::dimensionworld
};
diff --git a/test/boxmodels/MpNc/obstacleproblem.hh b/test/boxmodels/MpNc/obstacleproblem.hh
index 8718a6bbee345494191ba10a4bb5ebeeb41d1a06..fcf929dfbb254d7a58b90b3a95c7b357ce7b65e9 100644
--- a/test/boxmodels/MpNc/obstacleproblem.hh
+++ b/test/boxmodels/MpNc/obstacleproblem.hh
@@ -152,7 +152,7 @@ class ObstacleProblem
lPhaseIdx = FluidSystem::lPhaseIdx,
H2OIdx = FluidSystem::H2OIdx,
- N2Idx = FluidSystem::N2Idx,
+ N2Idx = FluidSystem::N2Idx
};
typedef typename GridView::template Codim<0>::Entity Element;
@@ -171,7 +171,7 @@ class ObstacleProblem
enum {
fug0Idx = Indices::fug0Idx,
S0Idx = Indices::S0Idx,
- p0Idx = Indices::p0Idx,
+ p0Idx = Indices::p0Idx
};
public:
diff --git a/test/boxmodels/MpNc/obstaclespatialparameters.hh b/test/boxmodels/MpNc/obstaclespatialparameters.hh
index bc5943670f7bd2562960bc916d4509df44bdd061..001326616517af406c01ddc07cd756907fa67999 100644
--- a/test/boxmodels/MpNc/obstaclespatialparameters.hh
+++ b/test/boxmodels/MpNc/obstaclespatialparameters.hh
@@ -55,7 +55,7 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
enum {
lPhaseIdx = FluidSystem::lPhaseIdx,
- gPhaseIdx = FluidSystem::gPhaseIdx,
+ gPhaseIdx = FluidSystem::gPhaseIdx
};
// define the material law
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
@@ -90,12 +90,12 @@ class ObstacleSpatialParameters : public BoxSpatialParameters<TypeTag>
enum {
dim=GridView::dimension,
dimWorld=GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
+ numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
};
enum {
lPhaseIdx = FluidSystem::lPhaseIdx,
- gPhaseIdx = FluidSystem::gPhaseIdx,
+ gPhaseIdx = FluidSystem::gPhaseIdx
};
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh
index 19977c4f68eba4e9cab6e300d5c2b3ba3ee77d5f..9df615ed360baa25cbb72635751edd3bd1d071f6 100644
--- a/test/boxmodels/richards/richardslensproblem.hh
+++ b/test/boxmodels/richards/richardslensproblem.hh
@@ -141,7 +141,7 @@ class RichardsLensProblem : public RichardsBoxProblem<TypeTag>
contiEqIdx = Indices::contiEqIdx,
// Grid and world dimension
- dim = GridView::dimensionworld,
+ dim = GridView::dimensionworld
};
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/test/boxmodels/richards/richardslensspatialparameters.hh b/test/boxmodels/richards/richardslensspatialparameters.hh
index fe8575a32ffef3e217162d81bc7cd57e6aac6e3f..6aec1d493cee66c339f914e5c1583b6bdc3952c0 100644
--- a/test/boxmodels/richards/richardslensspatialparameters.hh
+++ b/test/boxmodels/richards/richardslensspatialparameters.hh
@@ -80,7 +80,7 @@ class RichardsLensSpatialParameters : public BoxSpatialParameters<TypeTag>
enum {
dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
+ dimWorld=GridView::dimensionworld
};
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
diff --git a/test/decoupled/1p/test_diffusion_problem.hh b/test/decoupled/1p/test_diffusion_problem.hh
index c44a49ef063a5ed5170b13a9757034887a207681..d1ad3e4cd9dbb121b13325c5800e51d8fe4f3c7e 100644
--- a/test/decoupled/1p/test_diffusion_problem.hh
+++ b/test/decoupled/1p/test_diffusion_problem.hh
@@ -138,7 +138,7 @@ class TestDiffusionProblem: public DiffusionProblem2P<TypeTag>
nPhaseIdx = Indices::nPhaseIdx,
pGlobalIdx = Indices::pGlobalIdx,
SwIdx = Indices::SwIdx,
- pressEqIdx = Indices::pressEqIdx,
+ pressEqIdx = Indices::pressEqIdx
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
diff --git a/tutorial/tutorialspatialparameters_coupled.hh b/tutorial/tutorialspatialparameters_coupled.hh
index c7cebeb9006dd8f6585c42c4bdcad411e808e6e8..bb76d99968385ea842dc0e0360f67d49990cf65b 100644
--- a/tutorial/tutorialspatialparameters_coupled.hh
+++ b/tutorial/tutorialspatialparameters_coupled.hh
@@ -80,7 +80,7 @@ class TutorialSpatialParametersCoupled: public BoxSpatialParameters<TypeTag> /*@
enum
{
dim = Grid::dimension,
- dimWorld = Grid::dimensionworld,
+ dimWorld = Grid::dimensionworld
};
typedef Dune::FieldVector<Scalar, dim> GlobalPosition;