Commit 5292bbe6 authored by Dennis Gläser's avatar Dennis Gläser
Browse files

[box] move localscvindices into scvfs

parent adc69a4b
......@@ -311,7 +311,7 @@ private:
element,
elementGeometry,
scvfLocalIdx,
localScvIndices,
std::move(localScvIndices),
false);
}
......@@ -325,7 +325,7 @@ private:
for (unsigned int isScvfLocalIdx = 0; isScvfLocalIdx < isGeometry.corners(); ++isScvfLocalIdx)
{
// find the scv this scvf is connected to
LocalIndexType insideScvIdx = static_cast<LocalIndexType>(referenceElement.subEntity(intersection.indexInInside(), 1, isScvfLocalIdx, dim));
const LocalIndexType insideScvIdx = static_cast<LocalIndexType>(referenceElement.subEntity(intersection.indexInInside(), 1, isScvfLocalIdx, dim));
std::vector<LocalIndexType> localScvIndices = {insideScvIdx, insideScvIdx};
scvfs_.emplace_back(geometryHelper,
......@@ -333,7 +333,7 @@ private:
isGeometry,
isScvfLocalIdx,
scvfLocalIdx,
localScvIndices,
std::move(localScvIndices),
true);
// increment local counter
......
......@@ -135,7 +135,7 @@ public:
scvs_[eIdx].resize(elementGeometry.corners());
for (LocalIndexType scvLocalIdx = 0; scvLocalIdx < elementGeometry.corners(); ++scvLocalIdx)
{
auto dofIdxGlobal = this->vertexMapper().subIndex(element, scvLocalIdx, dim);
const auto dofIdxGlobal = this->vertexMapper().subIndex(element, scvLocalIdx, dim);
scvs_[eIdx][scvLocalIdx] = SubControlVolume(geometryHelper,
scvLocalIdx,
......@@ -156,7 +156,7 @@ public:
element,
elementGeometry,
scvfLocalIdx,
localScvIndices,
std::move(localScvIndices),
false);
}
......@@ -173,7 +173,7 @@ public:
for (unsigned int isScvfLocalIdx = 0; isScvfLocalIdx < isGeometry.corners(); ++isScvfLocalIdx)
{
// find the scvs this scvf is belonging to
LocalIndexType insideScvIdx = static_cast<LocalIndexType>(referenceElement.subEntity(intersection.indexInInside(), 1, isScvfLocalIdx, dim));
const LocalIndexType insideScvIdx = static_cast<LocalIndexType>(referenceElement.subEntity(intersection.indexInInside(), 1, isScvfLocalIdx, dim));
std::vector<LocalIndexType> localScvIndices = {insideScvIdx, insideScvIdx};
scvfs_[eIdx].emplace_back(geometryHelper,
......@@ -181,7 +181,7 @@ public:
isGeometry,
isScvfLocalIdx,
scvfLocalIdx,
localScvIndices,
std::move(localScvIndices),
true);
// increment local counter
......
......@@ -58,14 +58,14 @@ public:
const Element& element,
const typename Element::Geometry& elemGeometry,
GridIndexType scvfIndex,
const std::vector<LocalIndexType>& scvIndices,
std::vector<LocalIndexType>&& scvIndices,
bool boundary = false)
: corners_(geometryHelper.getScvfCorners(scvfIndex)),
center_(0.0),
unitOuterNormal_(geometryHelper.normal(corners_, scvIndices)),
area_(geometryHelper.scvfArea(corners_)),
scvfIndex_(scvfIndex),
scvIndices_(scvIndices),
scvIndices_(std::move(scvIndices)),
boundary_(boundary)
{
for (const auto& corner : corners_)
......@@ -80,14 +80,14 @@ public:
const typename Intersection::Geometry& isGeometry,
LocalIndexType indexInIntersection,
GridIndexType scvfIndex,
const std::vector<LocalIndexType>& scvIndices,
std::vector<LocalIndexType>&& scvIndices,
bool boundary = false)
: corners_(geometryHelper.getBoundaryScvfCorners(isGeometry, indexInIntersection)),
center_(0.0),
unitOuterNormal_(intersection.centerUnitOuterNormal()),
area_(geometryHelper.scvfArea(corners_)),
scvfIndex_(scvfIndex),
scvIndices_(scvIndices),
scvIndices_(std:: move(scvIndices)),
boundary_(boundary)
{
for (const auto& corner : corners_)
......
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