diff --git a/src/mesh/blockMesh/curvedEdges/curvedEdge.H b/src/mesh/blockMesh/curvedEdges/curvedEdge.H index c891550cb3ede1ca8d49ff852d8c5099e6430d8d..49ad047e45a759603d41141e38ee6b010ccf9979 100644 --- a/src/mesh/blockMesh/curvedEdges/curvedEdge.H +++ b/src/mesh/blockMesh/curvedEdges/curvedEdge.H @@ -37,6 +37,7 @@ SourceFiles #ifndef curvedEdges_H #define curvedEdges_H +#include "edge.H" #include "pointField.H" #include "typeInfo.H" #include "HashTable.H" @@ -123,6 +124,12 @@ public: // - -1: same edge, but different orientation inline int compare(const curvedEdge&) const; + //- Compare the given start and end points with this curve + // - 0: different + // - +1: identical + // - -1: same edge, but different orientation + inline int compare(const edge&) const; + //- Compare the given start and end points with this curve // - 0: different // - +1: identical diff --git a/src/mesh/blockMesh/curvedEdges/curvedEdgeI.H b/src/mesh/blockMesh/curvedEdges/curvedEdgeI.H index 8a800bf613c7267e04415a66659c24488f47a788..6d3de4e554009922cc29918ad31a41d5369a3e62 100644 --- a/src/mesh/blockMesh/curvedEdges/curvedEdgeI.H +++ b/src/mesh/blockMesh/curvedEdges/curvedEdgeI.H @@ -38,13 +38,13 @@ inline Foam::label Foam::curvedEdge::end() const } -inline int Foam::curvedEdge::compare(const curvedEdge& ce) const +inline int Foam::curvedEdge::compare(const label start, const label end) const { - if (start_ == ce.start_ && end_ == ce.end_) + if (start_ == start && end_ == end) { return 1; } - else if (start_ == ce.end_ && end_ == ce.start_) + else if (start_ == end && end_ == start) { return -1; } @@ -55,20 +55,15 @@ inline int Foam::curvedEdge::compare(const curvedEdge& ce) const } -inline int Foam::curvedEdge::compare(const label start, const label end) const +inline int Foam::curvedEdge::compare(const curvedEdge& e) const { - if (start_ == start && end_ == end) - { - return 1; - } - else if (start_ == end && end_ == start) - { - return -1; - } - else - { - return 0; - } + return Foam::curvedEdge::compare(e.start(), e.end()); +} + + +inline int Foam::curvedEdge::compare(const edge& e) const +{ + return Foam::curvedEdge::compare(e.start(), e.end()); }