Merge branch 'fractures' of bitbucket.org:keilegavlen/gridding into f…

…ractures
fwforest · Mar 17, 2017 · 7510ecf · 7510ecf
2 parents 3fe94f9 + dee2df4
commit 7510ecf
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/grid_bucket.py b/grid_bucket.py
@@ -150,8 +150,16 @@ def add_node_prop(self, key, g=None, prop=None):
                 Should be either a list with the same length as g, or a single
                 item which is assigned to all nodes. Defaults to None.
 
+        Raises:
+            ValueError if the key is 'node_number', this is reserved for other
+                purposes. See self.assign_node_ordering() for details.
+
         """
 
+        # Check that the key is not 'node_number' - this is reserved
+        if key == 'node_number':
+            raise ValueError('Node number is a reserved key, stay away')
+
         # Do some checks of parameters first
         if g is None:
             assert prop is None or not isinstance(prop, list)