From 0e5b1affdb7401902acfbbce2d1cd65b1b49ec91 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 12 Oct 2009 15:06:48 +0100
Subject: [PATCH] Removing the 'intrudes into owner/neighbour' data members.

---
 src/lagrangian/basic/Cloud/Cloud.C | 48 ------------------------------
 src/lagrangian/basic/Cloud/Cloud.H | 13 --------
 2 files changed, 61 deletions(-)

diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 7b069d5221..babfb33298 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -62,9 +62,6 @@ bool Foam::Cloud<ParticleType>::isConcaveCell(const label cellI) const
     const pointField& cCentres = pMesh().cellCentres();
     const pointField& points = pMesh().points();
 
-    PackedBoolList& intrudesIntoOwner = intrudesIntoOwnerPtr_();
-    PackedBoolList& intrudesIntoNeighbour = intrudesIntoNeighbourPtr_();
-
     const cell& cFaces = cells[cellI];
 
     bool concave = false;
@@ -130,14 +127,6 @@ bool Foam::Cloud<ParticleType>::isConcaveCell(const label cellI) const
                     if (d < 0)
                     {
                         // Concave face
-                        if (fOwner[f0I] == cellI)
-                        {
-                            intrudesIntoOwner[f0I] = 1;
-                        }
-                        else
-                        {
-                            intrudesIntoNeighbour[f0I] = 1;
-                        }
 
                         concave = true;
                     }
@@ -159,14 +148,6 @@ bool Foam::Cloud<ParticleType>::isConcaveCell(const label cellI) const
                 if ((fn0 & fn1) > planarCosAngle)
                 {
                     // Planar face
-                    if (fOwner[f0I] == cellI)
-                    {
-                        intrudesIntoOwner[f0I] = 1;
-                    }
-                    else
-                    {
-                        intrudesIntoNeighbour[f0I] = 1;
-                    }
 
                     concave = true;
                 }
@@ -186,9 +167,6 @@ void Foam::Cloud<ParticleType>::calcConcaveCells() const
     concaveCellPtr_.reset(new PackedBoolList(pMesh().nCells()));
     PackedBoolList& concaveCell = concaveCellPtr_();
 
-    intrudesIntoOwnerPtr_.reset(new PackedBoolList(pMesh().nFaces()));
-    intrudesIntoNeighbourPtr_.reset(new PackedBoolList(pMesh().nFaces()));
-
     forAll(cells, cellI)
     {
         // if (isConcaveCell(cellI))
@@ -272,8 +250,6 @@ template<class ParticleType>
 void Foam::Cloud<ParticleType>::clearOut()
 {
     concaveCellPtr_.clear();
-    intrudesIntoOwnerPtr_.clear();
-    intrudesIntoNeighbourPtr_.clear();
     labels_.clearStorage();
 }
 
@@ -293,30 +269,6 @@ const
 }
 
 
-template<class ParticleType>
-const Foam::PackedBoolList& Foam::Cloud<ParticleType>::intrudesIntoOwner()
-const
-{
-    if (!intrudesIntoOwnerPtr_.valid())
-    {
-        calcConcaveCells();
-    }
-    return intrudesIntoOwnerPtr_();
-}
-
-
-template<class ParticleType>
-const Foam::PackedBoolList& Foam::Cloud<ParticleType>::intrudesIntoNeighbour()
-const
-{
-    if (!intrudesIntoNeighbourPtr_.valid())
-    {
-        calcConcaveCells();
-    }
-    return intrudesIntoNeighbourPtr_();
-}
-
-
 template<class ParticleType>
 Foam::label Foam::Cloud<ParticleType>::getNewParticleID() const
 {
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index b151827d0a..e30204abd6 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -81,12 +81,6 @@ class Cloud
         //- Is the cell concave
         mutable autoPtr<PackedBoolList> concaveCellPtr_;
 
-        //- Does face intrude into owner cell
-        mutable autoPtr<PackedBoolList> intrudesIntoOwnerPtr_;
-
-        //- Does face intrude into neighbour cell
-        mutable autoPtr<PackedBoolList> intrudesIntoNeighbourPtr_;
-
         //- Overall count of particles ever created. Never decreases.
         mutable label particleCount_;
 
@@ -227,13 +221,6 @@ public:
             //- Whether each cell is concave (demand driven data)
             const PackedBoolList& concaveCell() const;
 
-            //- Per face whether it intrudes into the owner cell.(demand driven)
-            const PackedBoolList& intrudesIntoOwner() const;
-
-            //- Per face whether it intrudes into the neighbour cell. (demand
-            //  driven.
-            const PackedBoolList& intrudesIntoNeighbour() const;
-
 
             // Iterators