From 9fcdd5e04624793016c72bd3fa90b9fde90a6fc9 Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Tue, 28 Mar 2017 17:50:29 -0400
Subject: [PATCH 01/14] Wrote method Geometry.get_all_surface()

A method in the vein of `Geometry.get_all_cells()`
---
 openmc/geometry.py | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index 598aa43125..f271c9f716 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -257,7 +257,49 @@ class Geometry(object):
                     lattices[cell.fill.id] = cell.fill
 
         return lattices
+    
+    def get_all_surfaces(self):
+        """
+        Return all surfaces used in the geometry
 
+        Returns
+        -------
+        collections.OrderedDict
+            Dictionary mapping lattice IDs to :class:`openmc.Surface` instances
+
+        """
+        surfaces = OrderedDict()
+        
+        for cell in self.get_all_cells().values():
+            self.get_surfaces_from_region(surfaces, cell.region)
+        return surfaces
+    
+    def get_surfaces_from_region(self, surfaces, region):
+        """
+        Recursively find all the surfaces referenced by a region and return them
+        
+        Parameters
+        ----------
+        surfaces: collections.OrderedDict
+            Dictionary mapping lattice IDs to :class:`openmc.Surface` instances
+            
+        region: openmc.surface.Region
+            The region of space defined by Surfaces
+        Returns
+        -------
+        collections.OrderedDict
+            Dictionary mapping lattice IDs to :class:`openmc.Surface` instances
+
+        """
+        if isinstance(region, openmc.Halfspace):
+            s = region.surface
+            if s.id not in surfaces:
+                surfaces[s.id] = s
+        else:
+            for reg in region:
+                surfaces = self.get_surfaces_from_region(surfaces, reg)
+        return surfaces
+                
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):
         """Return a list of materials with matching names.
 

From 44d99935d1c7ce6d4a31644e6c2e9fafa15a68ff Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Tue, 28 Mar 2017 23:15:37 -0400
Subject: [PATCH 02/14] Made get_surfaces_from_region() private method

---
 openmc/geometry.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index f271c9f716..a16b958902 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -271,10 +271,10 @@ class Geometry(object):
         surfaces = OrderedDict()
         
         for cell in self.get_all_cells().values():
-            self.get_surfaces_from_region(surfaces, cell.region)
+            self._get_surfaces_from_region(surfaces, cell.region)
         return surfaces
     
-    def get_surfaces_from_region(self, surfaces, region):
+    def _get_surfaces_from_region(self, surfaces, region):
         """
         Recursively find all the surfaces referenced by a region and return them
         
@@ -297,7 +297,7 @@ class Geometry(object):
                 surfaces[s.id] = s
         else:
             for reg in region:
-                surfaces = self.get_surfaces_from_region(surfaces, reg)
+                surfaces = self._get_surfaces_from_region(surfaces, reg)
         return surfaces
                 
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):

From ce5e30b4985b16e81b7688d9dad9d2d892472e3e Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Tue, 28 Mar 2017 23:16:36 -0400
Subject: [PATCH 03/14] Changed "lattice" to "surface" in docstring

---
 openmc/geometry.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index a16b958902..d8e81611bc 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -281,14 +281,14 @@ class Geometry(object):
         Parameters
         ----------
         surfaces: collections.OrderedDict
-            Dictionary mapping lattice IDs to :class:`openmc.Surface` instances
+            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
             
         region: openmc.surface.Region
             The region of space defined by Surfaces
         Returns
         -------
         collections.OrderedDict
-            Dictionary mapping lattice IDs to :class:`openmc.Surface` instances
+            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
 
         """
         if isinstance(region, openmc.Halfspace):

From 73888b223d2999277607d1668d7c8525efadfcd6 Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Tue, 28 Mar 2017 23:18:54 -0400
Subject: [PATCH 04/14] Fixed get_all_surfaces() docstring too

---
 openmc/geometry.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index d8e81611bc..d682d7ee23 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -265,7 +265,7 @@ class Geometry(object):
         Returns
         -------
         collections.OrderedDict
-            Dictionary mapping lattice IDs to :class:`openmc.Surface` instances
+            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
 
         """
         surfaces = OrderedDict()

From a002e58ee893ba05bbba02ac42a22f655468a41e Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Wed, 29 Mar 2017 20:01:18 -0400
Subject: [PATCH 05/14] Addressed changes suggested by @paulromano

---
 openmc/geometry.py | 36 +++++++++---------------------------
 openmc/region.py   | 21 ++++++++++++++++++++-
 openmc/surface.py  | 22 +++++++++++++++++++++-
 3 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index d682d7ee23..a9b222d117 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -270,35 +270,17 @@ class Geometry(object):
         """
         surfaces = OrderedDict()
         
-        for cell in self.get_all_cells().values():
-            self._get_surfaces_from_region(surfaces, cell.region)
+        root_cells = self._root_universe.cells
+        for cell in root_cells.values():
+            reg = cell.region
+            surfaces = reg.get_surfaces_from_region(surfaces)
+            
+        #surfaces = self._root_universe.
+        #for cell in self.get_all_cells().values():
+        #    self.get_surfaces_from_region(surfaces, cell.region)
         return surfaces
     
-    def _get_surfaces_from_region(self, surfaces, region):
-        """
-        Recursively find all the surfaces referenced by a region and return them
-        
-        Parameters
-        ----------
-        surfaces: collections.OrderedDict
-            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
-            
-        region: openmc.surface.Region
-            The region of space defined by Surfaces
-        Returns
-        -------
-        collections.OrderedDict
-            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
-
-        """
-        if isinstance(region, openmc.Halfspace):
-            s = region.surface
-            if s.id not in surfaces:
-                surfaces[s.id] = s
-        else:
-            for reg in region:
-                surfaces = self._get_surfaces_from_region(surfaces, reg)
-        return surfaces
+    
                 
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):
         """Return a list of materials with matching names.
diff --git a/openmc/region.py b/openmc/region.py
index 4494a3f622..012faca75f 100644
--- a/openmc/region.py
+++ b/openmc/region.py
@@ -1,5 +1,5 @@
 from abc import ABCMeta, abstractmethod
-from collections import Iterable
+from collections import Iterable, OrderedDict
 
 from six import add_metaclass
 import numpy as np
@@ -46,6 +46,25 @@ class Region(object):
     def __ne__(self, other):
         return not self == other
 
+    def get_surfaces_from_region(self, surfaces = OrderedDict()):
+        """
+        Recursively find all the surfaces referenced by a region and return them
+
+        Parameters
+        ----------
+        surfaces: collections.OrderedDict, optional
+            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
+            
+        Returns
+        -------
+        surfaces: collections.OrderedDict
+            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
+
+        """
+        for region in self:
+            surfaces = region.get_surfaces_from_region(surfaces)
+        return surfaces
+
     @staticmethod
     def from_expression(expression, surfaces):
         """Generate a region given an infix expression.
diff --git a/openmc/surface.py b/openmc/surface.py
index 4f20c856c9..894f2f6a16 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -1,5 +1,5 @@
 from abc import ABCMeta
-from collections import Iterable
+from collections import Iterable, OrderedDict
 from numbers import Real, Integral
 from xml.etree import ElementTree as ET
 from math import sqrt
@@ -1880,6 +1880,26 @@ class Halfspace(Region):
     def __str__(self):
         return '-' + str(self.surface.id) if self.side == '-' \
             else str(self.surface.id)
+    
+    def get_surfaces_from_region(self, surfaces = OrderedDict()):
+        """
+        Returns the surface that this is a halfspace of.
+        Overwrites method Region.get_surfaces_from_region()
+    
+        Parameters
+        ----------
+        surfaces: collections.OrderedDict, optional
+            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
+    
+        Returns
+        -------
+        surfaces: collections.OrderedDict
+            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
+    
+        """
+        if self.surface.id not in surfaces:
+            surfaces[self.surface.id] = self.surface
+        return surfaces
 
 
 def get_rectangular_prism(width, height, axis='z', origin=(0., 0.),

From 2525c2a3f89e9a8fd49ca4212e12d263289b2570 Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Wed, 29 Mar 2017 20:05:26 -0400
Subject: [PATCH 06/14] Accounted for surfaces from a Complement().

---
 openmc/region.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/openmc/region.py b/openmc/region.py
index 012faca75f..ed1b727454 100644
--- a/openmc/region.py
+++ b/openmc/region.py
@@ -450,3 +450,23 @@ class Complement(Region):
         else:
             temp_region = ~self.node
         return temp_region.bounding_box
+
+    def get_surfaces_from_region(self, surfaces = OrderedDict()):
+        """
+        Recursively find all the surfaces referenced by the complement's node and return them
+        Overwrites method Region.get_surfaces_from_region()
+
+        Parameters
+        ----------
+        surfaces: collections.OrderedDict, optional
+            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
+
+        Returns
+        -------
+        surfaces: collections.OrderedDict
+            Dictionary mapping surface IDs to :class:`openmc.Surface` instances
+
+        """
+        for region in self.node:
+            surfaces = region.get_surfaces_from_region(surfaces)
+        return surfaces

From bff2f13f4c60a981db79d33be09dc1b984f69c2c Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Wed, 29 Mar 2017 20:07:44 -0400
Subject: [PATCH 07/14] Cleanup

---
 openmc/geometry.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index a9b222d117..8ef8161da4 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -274,13 +274,7 @@ class Geometry(object):
         for cell in root_cells.values():
             reg = cell.region
             surfaces = reg.get_surfaces_from_region(surfaces)
-            
-        #surfaces = self._root_universe.
-        #for cell in self.get_all_cells().values():
-        #    self.get_surfaces_from_region(surfaces, cell.region)
         return surfaces
-    
-    
                 
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):
         """Return a list of materials with matching names.

From 8a275bbd77688bacdd1e16700429b598f28504d3 Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Wed, 29 Mar 2017 20:12:24 -0400
Subject: [PATCH 08/14] Use Geometry.get_all_cells()

Geometry.get_all_cells() accounts for nested cells.
Geometry.root_universe.cells() doesn't.
---
 openmc/geometry.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index 8ef8161da4..4e61422049 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -270,10 +270,8 @@ class Geometry(object):
         """
         surfaces = OrderedDict()
         
-        root_cells = self._root_universe.cells
-        for cell in root_cells.values():
-            reg = cell.region
-            surfaces = reg.get_surfaces_from_region(surfaces)
+        for cell in self.get_all_cells().values():
+            surfaces = cell.region.get_surfaces_from_region(surfaces)
         return surfaces
                 
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):

From 30548c7c802381cd462c8f149bd005f0d88232ba Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Thu, 30 Mar 2017 13:34:51 -0400
Subject: [PATCH 09/14] Addressed comments by @wbinventor

---
 openmc/geometry.py |  2 +-
 openmc/region.py   | 15 +++++++++------
 openmc/surface.py  |  9 +++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index 4e61422049..ce7d47d9e2 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -271,7 +271,7 @@ class Geometry(object):
         surfaces = OrderedDict()
         
         for cell in self.get_all_cells().values():
-            surfaces = cell.region.get_surfaces_from_region(surfaces)
+            surfaces = cell.region.get_surfaces(surfaces)
         return surfaces
                 
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):
diff --git a/openmc/region.py b/openmc/region.py
index ed1b727454..9bf61becfd 100644
--- a/openmc/region.py
+++ b/openmc/region.py
@@ -46,7 +46,7 @@ class Region(object):
     def __ne__(self, other):
         return not self == other
 
-    def get_surfaces_from_region(self, surfaces = OrderedDict()):
+    def get_surfaces(self, surfaces=None):
         """
         Recursively find all the surfaces referenced by a region and return them
 
@@ -61,8 +61,10 @@ class Region(object):
             Dictionary mapping surface IDs to :class:`openmc.Surface` instances
 
         """
+        if not surfaces:
+            surfaces = OrderedDict()
         for region in self:
-            surfaces = region.get_surfaces_from_region(surfaces)
+            surfaces = region.get_surfaces(surfaces)
         return surfaces
 
     @staticmethod
@@ -451,10 +453,9 @@ class Complement(Region):
             temp_region = ~self.node
         return temp_region.bounding_box
 
-    def get_surfaces_from_region(self, surfaces = OrderedDict()):
+    def get_surfaces(self, surfaces=None):
         """
-        Recursively find all the surfaces referenced by the complement's node and return them
-        Overwrites method Region.get_surfaces_from_region()
+        Recursively find and return all the surfaces referenced by the node
 
         Parameters
         ----------
@@ -467,6 +468,8 @@ class Complement(Region):
             Dictionary mapping surface IDs to :class:`openmc.Surface` instances
 
         """
+        if not surfaces:
+            surfaces = OrderedDict()
         for region in self.node:
-            surfaces = region.get_surfaces_from_region(surfaces)
+            surfaces = region.get_surfaces(surfaces)
         return surfaces
diff --git a/openmc/surface.py b/openmc/surface.py
index 894f2f6a16..7c117124e8 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -1881,10 +1881,9 @@ class Halfspace(Region):
         return '-' + str(self.surface.id) if self.side == '-' \
             else str(self.surface.id)
     
-    def get_surfaces_from_region(self, surfaces = OrderedDict()):
+    def get_surfaces(self, surfaces=None):
         """
         Returns the surface that this is a halfspace of.
-        Overwrites method Region.get_surfaces_from_region()
     
         Parameters
         ----------
@@ -1897,8 +1896,10 @@ class Halfspace(Region):
             Dictionary mapping surface IDs to :class:`openmc.Surface` instances
     
         """
-        if self.surface.id not in surfaces:
-            surfaces[self.surface.id] = self.surface
+        if not surfaces:
+            surfaces = OrderedDict()
+        
+        surfaces[self.surface.id] = self.surface
         return surfaces
 
 

From fc23007dae7906991f6e71e4ca6c242437347d3b Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Thu, 30 Mar 2017 13:37:12 -0400
Subject: [PATCH 10/14] Changed `get_surfaces()` to `update_surface()`

As per @paulromano's suggestion, renamed the method of
the `Region` class that updates the surface dictionary.
---
 openmc/geometry.py | 2 +-
 openmc/region.py   | 8 ++++----
 openmc/surface.py  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index ce7d47d9e2..2ed030dc28 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -271,7 +271,7 @@ class Geometry(object):
         surfaces = OrderedDict()
         
         for cell in self.get_all_cells().values():
-            surfaces = cell.region.get_surfaces(surfaces)
+            surfaces = cell.region.update_surfaces(surfaces)
         return surfaces
                 
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):
diff --git a/openmc/region.py b/openmc/region.py
index 9bf61becfd..667cee5e04 100644
--- a/openmc/region.py
+++ b/openmc/region.py
@@ -46,7 +46,7 @@ class Region(object):
     def __ne__(self, other):
         return not self == other
 
-    def get_surfaces(self, surfaces=None):
+    def update_surfaces(self, surfaces=None):
         """
         Recursively find all the surfaces referenced by a region and return them
 
@@ -64,7 +64,7 @@ class Region(object):
         if not surfaces:
             surfaces = OrderedDict()
         for region in self:
-            surfaces = region.get_surfaces(surfaces)
+            surfaces = region.update_surfaces(surfaces)
         return surfaces
 
     @staticmethod
@@ -453,7 +453,7 @@ class Complement(Region):
             temp_region = ~self.node
         return temp_region.bounding_box
 
-    def get_surfaces(self, surfaces=None):
+    def update_surfaces(self, surfaces=None):
         """
         Recursively find and return all the surfaces referenced by the node
 
@@ -471,5 +471,5 @@ class Complement(Region):
         if not surfaces:
             surfaces = OrderedDict()
         for region in self.node:
-            surfaces = region.get_surfaces(surfaces)
+            surfaces = region.update_surfaces(surfaces)
         return surfaces
diff --git a/openmc/surface.py b/openmc/surface.py
index 7c117124e8..25ab4519fa 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -1881,7 +1881,7 @@ class Halfspace(Region):
         return '-' + str(self.surface.id) if self.side == '-' \
             else str(self.surface.id)
     
-    def get_surfaces(self, surfaces=None):
+    def update_surfaces(self, surfaces=None):
         """
         Returns the surface that this is a halfspace of.
     

From a01b87d6286b8f29c15cdaaffae2055253659abc Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Thu, 30 Mar 2017 14:03:17 -0400
Subject: [PATCH 11/14] Reverted rename of get_surfaces()

---
 openmc/geometry.py | 2 +-
 openmc/region.py   | 8 ++++----
 openmc/surface.py  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index ce7d47d9e2..2ed030dc28 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -271,7 +271,7 @@ class Geometry(object):
         surfaces = OrderedDict()
         
         for cell in self.get_all_cells().values():
-            surfaces = cell.region.get_surfaces(surfaces)
+            surfaces = cell.region.update_surfaces(surfaces)
         return surfaces
                 
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):
diff --git a/openmc/region.py b/openmc/region.py
index 9bf61becfd..667cee5e04 100644
--- a/openmc/region.py
+++ b/openmc/region.py
@@ -46,7 +46,7 @@ class Region(object):
     def __ne__(self, other):
         return not self == other
 
-    def get_surfaces(self, surfaces=None):
+    def update_surfaces(self, surfaces=None):
         """
         Recursively find all the surfaces referenced by a region and return them
 
@@ -64,7 +64,7 @@ class Region(object):
         if not surfaces:
             surfaces = OrderedDict()
         for region in self:
-            surfaces = region.get_surfaces(surfaces)
+            surfaces = region.update_surfaces(surfaces)
         return surfaces
 
     @staticmethod
@@ -453,7 +453,7 @@ class Complement(Region):
             temp_region = ~self.node
         return temp_region.bounding_box
 
-    def get_surfaces(self, surfaces=None):
+    def update_surfaces(self, surfaces=None):
         """
         Recursively find and return all the surfaces referenced by the node
 
@@ -471,5 +471,5 @@ class Complement(Region):
         if not surfaces:
             surfaces = OrderedDict()
         for region in self.node:
-            surfaces = region.get_surfaces(surfaces)
+            surfaces = region.update_surfaces(surfaces)
         return surfaces
diff --git a/openmc/surface.py b/openmc/surface.py
index 7c117124e8..25ab4519fa 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -1881,7 +1881,7 @@ class Halfspace(Region):
         return '-' + str(self.surface.id) if self.side == '-' \
             else str(self.surface.id)
     
-    def get_surfaces(self, surfaces=None):
+    def update_surfaces(self, surfaces=None):
         """
         Returns the surface that this is a halfspace of.
     

From 5cc6e6a6844bd83e491f5b12239ce0f7850e5a15 Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Thu, 30 Mar 2017 14:06:17 -0400
Subject: [PATCH 12/14] Changed `if` statement for `surfaces`

Corrected `if not surfaces` to `if surfaces is None`
---
 openmc/region.py  | 4 ++--
 openmc/surface.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openmc/region.py b/openmc/region.py
index 667cee5e04..9d821f93bb 100644
--- a/openmc/region.py
+++ b/openmc/region.py
@@ -61,7 +61,7 @@ class Region(object):
             Dictionary mapping surface IDs to :class:`openmc.Surface` instances
 
         """
-        if not surfaces:
+        if surfaces is None:
             surfaces = OrderedDict()
         for region in self:
             surfaces = region.update_surfaces(surfaces)
@@ -468,7 +468,7 @@ class Complement(Region):
             Dictionary mapping surface IDs to :class:`openmc.Surface` instances
 
         """
-        if not surfaces:
+        if surfaces is None:
             surfaces = OrderedDict()
         for region in self.node:
             surfaces = region.update_surfaces(surfaces)
diff --git a/openmc/surface.py b/openmc/surface.py
index 25ab4519fa..7cbd7befd3 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -1896,7 +1896,7 @@ class Halfspace(Region):
             Dictionary mapping surface IDs to :class:`openmc.Surface` instances
     
         """
-        if not surfaces:
+        if surfaces is None:
             surfaces = OrderedDict()
         
         surfaces[self.surface.id] = self.surface

From e4984311c3f425662703f1d7303a0dfcb93a3be8 Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Thu, 30 Mar 2017 14:08:38 -0400
Subject: [PATCH 13/14] Renamed `update_surfaces` back to `get_surfaces`

---
 openmc/geometry.py | 2 +-
 openmc/region.py   | 8 ++++----
 openmc/surface.py  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index 2ed030dc28..ce7d47d9e2 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -271,7 +271,7 @@ class Geometry(object):
         surfaces = OrderedDict()
         
         for cell in self.get_all_cells().values():
-            surfaces = cell.region.update_surfaces(surfaces)
+            surfaces = cell.region.get_surfaces(surfaces)
         return surfaces
                 
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):
diff --git a/openmc/region.py b/openmc/region.py
index 9d821f93bb..a2a92c15a3 100644
--- a/openmc/region.py
+++ b/openmc/region.py
@@ -46,7 +46,7 @@ class Region(object):
     def __ne__(self, other):
         return not self == other
 
-    def update_surfaces(self, surfaces=None):
+    def get_surfaces(self, surfaces=None):
         """
         Recursively find all the surfaces referenced by a region and return them
 
@@ -64,7 +64,7 @@ class Region(object):
         if surfaces is None:
             surfaces = OrderedDict()
         for region in self:
-            surfaces = region.update_surfaces(surfaces)
+            surfaces = region.get_surfaces(surfaces)
         return surfaces
 
     @staticmethod
@@ -453,7 +453,7 @@ class Complement(Region):
             temp_region = ~self.node
         return temp_region.bounding_box
 
-    def update_surfaces(self, surfaces=None):
+    def get_surfaces(self, surfaces=None):
         """
         Recursively find and return all the surfaces referenced by the node
 
@@ -471,5 +471,5 @@ class Complement(Region):
         if surfaces is None:
             surfaces = OrderedDict()
         for region in self.node:
-            surfaces = region.update_surfaces(surfaces)
+            surfaces = region.get_surfaces(surfaces)
         return surfaces
diff --git a/openmc/surface.py b/openmc/surface.py
index 7cbd7befd3..bd59b556c4 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -1881,7 +1881,7 @@ class Halfspace(Region):
         return '-' + str(self.surface.id) if self.side == '-' \
             else str(self.surface.id)
     
-    def update_surfaces(self, surfaces=None):
+    def get_surfaces(self, surfaces=None):
         """
         Returns the surface that this is a halfspace of.
     

From 781d0aa976fe0c536839b036f8175a7b107d3dc3 Mon Sep 17 00:00:00 2001
From: tjlaboss <travis@ktc-technology.com>
Date: Thu, 30 Mar 2017 14:10:15 -0400
Subject: [PATCH 14/14] Renamed  back to

---
 openmc/geometry.py | 2 +-
 openmc/region.py   | 8 ++++----
 openmc/surface.py  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index 2ed030dc28..ce7d47d9e2 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -271,7 +271,7 @@ class Geometry(object):
         surfaces = OrderedDict()
         
         for cell in self.get_all_cells().values():
-            surfaces = cell.region.update_surfaces(surfaces)
+            surfaces = cell.region.get_surfaces(surfaces)
         return surfaces
                 
     def get_materials_by_name(self, name, case_sensitive=False, matching=False):
diff --git a/openmc/region.py b/openmc/region.py
index 9d821f93bb..a2a92c15a3 100644
--- a/openmc/region.py
+++ b/openmc/region.py
@@ -46,7 +46,7 @@ class Region(object):
     def __ne__(self, other):
         return not self == other
 
-    def update_surfaces(self, surfaces=None):
+    def get_surfaces(self, surfaces=None):
         """
         Recursively find all the surfaces referenced by a region and return them
 
@@ -64,7 +64,7 @@ class Region(object):
         if surfaces is None:
             surfaces = OrderedDict()
         for region in self:
-            surfaces = region.update_surfaces(surfaces)
+            surfaces = region.get_surfaces(surfaces)
         return surfaces
 
     @staticmethod
@@ -453,7 +453,7 @@ class Complement(Region):
             temp_region = ~self.node
         return temp_region.bounding_box
 
-    def update_surfaces(self, surfaces=None):
+    def get_surfaces(self, surfaces=None):
         """
         Recursively find and return all the surfaces referenced by the node
 
@@ -471,5 +471,5 @@ class Complement(Region):
         if surfaces is None:
             surfaces = OrderedDict()
         for region in self.node:
-            surfaces = region.update_surfaces(surfaces)
+            surfaces = region.get_surfaces(surfaces)
         return surfaces
diff --git a/openmc/surface.py b/openmc/surface.py
index 7cbd7befd3..bd59b556c4 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -1881,7 +1881,7 @@ class Halfspace(Region):
         return '-' + str(self.surface.id) if self.side == '-' \
             else str(self.surface.id)
     
-    def update_surfaces(self, surfaces=None):
+    def get_surfaces(self, surfaces=None):
         """
         Returns the surface that this is a halfspace of.