From 2849125c80cdc39dbfd7a2e46725a2c2da906ae2 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 3 Jan 2012 13:26:58 +0000
Subject: [PATCH] remove warning-causing commas
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7280 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/1p2c/1p2cboundaryvariables.hh | 16 +++++++---------
dumux/boxmodels/1p2c/1p2cfluxvariables.hh | 2 +-
dumux/boxmodels/1p2c/1p2clocalresidual.hh | 2 +-
dumux/boxmodels/2p/2pfluxvariables.hh | 2 +-
dumux/boxmodels/2p/2pmodel.hh | 2 +-
dumux/boxmodels/2p2c/2p2cfluxvariables.hh | 2 +-
dumux/boxmodels/2p2c/2p2cvolumevariables.hh | 2 +-
dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh | 2 +-
dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh | 2 +-
dumux/boxmodels/2pni/2pnifluxvariables.hh | 2 +-
dumux/boxmodels/MpNc/MpNcfluxvariables.hh | 2 +-
dumux/boxmodels/MpNc/MpNcvolumevariables.hh | 2 +-
dumux/boxmodels/MpNc/diffusion/fluxvariables.hh | 2 +-
.../MpNc/energy/MpNcfluxvariablesenergy.hh | 2 +-
.../boxmodels/richards/richardsfluxvariables.hh | 2 +-
.../boxmodels/richards/richardslocalresidual.hh | 2 +-
dumux/boxmodels/richards/richardsmodel.hh | 2 +-
.../richards/richardsnewtoncontroller.hh | 2 +-
dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh | 2 +-
dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh | 2 +-
.../2p/transport/fv/evalcflflux_coats.hh | 2 +-
.../2p/transport/fv/evalcflflux_default.hh | 2 +-
.../decoupled/2p/transport/fv/fvsaturation2p.hh | 2 +-
dumux/decoupled/2p2c/2p2cproperties.hh | 2 +-
dumux/decoupled/2p2c/boundaryconditions2p2c.hh | 2 +-
dumux/decoupled/2p2c/dec2p2cfluidstate.hh | 4 ++--
dumux/decoupled/2p2c/fvpressure2p2c.hh | 2 +-
.../decoupled/2p2c/fvpressure2p2cmultiphysics.hh | 2 +-
dumux/decoupled/2p2c/fvtransport2p2c.hh | 2 +-
.../2p2c/fvtransport2p2cmultiphysics.hh | 2 +-
dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh | 2 +-
dumux/decoupled/common/impetproblem.hh | 2 +-
dumux/decoupled/common/onemodelproblem.hh | 2 +-
dumux/decoupled/common/onemodelproblem_old.hh | 2 +-
test/boxmodels/1p2c/tissue_tumor_problem.hh | 2 +-
.../1p2c/tissue_tumor_spatialparameters.hh | 2 +-
test/boxmodels/2p2c/injectionproblem.hh | 4 ++--
.../boxmodels/2p2c/injectionspatialparameters.hh | 7 +++----
test/boxmodels/2p2cni/waterairproblem.hh | 2 +-
.../2p2cni/waterairspatialparameters.hh | 4 ++--
test/boxmodels/2pni/injectionproblem2pni.hh | 2 +-
test/boxmodels/MpNc/obstacleproblem.hh | 4 ++--
test/boxmodels/MpNc/obstaclespatialparameters.hh | 6 +++---
test/boxmodels/richards/richardslensproblem.hh | 2 +-
.../richards/richardslensspatialparameters.hh | 2 +-
test/decoupled/1p/test_diffusion_problem.hh | 2 +-
tutorial/tutorialspatialparameters_coupled.hh | 2 +-
47 files changed, 61 insertions(+), 64 deletions(-)
diff --git a/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh b/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
index a35207e0d6..d5188655e3 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 b6b671298b..9f7c3306c7 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 66e1d0c275..a7854cc340 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 5687ff000e..8b553f0e34 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 118129aa32..66dddbe2df 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 26ea4e03f0..2b0e6de3f2 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 e95746c86d..605f21c185 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 d9772f83bb..c89bcb6c5f 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 a0fab65c5c..aed80b7ff3 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 62d213c466..f541b9da80 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 0ae496399c..b43381a016 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 c98ae3a501..57948b1741 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 1d805f6fb4..7068620c26 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 13fca1e124..fd734895e1 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 de495931f2..1a9d64e2b3 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 be094928bb..ab47563b6c 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 c6c0309dc2..c0955cf348 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 2ad8b21020..15bdaa3537 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 8ae3f4a3fd..075de22af8 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 195f2c8afb..986f2d9a01 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 520be40352..fe0dfec96f 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 2b64a9c7b6..8e8b72e8a7 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 fcd6e0e9ba..f43fb75b04 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 627e7dd2e0..5cafec2289 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 3d5f82f0ba..525f47daa5 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 66ff7c9412..c70097c648 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 e564419437..3cdc024a85 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 b71893cbbb..f21b79e642 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 f20c221502..01ed676762 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 51b2a684dc..f3ea80c40a 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 369b7b5a45..41c187612d 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 4b957935f7..4d7ad4d219 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 1ade1d93da..bd96e301b4 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 af153ce4f5..47e3ba6507 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 29604edba0..8da4f28eec 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 b6de317868..b178b88847 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 3f4f0564a9..ccdadbc70a 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 66c1ea3d3b..6eaf923812 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 14a1914510..cb5aaa62a4 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 86cf2952c1..14a8b6a89e 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 4cbb2584e5..c2b6933195 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 8718a6bbee..fcf929dfbb 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 bc5943670f..0013266165 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 19977c4f68..9df615ed36 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 fe8575a32f..6aec1d493c 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 c44a49ef06..d1ad3e4cd9 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 c7cebeb900..bb76d99968 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;
--
GitLab