Commit d3a637ea authored by Andreas Lauser's avatar Andreas Lauser
Browse files

also remove unused non-public constants and more unused typedefs

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7375 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 1c5b92e4
......@@ -76,7 +76,6 @@ class TwoPTwoCFluxVariables
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
typedef typename FVElementGeometry::BoundaryFace BoundaryFace;
public:
/*
......
......@@ -63,9 +63,7 @@ class TwoPTwoCNIFluxVariables : public TwoPTwoCFluxVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
enum { dimWorld = GridView::dimensionworld };
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> Vector;
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
public:
/*
......@@ -137,9 +135,10 @@ protected:
problem.spatialParameters().matrixHeatFlux(tmp,
*this,
elemVolVars,
face,
temperatureGrad_,
element,
this->fvGeom_);
this->fvGeom_,
scvfIdx_);
// project the heat flux vector on the face's normal vector
normalMatrixHeatFlux_ = tmp*face.normal;
......
......@@ -48,7 +48,6 @@ class TwoPNIVolumeVariables : public TwoPVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum { temperatureIdx = Indices::temperatureIdx };
......
......@@ -47,7 +47,6 @@ struct MPNCIndices :
{
private:
enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
enum { enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion) };
enum { enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic) }; //mass transfer
enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy) }; // energy transfer
......@@ -55,7 +54,6 @@ private:
typedef MPNCEnergyIndices<BasePVOffset + MassIndices::NumPrimaryVars, enableEnergy, enableKineticEnergy> EnergyIndices;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum { numComponents = FluidSystem::numComponents };
enum { numPhases = FluidSystem::numPhases };
public:
......
......@@ -76,9 +76,7 @@ protected:
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::CollectiveCommunication CollectiveCommunication;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
......
......@@ -47,7 +47,6 @@ class MPNCVtkWriter
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum { dim = GridView::dimension };
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
......
......@@ -68,7 +68,6 @@ class MPNCVtkWriterCommon : public MPNCVtkWriterModule<TypeTag>
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
enum { velocityAveragingInModel = GET_PROP_VALUE(TypeTag, VelocityAveragingInModel) };
typedef Dune::FieldVector<Scalar, dim> VelocityVector;
typedef Dune::BlockVector<VelocityVector> VelocityField;
......
......@@ -37,9 +37,7 @@ class MPNCDiffusion
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
enum { enableKinetic= GET_PROP_VALUE(TypeTag, EnableKinetic)};
enum { gPhaseIdx = FluidSystem::gPhaseIdx };
enum { lPhaseIdx = FluidSystem::lPhaseIdx };
......
......@@ -63,12 +63,9 @@ class MPNCVtkWriterEnergy : public MPNCVtkWriterModule<TypeTag>
typedef typename GridView::template Codim<0>::Entity Element;
enum { dim = GridView::dimension };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
typedef typename ParentType::ScalarBuffer ScalarBuffer;
typedef typename ParentType::PhaseBuffer PhaseBuffer;
typedef typename ParentType::ComponentBuffer ComponentBuffer;
typedef typename ParentType::PhaseComponentBuffer PhaseComponentBuffer;
public:
MPNCVtkWriterEnergy(const Problem &problem)
......@@ -150,12 +147,9 @@ class MPNCVtkWriterEnergy<TypeTag, /* enableEnergy = */ true, /* enableKineticEn
enum { dim = GridView::dimension };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
typedef typename ParentType::ScalarBuffer ScalarBuffer;
typedef typename ParentType::PhaseBuffer PhaseBuffer;
typedef typename ParentType::ComponentBuffer ComponentBuffer;
typedef typename ParentType::PhaseComponentBuffer PhaseComponentBuffer;
public:
......
......@@ -44,7 +44,6 @@ class MPNCMassIndices
"No kinetic mass transfer module included, "
"but kinetic mass transfer enabled.");
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
public:
......
......@@ -236,7 +236,6 @@ class MPNCLocalResidualMass
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { conti0EqIdx = Indices::conti0EqIdx };
enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
typedef typename Dune::FieldVector<Scalar, numComponents> ComponentVector;
......
......@@ -64,10 +64,7 @@ class MPNCVtkWriterMass : public MPNCVtkWriterModule<TypeTag>
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
bool fugacityOutput_;
typedef typename ParentType::ScalarBuffer ScalarBuffer;
typedef typename ParentType::PhaseBuffer PhaseBuffer;
typedef typename ParentType::ComponentBuffer ComponentBuffer;
typedef typename ParentType::PhaseComponentBuffer PhaseComponentBuffer;
public:
......
......@@ -54,7 +54,6 @@ class BoxBoundaryVariables : public GET_PROP_TYPE(TypeTag, PTAG(FluxVariables))
typedef typename FVElementGeometry::BoundaryFace BoundaryFace;
typedef typename GridView::template Codim<0>::Entity Element;
enum { dim = GridView::dimension };
public:
BoxBoundaryVariables(const Problem &problem,
......
......@@ -63,10 +63,8 @@ private:
typedef std::vector<std::set<ColIndex> > Entries;
public:
typedef typename ParentType::RowIterator RowIterator;
typedef typename ParentType::ColIterator ColIterator;
typedef typename ParentType::ConstColIterator ConstColIterator;
typedef typename ParentType::field_type field_type;
typedef typename ParentType::block_type block_type;
......
......@@ -50,7 +50,6 @@ class OverlappingBlockVector
typedef typename Overlap::Index RowIndex;
typedef typename Overlap::ProcessRank ProcessRank;
typedef typename Overlap::PeerSet PeerSet;
typedef typename Overlap::ForeignOverlapWithPeer ForeignOverlapWithPeer;
typedef typename Overlap::DomesticOverlapWithPeer DomesticOverlapWithPeer;
typedef typename ParentType::field_type Scalar;
......
......@@ -42,7 +42,6 @@ class OverlappingPreconditioner :
public:
typedef typename SeqPreCond::domain_type domain_type;
typedef typename SeqPreCond::range_type range_type;
typedef typename SeqPreCond::field_type field_type;
enum { category = Dune::SolverCategory::overlapping };
......
......@@ -43,7 +43,6 @@ namespace Dumux {
template <class Scalar, class FluidSystem>
class CompositionFromFugacities
{
enum { numPhases = FluidSystem::numPhases };
enum { numComponents = FluidSystem::numComponents };
typedef typename FluidSystem::ParameterCache ParameterCache;
......
......@@ -49,7 +49,6 @@ class TwoPAdapter
public:
typedef typename TwoPLaw::Params Params;
typedef typename Params::Scalar Scalar;
enum { numPhases = 2 };
/*!
......
......@@ -190,7 +190,6 @@ class LensProblem : public TwoPProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GridView::Intersection Intersection;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
......
......@@ -144,7 +144,6 @@ class RichardsLensProblem : public RichardsBoxProblem<TypeTag>
};
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
public:
......
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