From 34def356ec985fb4c02d1660f749e506e301a88d Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 10 Oct 2011 12:19:20 +0100
Subject: [PATCH] Bug fix for single-cell mesh

---
 .../primitiveMeshCheck/primitiveMeshCheck.C   | 79 ++++++++++---------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index f1c8d5fa5..7a9165984 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -1353,55 +1353,58 @@ bool Foam::primitiveMesh::checkUpperTriangular
             }
         }
 
-        nbr.sort();
-
-        // Now nbr holds the cellCells in incremental order. Check:
-        // - neighbouring cells appear only once. Since nbr is sorted this
-        //   is simple check on consecutive elements
-        // - faces indexed in same order as nbr are incrementing as well.
-
-        label prevCell = nbr[0];
-        label prevFace = curFaces[nbr.indices()[0]];
-
-        bool hasMultipleFaces = false;
-
-        for (label i = 1; i < nbr.size(); i++)
+        if (!nbr.empty())
         {
-            label thisCell = nbr[i];
-            label thisFace = curFaces[nbr.indices()[i]];
+            nbr.sort();
 
-            if (thisCell == labelMax)
+            // Now nbr holds the cellCells in incremental order. Check:
+            // - neighbouring cells appear only once. Since nbr is sorted this
+            //   is simple check on consecutive elements
+            // - faces indexed in same order as nbr are incrementing as well.
+
+            label prevCell = nbr[0];
+            label prevFace = curFaces[nbr.indices()[0]];
+
+            bool hasMultipleFaces = false;
+
+            for (label i = 1; i < nbr.size(); i++)
             {
-                break;
-            }
+                label thisCell = nbr[i];
+                label thisFace = curFaces[nbr.indices()[i]];
 
-            if (thisCell == prevCell)
-            {
-                hasMultipleFaces = true;
-
-                if (setPtr)
+                if (thisCell == labelMax)
                 {
-                    setPtr->insert(prevFace);
-                    setPtr->insert(thisFace);
+                    break;
                 }
-            }
-            else if (thisFace < prevFace)
-            {
-                error = true;
 
-                if (setPtr)
+                if (thisCell == prevCell)
                 {
-                    setPtr->insert(thisFace);
+                    hasMultipleFaces = true;
+
+                    if (setPtr)
+                    {
+                        setPtr->insert(prevFace);
+                        setPtr->insert(thisFace);
+                    }
                 }
+                else if (thisFace < prevFace)
+                {
+                    error = true;
+
+                    if (setPtr)
+                    {
+                        setPtr->insert(thisFace);
+                    }
+                }
+
+                prevCell = thisCell;
+                prevFace = thisFace;
             }
 
-            prevCell = thisCell;
-            prevFace = thisFace;
-        }
-
-        if (hasMultipleFaces)
-        {
-            nMultipleCells++;
+            if (hasMultipleFaces)
+            {
+                nMultipleCells++;
+            }
         }
     }