From 686b8f19d1750d8144f765036662689a9baa5167 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 19 Jul 2013 15:50:48 +0100
Subject: [PATCH] ENH: Move longestEdge function to face.H as a global function
---
src/OpenFOAM/meshes/meshShapes/face/face.C | 24 ++++++++++++++++-
src/OpenFOAM/meshes/meshShapes/face/face.H | 8 +++++-
.../polyTopoChange/edgeCollapser.C | 26 -------------------
.../polyTopoChange/edgeCollapser.H | 3 ---
4 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 21576535e9a..41650aad6c1 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -829,4 +829,26 @@ Foam::label Foam::face::trianglesQuads
}
+Foam::label Foam::longestEdge(const face& f, const pointField& pts)
+{
+ const edgeList& eds = f.edges();
+
+ label longestEdgeI = -1;
+ scalar longestEdgeLength = -SMALL;
+
+ forAll(eds, edI)
+ {
+ scalar edgeLength = eds[edI].mag(pts);
+
+ if (edgeLength > longestEdgeLength)
+ {
+ longestEdgeI = edI;
+ longestEdgeLength = edgeLength;
+ }
+ }
+
+ return longestEdgeI;
+}
+
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index c481258a3cc..adedf991bd7 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -408,6 +408,12 @@ public:
};
+// Global functions
+
+//- Find the longest edge on a face. Face point labels index into pts.
+label longestEdge(const face& f, const pointField& pts);
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 70c2e7c558c..6ea1e748b05 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -42,32 +42,6 @@ defineTypeNameAndDebug(edgeCollapser, 0);
}
-Foam::label Foam::edgeCollapser::longestEdge
-(
- const face& f,
- const pointField& pts
-)
-{
- const edgeList& eds = f.edges();
-
- label longestEdgeI = -1;
- scalar longestEdgeLength = -SMALL;
-
- forAll(eds, edI)
- {
- scalar edgeLength = eds[edI].mag(pts);
-
- if (edgeLength > longestEdgeLength)
- {
- longestEdgeI = edI;
- longestEdgeLength = edgeLength;
- }
- }
-
- return longestEdgeI;
-}
-
-
Foam::HashSet<Foam::label> Foam::edgeCollapser::checkBadFaces
(
const polyMesh& mesh,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
index 2393458cf77..dab8bd298b0 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
@@ -262,9 +262,6 @@ public:
// Check
- //- Find the longest edge in a face
- static label longestEdge(const face& f, const pointField& pts);
-
//- Calls motionSmoother::checkMesh and returns a set of bad faces
static HashSet<label> checkBadFaces
(
--
GitLab