From c5ce0fabae2db841275b21bdf0f0877430df9aeb Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 13 Jul 2022 18:35:29 +0200
Subject: [PATCH] [box][geomhelper] Fix deprecation warnings from
getBoundary/FractureScvfCorners
---
dumux/discretization/box/subcontrolvolumeface.hh | 2 +-
dumux/multidomain/facet/box/subcontrolvolumeface.hh | 2 +-
dumux/porousmediumflow/boxdfm/subcontrolvolume.hh | 2 +-
dumux/porousmediumflow/boxdfm/subcontrolvolumeface.hh | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dumux/discretization/box/subcontrolvolumeface.hh b/dumux/discretization/box/subcontrolvolumeface.hh
index 21776f1356..8c489aa704 100644
--- a/dumux/discretization/box/subcontrolvolumeface.hh
+++ b/dumux/discretization/box/subcontrolvolumeface.hh
@@ -119,7 +119,7 @@ public:
GridIndexType scvfIndex,
std::vector<LocalIndexType>&& scvIndices,
bool boundary = false)
- : corners_(geometryHelper.getBoundaryScvfCorners(intersection, isGeometry, indexInIntersection)),
+ : corners_(geometryHelper.getBoundaryScvfCorners(intersection.indexInInside(), indexInIntersection)),
center_(0.0),
unitOuterNormal_(intersection.centerUnitOuterNormal()),
area_(geometryHelper.scvfArea(corners_)),
diff --git a/dumux/multidomain/facet/box/subcontrolvolumeface.hh b/dumux/multidomain/facet/box/subcontrolvolumeface.hh
index 88aa660ff9..207de2a27b 100644
--- a/dumux/multidomain/facet/box/subcontrolvolumeface.hh
+++ b/dumux/multidomain/facet/box/subcontrolvolumeface.hh
@@ -102,7 +102,7 @@ public:
std::vector<LocalIndexType>&& scvIndices,
bool boundary,
bool interiorBoundary)
- : corners_(geometryHelper.getBoundaryScvfCorners(intersection, isGeometry, indexInIntersection))
+ : corners_(geometryHelper.getBoundaryScvfCorners(intersection.indexInInside(), indexInIntersection))
, center_(0.0)
, unitOuterNormal_(intersection.centerUnitOuterNormal())
, area_(geometryHelper.scvfArea(corners_))
diff --git a/dumux/porousmediumflow/boxdfm/subcontrolvolume.hh b/dumux/porousmediumflow/boxdfm/subcontrolvolume.hh
index ae345314c6..cb880d192c 100644
--- a/dumux/porousmediumflow/boxdfm/subcontrolvolume.hh
+++ b/dumux/porousmediumflow/boxdfm/subcontrolvolume.hh
@@ -144,7 +144,7 @@ public:
, facetIdx_(elemLocalFacetIdx)
{
// copy corners
- auto corners = geometryHelper.getBoundaryScvfCorners(intersection, isGeometry, indexInIntersection);
+ auto corners = geometryHelper.getBoundaryScvfCorners(intersection.indexInInside(), indexInIntersection);
const auto numCorners = corners.size();
corners_.resize(numCorners);
for (unsigned int i = 0; i < numCorners; ++i)
diff --git a/dumux/porousmediumflow/boxdfm/subcontrolvolumeface.hh b/dumux/porousmediumflow/boxdfm/subcontrolvolumeface.hh
index 5c0e38cabd..6c7f0df124 100644
--- a/dumux/porousmediumflow/boxdfm/subcontrolvolumeface.hh
+++ b/dumux/porousmediumflow/boxdfm/subcontrolvolumeface.hh
@@ -124,7 +124,7 @@ public:
LocalIndexType indexInIntersection,
GridIndexType scvfIndex,
std::vector<LocalIndexType>&& scvIndices)
- : corners_(geometryHelper.getBoundaryScvfCorners(intersection, isGeometry, indexInIntersection))
+ : corners_(geometryHelper.getBoundaryScvfCorners(intersection.indexInInside(), indexInIntersection))
, center_(0.0)
, unitOuterNormal_(intersection.centerUnitOuterNormal())
, area_(geometryHelper.scvfArea(corners_))
@@ -149,7 +149,7 @@ public:
GridIndexType scvfIndex,
std::vector<LocalIndexType>&& scvIndices,
bool boundary)
- : corners_(geometryHelper.getFractureScvfCorners(intersection, isGeometry, indexInIntersection))
+ : corners_(geometryHelper.getFractureScvfCorners(intersection.indexInInside(), indexInIntersection))
, center_(0.0)
, scvfIndex_(scvfIndex)
, scvIndices_(std::move(scvIndices))
--
GitLab