Commit 2849125c authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

remove warning-causing commas

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7280 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 4c943b59
......@@ -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,
......
......@@ -78,7 +78,7 @@ class OnePTwoCFluxVariables
enum {
phaseIdx = Indices::phaseIdx,
comp0Idx = Indices::comp0Idx,
comp1Idx = Indices::comp1Idx,
comp1Idx = Indices::comp1Idx
};
public:
/*
......
......@@ -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));
......
......@@ -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;
......
......@@ -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;
......
......@@ -79,7 +79,7 @@ class TwoPTwoCFluxVariables
gPhaseIdx = Indices::gPhaseIdx,
lCompIdx = Indices::lCompIdx,
gCompIdx = Indices::gCompIdx,
gCompIdx = Indices::gCompIdx
};
public:
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -56,7 +56,7 @@ class RichardsFluxVariables
dimWorld = GridView::dimensionworld,
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx
};
typedef typename FVElementGeometry::SubControlVolume SCV;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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:
......
......@@ -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;
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment