From d3a637ea13d3a0089cc193b576c992464822be40 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Fri, 13 Jan 2012 18:45:36 +0000
Subject: [PATCH] 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
---
dumux/boxmodels/2p2c/2p2cfluxvariables.hh | 1 -
dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh | 9 ++++-----
dumux/boxmodels/2pni/2pnivolumevariables.hh | 1 -
dumux/boxmodels/MpNc/MpNcindices.hh | 2 --
dumux/boxmodels/MpNc/MpNclocalresidual.hh | 2 --
dumux/boxmodels/MpNc/MpNcvtkwriter.hh | 1 -
dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh | 1 -
dumux/boxmodels/MpNc/diffusion/diffusion.hh | 2 --
dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh | 6 ------
dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh | 1 -
dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh | 1 -
dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh | 3 ---
dumux/boxmodels/common/boxboundaryvariables.hh | 1 -
dumux/linear/overlappingbcrsmatrix.hh | 2 --
dumux/linear/overlappingblockvector.hh | 1 -
dumux/linear/overlappingpreconditioner.hh | 1 -
.../constraintsolvers/compositionfromfugacities.hh | 1 -
dumux/material/fluidmatrixinteractions/Mp/2padapter.hh | 1 -
test/boxmodels/2p/lensproblem.hh | 1 -
test/boxmodels/richards/richardslensproblem.hh | 1 -
20 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
index 0981385db1..af07c67a7c 100644
--- a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
@@ -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:
/*
diff --git a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
index 00e62b05dc..e79efec29b 100644
--- a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
@@ -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;
diff --git a/dumux/boxmodels/2pni/2pnivolumevariables.hh b/dumux/boxmodels/2pni/2pnivolumevariables.hh
index 5f8a08235f..e954f871d0 100644
--- a/dumux/boxmodels/2pni/2pnivolumevariables.hh
+++ b/dumux/boxmodels/2pni/2pnivolumevariables.hh
@@ -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 };
diff --git a/dumux/boxmodels/MpNc/MpNcindices.hh b/dumux/boxmodels/MpNc/MpNcindices.hh
index 9f20607021..146e39d53e 100644
--- a/dumux/boxmodels/MpNc/MpNcindices.hh
+++ b/dumux/boxmodels/MpNc/MpNcindices.hh
@@ -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:
diff --git a/dumux/boxmodels/MpNc/MpNclocalresidual.hh b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
index 3fa6a8ebae..d90de9a009 100644
--- a/dumux/boxmodels/MpNc/MpNclocalresidual.hh
+++ b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
@@ -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;
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwriter.hh b/dumux/boxmodels/MpNc/MpNcvtkwriter.hh
index 0b14593474..ce7875f7f7 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwriter.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwriter.hh
@@ -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;
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh b/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
index f34369b189..6a96a69741 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
@@ -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;
diff --git a/dumux/boxmodels/MpNc/diffusion/diffusion.hh b/dumux/boxmodels/MpNc/diffusion/diffusion.hh
index 5ab8ac479f..6e66c28f19 100644
--- a/dumux/boxmodels/MpNc/diffusion/diffusion.hh
+++ b/dumux/boxmodels/MpNc/diffusion/diffusion.hh
@@ -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 };
diff --git a/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
index 2d247ade3a..98ea06948a 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
@@ -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:
diff --git a/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh b/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh
index 8d5753fefc..9ab81d0666 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh
@@ -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:
diff --git a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
index b730a499d8..8ec88dcfe8 100644
--- a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
@@ -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;
diff --git a/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh b/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
index 2a5b14097b..528140c33a 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
@@ -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:
diff --git a/dumux/boxmodels/common/boxboundaryvariables.hh b/dumux/boxmodels/common/boxboundaryvariables.hh
index 9bfd0658c0..0680e4142a 100644
--- a/dumux/boxmodels/common/boxboundaryvariables.hh
+++ b/dumux/boxmodels/common/boxboundaryvariables.hh
@@ -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,
diff --git a/dumux/linear/overlappingbcrsmatrix.hh b/dumux/linear/overlappingbcrsmatrix.hh
index 9c4f4194d1..9604e832b8 100644
--- a/dumux/linear/overlappingbcrsmatrix.hh
+++ b/dumux/linear/overlappingbcrsmatrix.hh
@@ -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;
diff --git a/dumux/linear/overlappingblockvector.hh b/dumux/linear/overlappingblockvector.hh
index 8f818331a4..4b1a3f9392 100644
--- a/dumux/linear/overlappingblockvector.hh
+++ b/dumux/linear/overlappingblockvector.hh
@@ -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;
diff --git a/dumux/linear/overlappingpreconditioner.hh b/dumux/linear/overlappingpreconditioner.hh
index d5c1463b3d..69c81471e4 100644
--- a/dumux/linear/overlappingpreconditioner.hh
+++ b/dumux/linear/overlappingpreconditioner.hh
@@ -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 };
diff --git a/dumux/material/constraintsolvers/compositionfromfugacities.hh b/dumux/material/constraintsolvers/compositionfromfugacities.hh
index ee47da3ddf..38b84c0358 100644
--- a/dumux/material/constraintsolvers/compositionfromfugacities.hh
+++ b/dumux/material/constraintsolvers/compositionfromfugacities.hh
@@ -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;
diff --git a/dumux/material/fluidmatrixinteractions/Mp/2padapter.hh b/dumux/material/fluidmatrixinteractions/Mp/2padapter.hh
index 97299ac145..132807ce89 100644
--- a/dumux/material/fluidmatrixinteractions/Mp/2padapter.hh
+++ b/dumux/material/fluidmatrixinteractions/Mp/2padapter.hh
@@ -49,7 +49,6 @@ class TwoPAdapter
public:
typedef typename TwoPLaw::Params Params;
- typedef typename Params::Scalar Scalar;
enum { numPhases = 2 };
/*!
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index 486804310f..bfa92de239 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -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;
diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh
index c32530b22a..b6c8d2d9f7 100644
--- a/test/boxmodels/richards/richardslensproblem.hh
+++ b/test/boxmodels/richards/richardslensproblem.hh
@@ -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:
--
GitLab