From 209884d39b47a703b959295b3a99dfc293b53227 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 5 Jul 2018 10:58:34 +0200
Subject: [PATCH] STYLE: enforce dictionary read length for box/boxes entry

---
 .../sets/cellSources/boxToCell/boxToCell.C    | 19 ++++++++++++-------
 .../sets/faceSources/boxToFace/boxToFace.C    | 19 ++++++++++++-------
 .../sets/pointSources/boxToPoint/boxToPoint.C | 19 ++++++++++++-------
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
index 60a7b7436b..db3d7b1466 100644
--- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
+++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
@@ -85,13 +85,18 @@ Foam::boxToCell::boxToCell
 )
 :
     topoSetSource(mesh),
-    bbs_
-    (
-        dict.found("box")
-      ? treeBoundBoxList(1, treeBoundBox(dict.lookup("box")))
-      : dict.lookup("boxes")
-    )
-{}
+    bbs_()
+{
+    if (dict.found("box"))
+    {
+        bbs_.resize(1);
+        dict.read("box", bbs_.first());
+    }
+    else
+    {
+        dict.read("boxes", bbs_);
+    }
+}
 
 
 Foam::boxToCell::boxToCell
diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
index c15b2963ad..f9b276118f 100644
--- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
+++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
@@ -85,13 +85,18 @@ Foam::boxToFace::boxToFace
 )
 :
     topoSetSource(mesh),
-    bbs_
-    (
-        dict.found("box")
-      ? treeBoundBoxList(1, treeBoundBox(dict.lookup("box")))
-      : dict.lookup("boxes")
-    )
-{}
+    bbs_()
+{
+    if (dict.found("box"))
+    {
+        bbs_.resize(1);
+        dict.read("box", bbs_.first());
+    }
+    else
+    {
+        dict.read("boxes", bbs_);
+    }
+}
 
 
 Foam::boxToFace::boxToFace
diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
index 7f55b9eb07..25805bc61e 100644
--- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
+++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
@@ -84,13 +84,18 @@ Foam::boxToPoint::boxToPoint
 )
 :
     topoSetSource(mesh),
-    bbs_
-    (
-        dict.found("box")
-      ? treeBoundBoxList(1, treeBoundBox(dict.lookup("box")))
-      : dict.lookup("boxes")
-    )
-{}
+    bbs_()
+{
+    if (dict.found("box"))
+    {
+        bbs_.resize(1);
+        dict.read("box", bbs_.first());
+    }
+    else
+    {
+        dict.read("boxes", bbs_);
+    }
+}
 
 
 Foam::boxToPoint::boxToPoint