From f9ec26bada1af88de1dc098b6675ac6c8f36569a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 7 Nov 2008 22:01:23 +0100
Subject: [PATCH] use triFace when triangulating surfaces

---
 .../fileFormats/ac3d/AC3DfileFormat.C         | 12 +++---
 .../fileFormats/gts/GTSfileFormat.C           | 15 +++----
 .../fileFormats/nas/NASfileFormat.C           | 15 +++----
 .../fileFormats/obj/OBJfileFormat.C           | 39 ++++++++++---------
 .../fileFormats/obj/OBJfileFormat.H           |  6 +--
 .../fileFormats/off/OFFfileFormat.C           | 11 +++---
 .../fileFormats/off/OFFfileFormat.H           |  2 +-
 .../fileFormats/stl/STLfileFormat.C           | 13 ++++---
 .../fileFormats/stl/STLfileFormatASCII.L      |  8 ++--
 .../fileFormats/tri/TRIfileFormat.C           |  8 ++--
 .../keyedSurface/keyedSurfaceCleanup.C        |  4 +-
 .../meshedSurface/meshedSurfaceCleanup.C      |  3 +-
 src/surfMesh/surfGroup/surfGroup.C            |  4 +-
 src/surfMesh/surfGroup/surfGroup.H            |  6 +--
 14 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.C
index 2fd4b9e3ca..c3e39b765d 100644
--- a/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.C
+++ b/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.C
@@ -25,10 +25,12 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "AC3DfileFormat.H"
+#include "triFace.H"
 #include "clock.H"
 #include "IFstream.H"
 #include "IStringStream.H"
 #include "tensor.H"
+#include "triFace.H"
 #include "primitivePatch.H"
 #include "addToRunTimeSelectionTable.H"
 #include "addToMemberFunctionSelectionTable.H"
@@ -231,9 +233,9 @@ Foam::fileFormats::AC3DfileFormat::AC3DfileFormat
     // Start of vertices for object/patch
     label patchVertOffset = 0;
 
-    DynamicList<point> pointLst;
-    DynamicList<face>  faceLst;
-    DynamicList<label> regionLst;
+    DynamicList<point>    pointLst;
+    DynamicList<FaceType> faceLst;
+    DynamicList<label>    regionLst;
 
     // patchId => patchName
     Map<word> regionNames;
@@ -349,7 +351,7 @@ Foam::fileFormats::AC3DfileFormat::AC3DfileFormat
 
                     if (triangulate && verts.size() > 3)
                     {
-                        face fTri(3);
+                        triFace fTri;
 
                         // simple face triangulation about f[0].
                         // cannot use face::triangulation
@@ -535,7 +537,7 @@ void Foam::fileFormats::AC3DfileFormat::write
 )
 {
     const pointField& pointLst = surf.points();
-    const List<face>& faceLst = surf.faces();
+    const List<FaceType>& faceLst = surf.faces();
     const List<surfGroup>& patchLst = surf.patches();
 
     writeHeader(os, patchLst);
diff --git a/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.C
index f923d5e137..07d0453872 100644
--- a/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.C
+++ b/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.C
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "GTSfileFormat.H"
+#include "triFace.H"
 #include "clock.H"
 #include "IFstream.H"
 #include "IStringStream.H"
@@ -115,7 +116,7 @@ Foam::fileFormats::GTSfileFormat::GTSfileFormat
 
     // write directly into the lists:
     pointField& pointLst = points();
-    List<face>& faceLst = faces();
+    List<FaceType>& faceLst = faces();
     List<label>& regionLst = regions();
 
     pointLst.setSize(nPoints);
@@ -239,13 +240,7 @@ Foam::fileFormats::GTSfileFormat::GTSfileFormat
                 << exit(FatalError);
         }
 
-        face& fTri = faceLst[faceI];
-        fTri.setSize(3);
-
-        fTri[0] = e0Far;
-        fTri[1] = common01;
-        fTri[2] = e1Far;
-
+        faceLst[faceI] = triFace(e0Far, common01, e1Far);
         regionLst[faceI] = regionI;
     }
 
@@ -263,7 +258,7 @@ void Foam::fileFormats::GTSfileFormat::write
 )
 {
     const pointField& pointLst = surf.points();
-    const List<face>& faceLst  = surf.faces();
+    const List<FaceType>& faceLst  = surf.faces();
 
     // It is too annoying to triangulate on-the-fly
     // just issue a warning and get out
@@ -356,7 +351,7 @@ void Foam::fileFormats::GTSfileFormat::write
 )
 {
     const pointField& pointLst = surf.points();
-    const List<face>& faceLst  = surf.faces();
+    const List<FaceType>& faceLst  = surf.faces();
     const List<surfGroup>& patchLst = surf.patches();
 
     // It is too annoying to triangulate on-the-fly
diff --git a/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.C
index 1c68306e7c..a72ef6c219 100644
--- a/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.C
+++ b/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.C
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "NASfileFormat.H"
+#include "triFace.H"
 #include "clock.H"
 #include "IFstream.H"
 #include "IStringStream.H"
@@ -128,12 +129,12 @@ Foam::fileFormats::NASfileFormat::NASfileFormat
             << exit(FatalError);
     }
 
-    DynamicList<point> pointLst;
+    DynamicList<point>    pointLst;
     // Nastran index of points
-    DynamicList<label> pointId;
-    DynamicList<face>  faceLst;
-    DynamicList<label> regionLst;
-    HashTable<label>   groupToPatch;
+    DynamicList<label>    pointId;
+    DynamicList<FaceType> faceLst;
+    DynamicList<label>    regionLst;
+    HashTable<label>      groupToPatch;
 
     // From face groupId to patchId
     Map<label> groupIdToPatchId;
@@ -265,7 +266,7 @@ Foam::fileFormats::NASfileFormat::NASfileFormat
 
         if (cmd == "CTRIA3")
         {
-            face fTri(3);
+            triFace fTri;
 
             label groupId = readLabel(IStringStream(line.substr(16,8))());
             fTri[0] = readLabel(IStringStream(line.substr(24,8))());
@@ -317,7 +318,7 @@ Foam::fileFormats::NASfileFormat::NASfileFormat
 
             if (triangulate)
             {
-                face fTri(3);
+                triFace fTri;
 
                 // simple face triangulation about f[0].
                 // cannot use face::triangulation since points are incomplete
diff --git a/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.C
index 5bca9793d4..8677ad7fe9 100644
--- a/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.C
+++ b/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.C
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "OBJfileFormat.H"
+#include "triFace.H"
 #include "clock.H"
 #include "IFstream.H"
 #include "IStringStream.H"
@@ -72,7 +73,7 @@ void Foam::fileFormats::OBJfileFormat::writeHead
 (
     Ostream& os,
     const pointField& pointLst,
-    const List<face>& faceLst,
+    const List<FaceType>& faceLst,
     const List<surfGroup>& patchLst
 )
 {
@@ -136,10 +137,10 @@ Foam::fileFormats::OBJfileFormat::OBJfileFormat
             << exit(FatalError);
     }
 
-    DynamicList<point> pointLst;
-    DynamicList<face>  faceLst;
-    DynamicList<label> regionLst;
-    HashTable<label>   groupToPatch;
+    DynamicList<point>    pointLst;
+    DynamicList<FaceType> faceLst;
+    DynamicList<label>    regionLst;
+    HashTable<label>      groupToPatch;
 
     // leave faces that didn't have a group in 0
     label groupID = 0;
@@ -193,7 +194,7 @@ Foam::fileFormats::OBJfileFormat::OBJfileFormat
         }
         else if (cmd == "f")
         {
-            DynamicList<label> verts;
+            DynamicList<label> dynVertices;
 
             // Assume 'f' is followed by space.
             string::size_type endNum = 1;
@@ -235,23 +236,25 @@ Foam::fileFormats::OBJfileFormat::OBJfileFormat
 
                     intStream >> vertI;
                 }
-                verts.append(vertI - 1);
+                dynVertices.append(vertI - 1);
             }
-            verts.shrink();
+            dynVertices.shrink();
 
-            if (triangulate && verts.size() > 3)
+            FaceType f(SubList<label>(dynVertices, dynVertices.size()));
+
+            if (triangulate && f.size() > 3)
             {
-                face fTri(3);
+                triFace fTri;
 
                 // simple face triangulation about f[0].
                 // Cannot use face::triangulation since points are incomplete
-                fTri[0] = verts[0];
-                for (label fp1 = 1; fp1 < verts.size() - 1; fp1++)
+                fTri[0] = f[0];
+                for (label fp1 = 1; fp1 < f.size() - 1; fp1++)
                 {
-                    label fp2 = (fp1 + 1) % verts.size();
+                    label fp2 = (fp1 + 1) % f.size();
 
-                    fTri[1] = verts[fp1];
-                    fTri[2] = verts[fp2];
+                    fTri[1] = f[fp1];
+                    fTri[2] = f[fp2];
 
                     faceLst.append(fTri);
                     regionLst.append(groupID);
@@ -259,7 +262,7 @@ Foam::fileFormats::OBJfileFormat::OBJfileFormat
             }
             else
             {
-                faceLst.append(face(verts));
+                faceLst.append(f);
                 regionLst.append(groupID);
             }
         }
@@ -282,7 +285,7 @@ void Foam::fileFormats::OBJfileFormat::write
     const keyedSurface& surf
 )
 {
-    const List<face>& faceLst = surf.faces();
+    const List<FaceType>& faceLst = surf.faces();
 
     labelList faceMap;
     List<surfGroup> patchLst = surf.sortedRegions(faceMap);
@@ -320,7 +323,7 @@ void Foam::fileFormats::OBJfileFormat::write
     const meshedSurface& surf
 )
 {
-    const List<face>& faceLst = surf.faces();
+    const List<FaceType>& faceLst = surf.faces();
     const List<surfGroup>& patchLst = surf.patches();
 
     writeHead(os, surf.points(), faceLst, patchLst);
diff --git a/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.H
index 2637a10712..d26700675f 100644
--- a/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.H
+++ b/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.H
@@ -69,9 +69,9 @@ class OBJfileFormat
 
         static void writeHead
         (
-            Ostream&, 
-            const pointField&, 
-            const List<face>&,
+            Ostream&,
+            const pointField&,
+            const List<FaceType>&,
             const List<surfGroup>&
         );
 
diff --git a/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.C
index 200c85eef3..ad78187fb1 100644
--- a/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.C
+++ b/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.C
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "OFFfileFormat.H"
+#include "triFace.H"
 #include "clock.H"
 #include "IFstream.H"
 #include "IStringStream.H"
@@ -72,7 +73,7 @@ void Foam::fileFormats::OFFfileFormat::writeHead
 (
     Ostream& os,
     const pointField& pointLst,
-    const List<face>& faceLst,
+    const List<FaceType>& faceLst,
     const List<surfGroup>& patchLst
 )
 {
@@ -178,7 +179,7 @@ Foam::fileFormats::OFFfileFormat::OFFfileFormat
 
     // Read faces - ignore optional region information
     // use a DynamicList for possible on-the-fly triangulation
-    DynamicList<face>  faceLst(nElems);
+    DynamicList<FaceType>  faceLst(nElems);
 
     forAll(faceLst, faceI)
     {
@@ -198,7 +199,7 @@ Foam::fileFormats::OFFfileFormat::OFFfileFormat
 
             if (triangulate && f.size() > 3)
             {
-                face fTri(3);
+                triFace fTri;
 
                 // simple face triangulation about f[0].
                 // cannot use face::triangulation since points are incomplete
@@ -241,7 +242,7 @@ void Foam::fileFormats::OFFfileFormat::write
     const keyedSurface& surf
 )
 {
-    const List<face>& faceLst = surf.faces();
+    const List<FaceType>& faceLst = surf.faces();
 
     labelList faceMap;
     List<surfGroup> patchLst = surf.sortedRegions(faceMap);
@@ -278,7 +279,7 @@ void Foam::fileFormats::OFFfileFormat::write
     const meshedSurface& surf
 )
 {
-    const List<face>& faceLst = surf.faces();
+    const List<FaceType>& faceLst = surf.faces();
     const List<surfGroup>& patchLst = surf.patches();
 
     writeHead(os, surf.points(), faceLst, patchLst);
diff --git a/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.H
index a4ac6c3e9d..dbdac17291 100644
--- a/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.H
+++ b/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.H
@@ -78,7 +78,7 @@ class OFFfileFormat
         (
             Ostream&, 
             const pointField&, 
-            const List<face>&,
+            const List<FaceType>&,
             const List<surfGroup>&
         );
 
diff --git a/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.C
index 741b2c46c8..c48e47addc 100644
--- a/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.C
+++ b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.C
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "STLfileFormat.H"
+#include "triFace.H"
 #include "clock.H"
 #include "OSspecific.H"
 #include "addToRunTimeSelectionTable.H"
@@ -216,9 +217,7 @@ bool Foam::fileFormats::STLfileFormat::readBINARY
     label pointI = 0;
     forAll(faceLst, faceI)
     {
-        face& fTri = faceLst[faceI];
-        fTri.setSize(3);
-
+        triFace fTri;
 
         // Read an STL triangle
         STLtriangle stlTri(is);
@@ -235,14 +234,16 @@ bool Foam::fileFormats::STLfileFormat::readBINARY
         pointLst[pointI] = stlTri.c();
         fTri[2] = pointI++;
 
+        faceLst[faceI] = fTri;
+
+        // interprete colour as a region
+        regionLst[faceI] = stlTri.region();
+
         if (maxRegionId < stlTri.region())
         {
             maxRegionId = stlTri.region();
         }
 
-        // interprete colour as a region
-        regionLst[faceI] = stlTri.region();
-
 #ifdef DEBUG_STLBINARY
         if
         (
diff --git a/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormatASCII.L b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormatASCII.L
index b339364dd5..76472df3c4 100644
--- a/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormatASCII.L
+++ b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormatASCII.L
@@ -33,6 +33,7 @@ License
  \* ------------------------------------------------------------------------ */
 
 #include "STLfileFormat.H"
+#include "triFace.H"
 
 using namespace Foam;
 
@@ -395,18 +396,19 @@ Foam::fileFormats::STLfileFormat::readASCII
     regions().transfer(lexer.facets());
 
     // make our triangles directly
-    List<face>& faceLst = faces();
+    List<FaceType>& faceLst = faces();
     faceLst.setSize(regions().size());
 
     label ptI = 0;
     forAll(faceLst, faceI)
     {
-        face& fTri = faceLst[faceI];
-        fTri.setSize(3);
+        triFace fTri;
 
         fTri[0] = ptI++;
         fTri[1] = ptI++;
         fTri[2] = ptI++;
+
+        faceLst[faceI] = fTri;
     }
 
     setPatches(lexer.groupToPatch());
diff --git a/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.C
index 88b05f2c12..52e148bb3b 100644
--- a/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.C
+++ b/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.C
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "TRIfileFormat.H"
+#include "triFace.H"
 #include "clock.H"
 #include "IFstream.H"
 #include "IOmanip.H"
@@ -214,18 +215,19 @@ Foam::fileFormats::TRIfileFormat::TRIfileFormat
     regions().transfer(regionLst);
 
     // make our triangles directly
-    List<face>& faceLst = faces();
+    List<FaceType>& faceLst = faces();
     faceLst.setSize(regions().size());
 
     label ptI = 0;
     forAll(faceLst, faceI)
     {
-        face& fTri = faceLst[faceI];
-        fTri.setSize(3);
+        triFace fTri;
 
         fTri[0] = ptI++;
         fTri[1] = ptI++;
         fTri[2] = ptI++;
+
+        faceLst[faceI] = fTri;
     }
 
     setPatches(groupToPatch);
diff --git a/src/surfMesh/keyedSurface/keyedSurfaceCleanup.C b/src/surfMesh/keyedSurface/keyedSurfaceCleanup.C
index 5390d3d168..2edc6c7fd0 100644
--- a/src/surfMesh/keyedSurface/keyedSurfaceCleanup.C
+++ b/src/surfMesh/keyedSurface/keyedSurfaceCleanup.C
@@ -26,6 +26,7 @@ License
 
 #include "keyedSurface.H"
 #include "mergePoints.H"
+#include "triFace.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -259,8 +260,7 @@ Foam::label Foam::keyedSurface::triangulate()
     forAll (faceLst, faceI)
     {
         const FaceType& f = faceLst[faceI];
-
-        FaceType fTri(3);
+        triFace fTri;
 
         // Do simple face triangulation around f[0].
         // we could also use face::triangulation
diff --git a/src/surfMesh/meshedSurface/meshedSurfaceCleanup.C b/src/surfMesh/meshedSurface/meshedSurfaceCleanup.C
index 23e6af08c4..eedbbe7f71 100644
--- a/src/surfMesh/meshedSurface/meshedSurfaceCleanup.C
+++ b/src/surfMesh/meshedSurface/meshedSurfaceCleanup.C
@@ -26,6 +26,7 @@ License
 
 #include "meshedSurface.H"
 #include "mergePoints.H"
+#include "triFace.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -296,7 +297,7 @@ Foam::label Foam::meshedSurface::triangulate()
         for (; oldFaceI < patchEnd; ++oldFaceI)
         {
             const FaceType& f = faceLst[oldFaceI];
-            FaceType fTri(3);
+            triFace fTri;
 
             // Do simple face triangulation around f[0].
             // we could also use face::triangulation
diff --git a/src/surfMesh/surfGroup/surfGroup.C b/src/surfMesh/surfGroup/surfGroup.C
index 798d72b6a4..253be8d071 100644
--- a/src/surfMesh/surfGroup/surfGroup.C
+++ b/src/surfMesh/surfGroup/surfGroup.C
@@ -88,7 +88,7 @@ Foam::surfGroup::surfGroup
 {}
 
 
-Foam::surfGroup::surfGroup(const Foam::surfGroup& p)
+Foam::surfGroup::surfGroup(const surfGroup& p)
 :
     surfPatchIdentifier(p, p.index()),
     size_(p.size()),
@@ -96,7 +96,7 @@ Foam::surfGroup::surfGroup(const Foam::surfGroup& p)
 {}
 
 
-Foam::surfGroup::surfGroup(const Foam::surfGroup& p, const label index)
+Foam::surfGroup::surfGroup(const surfGroup& p, const label index)
 :
     surfPatchIdentifier(p, index),
     size_(p.size()),
diff --git a/src/surfMesh/surfGroup/surfGroup.H b/src/surfMesh/surfGroup/surfGroup.H
index f0183d839e..24059534eb 100644
--- a/src/surfMesh/surfGroup/surfGroup.H
+++ b/src/surfMesh/surfGroup/surfGroup.H
@@ -107,11 +107,7 @@ public:
         surfGroup(const surfGroup&);
 
         //- Construct from another patch, resetting the index
-        surfGroup
-        (
-            const surfGroup&,
-            const label index
-        );
+        surfGroup(const surfGroup&, const label index);
 
         //- Return clone
         autoPtr<surfGroup> clone() const