Commit 600427de authored by Dennis Gläser's avatar Dennis Gläser Committed by Timo Koch
Browse files

[box][fvelemgeom] cleanup index types

parent ffca0c5d
......@@ -52,7 +52,7 @@ class BoxFVElementGeometry<GG, true>
using GridView = typename GG::GridView;
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
using IndexType = typename GridView::IndexSet::IndexType;
using LocalIndexType = unsigned int;
using Element = typename GridView::template Codim<0>::Entity;
using CoordScalar = typename GridView::ctype;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
......@@ -72,13 +72,13 @@ public:
: fvGridGeometryPtr_(&fvGridGeometry) {}
//! Get a sub control volume with a local scv index
const SubControlVolume& scv(IndexType scvIdx) const
const SubControlVolume& scv(LocalIndexType scvIdx) const
{
return fvGridGeometry().scvs(eIdx_)[scvIdx];
}
//! Get a sub control volume face with a local scvf index
const SubControlVolumeFace& scvf(IndexType scvfIdx) const
const SubControlVolumeFace& scvf(LocalIndexType scvfIdx) const
{
return fvGridGeometry().scvfs(eIdx_)[scvfIdx];
}
......@@ -156,7 +156,7 @@ private:
const Element* elementPtr_;
const FVGridGeometry* fvGridGeometryPtr_;
IndexType eIdx_;
typename GridView::IndexSet::IndexType eIdx_;
};
//! specialization in case the FVElementGeometries are not stored
......@@ -166,10 +166,8 @@ class BoxFVElementGeometry<GG, false>
using GridView = typename GG::GridView;
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
using IndexType = typename GridView::IndexSet::IndexType;
using LocalIndexType = unsigned int;
using Element = typename GridView::template Codim<0>::Entity;
using CoordScalar = typename GridView::ctype;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
using ReferenceElements = typename Dune::ReferenceElements<CoordScalar, dim>;
......@@ -192,13 +190,13 @@ public:
: fvGridGeometryPtr_(&fvGridGeometry) {}
//! Get a sub control volume with a local scv index
const SubControlVolume& scv(IndexType scvIdx) const
const SubControlVolume& scv(LocalIndexType scvIdx) const
{
return scvs_[scvIdx];
}
//! Get a sub control volume face with a local scvf index
const SubControlVolumeFace& scvf(IndexType scvfIdx) const
const SubControlVolumeFace& scvf(LocalIndexType scvfIdx) const
{
return scvfs_[scvfIdx];
}
......@@ -287,7 +285,6 @@ private:
// construct the sub control volumes
scvs_.resize(elementGeometry.corners());
using LocalIndexType = typename SubControlVolumeFace::Traits::LocalIndexType;
for (LocalIndexType scvLocalIdx = 0; scvLocalIdx < elementGeometry.corners(); ++scvLocalIdx)
{
// get asssociated dof index
......@@ -304,7 +301,7 @@ private:
const auto numInnerScvf = (dim==1) ? 1 : element.subEntities(dim-1);
scvfs_.resize(numInnerScvf);
unsigned int scvfLocalIdx = 0;
LocalIndexType scvfLocalIdx = 0;
for (; scvfLocalIdx < numInnerScvf; ++scvfLocalIdx)
{
// find the local scv indices this scvf is connected to
......@@ -350,7 +347,7 @@ private:
//! The bound element
const Element* elementPtr_;
IndexType eIdx_;
typename GridView::IndexSet::IndexType eIdx_;
//! The global geometry this is a restriction of
const FVGridGeometry* fvGridGeometryPtr_;
......
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