From 2fb379c4e4274e1431350f020575059c72c9ac15 Mon Sep 17 00:00:00 2001
From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de>
Date: Thu, 16 Sep 2021 14:26:20 +0200
Subject: [PATCH] [rans][Problem][wall] Replace isOnWall functions
* For wall distance calculations use the call to boundary types
---
dumux/freeflow/rans/problem.hh | 10 +++++++++-
dumux/freeflow/rans/twoeq/kepsilon/problem.hh | 2 +-
.../rans/twoeq/kepsilon/staggered/fluxvariables.hh | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dumux/freeflow/rans/problem.hh b/dumux/freeflow/rans/problem.hh
index 8cbe30f2b9..c7a53fcd0a 100644
--- a/dumux/freeflow/rans/problem.hh
+++ b/dumux/freeflow/rans/problem.hh
@@ -193,16 +193,24 @@ public:
*
* \param scvf The sub control volume face.
*/
+ [[deprecated("Will be removed after release 3.4")]]
bool isOnWall(const SubControlVolumeFace& scvf) const
{
return asImp_().isOnWallAtPos(scvf.center());
}
+ bool isOnWall(const Element& element, const SubControlVolumeFace& scvf) const
+ {
+ // Return true if this wall has been marked as a Wall
+ return asImp_().boundaryTypes(element, scvf).hasWall();
+ }
+
/*!
* \brief Returns whether a given point is on a wall
*
* \param globalPos The position in global coordinates.
*/
+ [[deprecated("Will be removed after release 3.4")]]
bool isOnWallAtPos(const GlobalPosition &globalPos) const
{
// Throw an exception if no walls are implemented
@@ -349,7 +357,7 @@ private:
for (const auto& scvf : scvfs(fvGeometry))
{
// only search for walls at a global boundary
- if (!scvf.boundary() && asImp_().isOnWall(scvf))
+ if (!scvf.boundary() && asImp_().isOnWall(element, scvf))
wallFaceAxis.push_back(scvf.directionIndex());
}
}
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
index 8936d1054c..b5fedcb899 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
@@ -309,7 +309,7 @@ public:
{
unsigned int elementIdx = asImp_().gridGeometry().elementMapper().index(element);
auto bcTypes = asImp_().boundaryTypes(element, localSubFace);
- return asImp_().isOnWall(localSubFace)
+ return asImp_().isOnWall(element, localSubFace)
&& bcTypes.isDirichlet(eqIdx)
&& isMatchingPoint(elementIdx);
}
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
index 0eca6c4ecc..5317b7e82a 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
@@ -148,7 +148,7 @@ public:
const auto bcTypes = problem.boundaryTypes(element, scvf);
if (!(scvf.boundary() && (bcTypes.isOutflow(Indices::turbulentKineticEnergyEqIdx)
|| bcTypes.isSymmetry()
- || problem.isOnWall(scvf))))
+ || bcTypes.hasWall())))
{
if (!(insideVolVars.isMatchingPoint() && outsideVolVars.isMatchingPoint())
|| !(insideVolVars.isMatchingPoint() && outsideVolVars.inNearWallRegion())
--
GitLab