From f367ee2ece8c5d1d52d9740ec9ecbec665b35adb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 7 Dec 2010 08:58:31 +0100
Subject: [PATCH] ENH: add 'flip()' in-place method to edge, face, triFace

---
 applications/test/xfer/Test-xferList.C           | 16 ++++++++++++++--
 .../Optional/ccm26ToFoam/ccm26ToFoam.C           |  2 +-
 .../mesh/conversion/cfx4ToFoam/hexBlock.C        |  2 +-
 .../fluent3DMeshToFoam/fluent3DMeshToFoam.L      |  2 +-
 .../netgenNeutralToFoam/netgenNeutralToFoam.C    |  2 +-
 .../mesh/conversion/plot3dToFoam/hexBlock.C      |  2 +-
 .../conversion/star3ToFoam/createCoupleMatches.C |  4 ++--
 .../extrudeToRegionMesh/createShellMesh.C        |  2 +-
 .../manipulation/renumberMesh/renumberMesh.C     |  2 +-
 .../foamToTecplot360/tecplotWriter.C             |  4 ++--
 src/OpenFOAM/meshes/meshShapes/edge/edge.H       |  3 +++
 src/OpenFOAM/meshes/meshShapes/edge/edgeI.H      |  7 +++++++
 src/OpenFOAM/meshes/meshShapes/face/face.C       | 16 ++++++++++++++++
 src/OpenFOAM/meshes/meshShapes/face/face.H       |  4 ++++
 src/OpenFOAM/meshes/meshShapes/triFace/triFace.H |  4 ++++
 .../meshes/meshShapes/triFace/triFaceI.H         |  7 +++++++
 .../layerAdditionRemoval/removeCellLayer.C       |  2 +-
 .../layerAdditionRemoval/setLayerPairing.C       |  2 +-
 .../polyTopoChange/polyTopoChange/hexRef8.C      |  2 +-
 .../polyTopoChange/polyTopoChange.C              |  2 +-
 .../slidingInterface/decoupleSlidingInterface.C  |  4 ++--
 .../enrichedPatch/enrichedPatchCutFaces.C        |  3 +--
 src/sampling/cuttingPlane/cuttingPlane.C         |  2 +-
 23 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/applications/test/xfer/Test-xferList.C b/applications/test/xfer/Test-xferList.C
index 303d895109..112b17ad9b 100644
--- a/applications/test/xfer/Test-xferList.C
+++ b/applications/test/xfer/Test-xferList.C
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
     Info<< "xB[" << xB->size() << "]\n";
 
     DynamicList<label> dl(10);
-    for (label i = 0; i < 5; i++)
+    for (label i = 0; i < 5; ++i)
     {
         dl.append(i);
     }
@@ -111,11 +111,23 @@ int main(int argc, char *argv[])
     Info<< "f1: " << f1 << endl;
     Info<< "f2: " << f2 << endl;
 
+    // add some more labels
+    for (label i = 5; i < 8; ++i)
+    {
+        dl.append(i);
+    }
+
     // note: xfer() method returns a plain labelList
-    face f3( dl.xfer() );
+    face f3(dl.xfer());
     Info<< "dl[" << dl.size() << "/" << dl.capacity() << "] " << dl << endl;
     Info<< "f3: " << f3 << endl;
 
+    Info<<"\nflip faces:" << endl;
+    f1.flip();
+    f3.flip();
+    Info<< "f1: " << f1 << endl;
+    Info<< "f3: " << f3 << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index 1866e5e114..4110d71371 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -853,7 +853,7 @@ int main(int argc, char *argv[])
             {
                 foamOwner[faceI] = foamNeighbour[faceI];
                 foamNeighbour[faceI] = own;
-                foamFaces[faceI] = foamFaces[faceI].reverseFace();
+                foamFaces[faceI].flip();
             }
         }
 
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
index af8d8a3cc1..36be3eb8fa 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
@@ -375,7 +375,7 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
         // turn all faces inside out
         forAll(result, faceI)
         {
-            result[faceI] = result[faceI].reverseFace();
+            result[faceI].flip();
         }
     }
 
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 6f0f7c976d..236cb60a5e 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -867,7 +867,7 @@ int main(int argc, char *argv[])
             fm[facei] = true;
             if (!cubitFile)
             {
-                faces[facei] = faces[facei].reverseFace();
+                faces[facei].flip();
             }
             Swap(owner[facei], neighbour[facei]);
         }
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 1673ab9e80..17ee921ad5 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
                 if (((fc - cc) & fn) < 0)
                 {
                     // Boundary face points inwards. Flip.
-                    boundaryFaces[faceI] = boundaryFaces[faceI].reverseFace();
+                    boundaryFaces[faceI].flip();
                 }
 
                 // Done this face so erase from hash
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
index eef6299d30..d04094a28b 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
@@ -472,7 +472,7 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
         // turn all faces inside out
         forAll(result, faceI)
         {
-            result[faceI] = result[faceI].reverseFace();
+            result[faceI].flip();
         }
     }
 
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
index 63ec5b1da8..5555d007ca 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
@@ -1035,7 +1035,7 @@ void starMesh::createCoupleMatches()
 #                   ifdef DEBUG_RIGHT_HAND_WALK
                     Info<< "Turning edge for right-hand turn rule" << endl;
 #                   endif
-                    startEdge = startEdge.reverseEdge();
+                    startEdge.flip();
                 }
 
                 // prepare the loop for the right-hand walk
@@ -1348,7 +1348,7 @@ void starMesh::createCoupleMatches()
                 ) < VSMALL
             )
             {
-                intersectedFace = intersectedFace.reverseFace();
+                intersectedFace.flip();
             }
 
             // Add the new face to both master and slave
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C
index 4034428bfb..3dfa31ad0b 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C
@@ -414,7 +414,7 @@ void Foam::createShellMesh::setRefinement
             {
                 // Swap
                 Swap(minCellI, maxCellI);
-                newF = newF.reverseFace();
+                newF.flip();
             }
 
             //Pout<< "for internal edge:" << e
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 4c411fb150..17495b1d3f 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -295,7 +295,7 @@ autoPtr<mapPolyMesh> reorderMesh
 
         if (nei < own)
         {
-            newFaces[faceI] = newFaces[faceI].reverseFace();
+            newFaces[faceI].flip();
             Swap(newOwner[faceI], newNeighbour[faceI]);
         }
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
index b846953213..23548eceb6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
@@ -403,7 +403,7 @@ void Foam::tecplotWriter::writeConnectivity
         edge e = pp.edges()[edgeI];
         if (e[0] > e[1])
         {
-            e = e.reverseEdge();
+            e.flip();
         }
 
         FaceNodes[nodeI++] = INTEGER4(e[0]+1);
@@ -448,7 +448,7 @@ void Foam::tecplotWriter::writeConnectivity
             edge e = pp.edges()[edgeI];
             if (e[0] > e[1])
             {
-                e = e.reverseEdge();
+                e.flip();
             }
 
             const face& f0 = pp.localFaces()[eFaces[0]];
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edge.H b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
index f5dc17ff51..c393279cc1 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edge.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
@@ -103,6 +103,9 @@ public:
         //- Return common vertex
         inline label commonVertex(const edge& a) const;
 
+        //- Flip the edge in-place.
+        inline void flip();
+
         //- Return reverse edge
         inline edge reverseEdge() const;
 
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
index 5b51c71c4a..cc2ddc329e 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "IOstreams.H"
+#include "Swap.H"
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
@@ -135,6 +136,12 @@ inline Foam::label Foam::edge::commonVertex(const edge& a) const
 }
 
 
+inline void Foam::edge::flip()
+{
+    Swap(operator[](0), operator[](1));
+}
+
+
 inline Foam::edge Foam::edge::reverseEdge() const
 {
     return edge(end(), start());
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 8fbb2bd8d4..97c1abfd8b 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -27,11 +27,13 @@ License
 #include "triFace.H"
 #include "triPointRef.H"
 #include "mathematicalConstants.H"
+#include "Swap.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const char* const Foam::face::typeName = "face";
 
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 Foam::tmp<Foam::vectorField>
@@ -475,6 +477,20 @@ Foam::label Foam::face::collapse()
 }
 
 
+void Foam::face::flip()
+{
+    const label n = size();
+
+    if (n > 2)
+    {
+        for (label i=1; i < (n+1)/2; ++i)
+        {
+            Swap(operator[](i), operator[](n-i));
+        }
+    }
+}
+
+
 Foam::point Foam::face::centre(const pointField& meshPoints) const
 {
     // Calculate the centre by breaking the face into triangles and
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index c3aebfac3e..9ac1e8bdc9 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -173,6 +173,10 @@ public:
         //  return the collapsed size
         label collapse();
 
+        //- Flip the face in-place.
+        //  The starting points of the original and flipped face are identical.
+        void flip();
+
         //- Return the points corresponding to this face
         inline pointField points(const pointField& meshPoints) const;
 
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index a9878d714c..dd16c41068 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -98,6 +98,10 @@ public:
         //  return the collapsed size, set collapsed point labels to -1
         inline label collapse();
 
+        //- Flip the face in-place.
+        //  The starting points of the original and flipped face are identical.
+        inline void flip();
+
         //- Return the points corresponding to this face
         inline pointField points(const pointField& meshPoints) const;
 
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index bc196f94dc..e19319e3d0 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -26,6 +26,7 @@ License
 #include "IOstreams.H"
 #include "face.H"
 #include "triPointRef.H"
+#include "Swap.H"
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
@@ -118,6 +119,12 @@ inline Foam::label Foam::triFace::collapse()
 }
 
 
+inline void Foam::triFace::flip()
+{
+    Swap(operator[](1), operator[](2));
+}
+
+
 inline Foam::pointField Foam::triFace::points(const pointField& points) const
 {
     pointField p(3);
diff --git a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
index 9516bb95e0..1204a1967c 100644
--- a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
@@ -360,7 +360,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
 
         if (flipFace)
         {
-            newFace = newFace.reverseFace();
+            newFace.flip();
             zoneFlip = !zoneFlip;
         }
 
diff --git a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
index f401b66430..a5af000fa8 100644
--- a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
+++ b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
@@ -105,7 +105,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
         // Flip face based on flip index to recover original orientation
         if (mfFlip[faceI])
         {
-            curLocalFace = curLocalFace.reverseFace();
+            curLocalFace.flip();
         }
 
         // Get the opposing face from the master cell
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index 5370d79f73..0e7fe90313 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -1125,7 +1125,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
         {
             own = anchorCell1;
             nei = anchorCell0;
-            newFace = newFace.reverseFace();
+            newFace.flip();
 
             ownPt = mesh_.points()[anchors.otherVertex(anchorPointI)];
             neiPt = mesh_.points()[anchorPointI];
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index ccbe736f8d..2b3232b3d5 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -1078,7 +1078,7 @@ void Foam::polyTopoChange::compact
                          && faceNeighbour_[faceI] < faceOwner_[faceI]
                         )
                         {
-                            faces_[faceI] = faces_[faceI].reverseFace();
+                            faces_[faceI].flip();
                             Swap(faceOwner_[faceI], faceNeighbour_[faceI]);
                             flipFaceFlux_[faceI] =
                             (
diff --git a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
index 7531a2acfc..eed4804faf 100644
--- a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
@@ -89,7 +89,7 @@ void Foam::slidingInterface::decoupleInterface
 
         if (masterPatchFlip[faceI])
         {
-            newFace = newFace.reverseFace();
+            newFace.flip();
         }
 
         ref.setAction
@@ -141,7 +141,7 @@ void Foam::slidingInterface::decoupleInterface
 
         if (slavePatchFlip[faceI])
         {
-            newFace = newFace.reverseFace();
+            newFace.flip();
         }
 
         // Recover retired points on the slave side
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 85c11da33c..5744a7b379 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -519,8 +519,7 @@ void Foam::enrichedPatch::calcCutFaces() const
 
                                         // Reverse the face such that it
                                         // points out of the master patch
-                                        cf[cf.size() - 1] =
-                                            cf[cf.size() - 1].reverseFace();
+                                        cf[cf.size() - 1].flip();
 
                                         if (debug)
                                         {
diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/cuttingPlane/cuttingPlane.C
index f2ed510a55..459b89f52c 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.C
+++ b/src/sampling/cuttingPlane/cuttingPlane.C
@@ -315,7 +315,7 @@ void Foam::cuttingPlane::walkCellCuts
             // Orient face to point in the same direction as the plane normal
             if ((f.normal(cutPoints) & normal()) < 0)
             {
-                f = f.reverseFace();
+                f.flip();
             }
 
             // the cut faces are usually quite ugly, so optionally triangulate