Merge branch 'fix/staggered-use-numBoundaryFaces-from-globalFVGeometry' into 'next'

Fix/staggered use num boundary faces from global fv geometry

See merge request !541

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());
             }

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);