From ee7a5233e77a6108a3babb2b939914e44b9d016b Mon Sep 17 00:00:00 2001
From: Pascal Beckstein <pascal@becksteins.de>
Date: Wed, 10 Feb 2016 18:15:52 +0100
Subject: [PATCH] Added ALL option for cellSource pointToCell of meshTools

---
 .../cellSources/pointToCell/pointToCell.C     | 62 +++++++++++++++++--
 .../cellSources/pointToCell/pointToCell.H     |  6 +-
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index 7c78a1db2..d522a722c 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -46,18 +46,21 @@ addToRunTimeSelectionTable(topoSetSource, pointToCell, istream);
 Foam::topoSetSource::addToUsageTable Foam::pointToCell::usage_
 (
     pointToCell::typeName,
-    "\n    Usage: pointToCell <pointSet> any\n\n"
-    "    Select all cells with any point in the pointSet\n\n"
+    "\n    Usage: pointToCell <pointSet> any|all\n\n"
+    "    Select cells with\n"
+    "    -any point in the pointSet\n"
+    "    -all points in the pointSet\n\n"
 );
 
 template<>
-const char* Foam::NamedEnum<Foam::pointToCell::pointAction, 1>::names[] =
+const char* Foam::NamedEnum<Foam::pointToCell::pointAction, 2>::names[] =
 {
-    "any"
+    "any",
+    "all"
 };
 
 
-const Foam::NamedEnum<Foam::pointToCell::pointAction, 1>
+const Foam::NamedEnum<Foam::pointToCell::pointAction, 2>
     Foam::pointToCell::pointActionNames_;
 
 
@@ -69,9 +72,9 @@ void Foam::pointToCell::combine(topoSet& set, const bool add) const
     pointSet loadedSet(mesh_, setName_);
 
 
-    // Handle any selection
     if (option_ == ANY)
     {
+        // Add cells with any point in loadedSet
         for
         (
             pointSet::const_iterator iter = loadedSet.begin();
@@ -89,6 +92,53 @@ void Foam::pointToCell::combine(topoSet& set, const bool add) const
             }
         }
     }
+    else if (option_ == ALL)
+    {
+        // Add all cells whose points are all in set.
+
+        Map<label> numPoints(loadedSet.size());
+
+        forAllConstIter(pointSet, loadedSet, iter)
+        {
+            label pointI = iter.key();
+
+            const labelList& pCells = mesh_.pointCells()[pointI];
+
+            forAll(pCells, pCellI)
+            {
+                label cellI = pCells[pCellI];
+
+                Map<label>::iterator fndCell = numPoints.find(cellI);
+
+                if (fndCell == numPoints.end())
+                {
+                    numPoints.insert(cellI, 1);
+                }
+                else
+                {
+                    fndCell()++;
+                }
+            }
+        }
+
+
+        // Include cells that are referenced as many times as there are points
+        // in cell -> all points of cell
+        for
+        (
+            Map<label>::const_iterator iter = numPoints.begin();
+            iter != numPoints.end();
+            ++iter
+        )
+        {
+            label cellI = iter.key();
+
+            if (iter() == mesh_.cellPoints()[cellI].size())
+            {
+                addOrDelete(set, cellI, add);
+            }
+        }
+    }
 }
 
 
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
index 0f7a168e4..7150f8337 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
@@ -55,8 +55,8 @@ public:
         //- Enumeration defining the valid options
         enum pointAction
         {
-            ANY     // Cells using any point in set
-            //ALL   // Possible extension: cells whose all points are in set
+            ANY,    // Cells using any point in set
+            ALL     // Cells whose all points are in set
         };
 
 private:
@@ -64,7 +64,7 @@ private:
         //- Add usage string
         static addToUsageTable usage_;
 
-        static const NamedEnum<pointAction, 1> pointActionNames_;
+        static const NamedEnum<pointAction, 2> pointActionNames_;
 
         //- Name of set to use
         word setName_;