From 08c36e0d465115df0db9efc966d0357fec4d3d8a Mon Sep 17 00:00:00 2001
From: mattijs <>
Date: Wed, 14 Aug 2019 12:05:52 +0100
Subject: [PATCH] ENH: globalMeshData - added else branch so that in the case
of a cyclic baffle edge it sets the globalEdgeOrientation
See #1367
---
.../polyMesh/globalMeshData/globalMeshData.C | 50 ++++++++++---------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 02ba1ed3f05..84e56a4f98e 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1188,35 +1188,37 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
forAll(coupledPatch().edges(), edgeI)
{
- if (masterEdgeVerts[edgeI] == labelPair(labelMax, labelMax))
+ // Test that edge is not single edge on cyclic baffle
+ if (masterEdgeVerts[edgeI] != labelPair(labelMax, labelMax))
{
- // Skip single edge on cyclic baffle
- continue;
- }
-
- const edge& e = coupledPatch().edges()[edgeI];
- const labelPair masterE
- (
- masterPoint[e[0]],
- masterPoint[e[1]]
- );
+ const edge& e = coupledPatch().edges()[edgeI];
+ const labelPair masterE
+ (
+ masterPoint[e[0]],
+ masterPoint[e[1]]
+ );
- const int stat = labelPair::compare
- (
- masterE,
- masterEdgeVerts[edgeI]
- );
- if (stat == 0)
- {
- FatalErrorInFunction
- << "problem : my edge:" << e
- << " in master points:" << masterE
- << " v.s. masterEdgeVerts:" << masterEdgeVerts[edgeI]
- << exit(FatalError);
+ const int stat = labelPair::compare
+ (
+ masterE,
+ masterEdgeVerts[edgeI]
+ );
+ if (stat == 0)
+ {
+ FatalErrorInFunction
+ << "problem : my edge:" << e
+ << " in master points:" << masterE
+ << " v.s. masterEdgeVerts:" << masterEdgeVerts[edgeI]
+ << exit(FatalError);
+ }
+ else
+ {
+ globalEdgeOrientation.set(edgeI, (stat == 1));
+ }
}
else
{
- globalEdgeOrientation.set(edgeI, (stat == 1));
+ globalEdgeOrientation.set(edgeI, true);
}
}
}
--
GitLab