From f44199ef08097f37916e025890ae3b91ee32ca7c Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Thu, 27 Jul 2017 17:11:02 +0200 Subject: [PATCH 1/2] [staggered][assemblymap] Use numBoundaryFacets from globalFVGeometry * do not use this info from grid(), as some grids do not implement the method --- dumux/implicit/staggered/assemblymap.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dumux/implicit/staggered/assemblymap.hh b/dumux/implicit/staggered/assemblymap.hh index 78f2444b41..1fc9fc0086 100644 --- a/dumux/implicit/staggered/assemblymap.hh +++ b/dumux/implicit/staggered/assemblymap.hh @@ -66,7 +66,7 @@ public: { const auto numDofsCC = problem.model().numCellCenterDofs(); const auto numDofsFace = problem.model().numFaceDofs(); - const auto numBoundaryFacets = problem.gridView().grid().numBoundarySegments(); + const auto numBoundaryFacets = problem.model().globalFvGeometry().numBoundaryScvf(); cellCenterToCellCenterMap_.resize(numDofsCC); cellCenterToFaceMap_.resize(numDofsCC); faceToCellCenterMap_.resize(2*numDofsFace - numBoundaryFacets); -- GitLab From b149188392cfbab5f872099110439a160ffb9f13 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Thu, 27 Jul 2017 17:11:42 +0200 Subject: [PATCH 2/2] [freeflow][geometryHelper] Remove assert * does not make sense for grids with holes in them --- .../staggered/freeflow/staggeredgeometryhelper.hh | 2 -- 1 file changed, 2 deletions(-) diff --git a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh index da01ea90e3..2d6e85f09d 100644 --- a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh +++ b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh @@ -351,8 +351,6 @@ private: auto foundCorrectIdx = [otherIsIdx](const auto& x) { return x.localNormalFaceIdx == otherIsIdx; }; const int index = std::find_if(this->pairData_.begin(), this->pairData_.end(), foundCorrectIdx) - this->pairData_.begin(); - assert(this->pairData_[index].outerParallelFaceDofIdx == -1); - this->pairData_[index].virtualOuterParallelFaceDofPos = std::move(virtualOuterParallelFaceDofPos); this->pairData_[index].parallelDistance = std::move(distance.two_norm()); } -- GitLab