Changeset 6463

Timestamp:

Mar 5, 2009, 10:57:08 AM (14 years ago)

Author:

rwilson

Message:

Modified General_mesh.get_node(absolute=True) to return a copy if modifying the object node data.

Location:

branches/numpy/anuga/abstract_2d_finite_volumes

Files:

• general_mesh.py (modified) (3 diffs)
• test_general_mesh.py (modified) (1 diff)

branches/numpy/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ +1 @@
+import copy
 import numpy as num
 
@@ -252 +253 @@
         Default is False as many parts of ANUGA expects relative coordinates.
         (To see which, switch to default absolute=True and run tests).
+
+        Note: This method returns a modified _copy_ of the nodes slice if 
+              absolute is True.  If absolute is False, just return the slice.
+              This is related to the ensure_numeric() returning a copy problem.
         """
 
@@ -257 +262 @@
         if absolute is True:
             if not self.geo_reference.is_absolute():
+                # get a copy so as not to modify the internal self.nodes array
+                V = copy.copy(V)
                 V += num.array([self.geo_reference.get_xllcorner(),
                                 self.geo_reference.get_yllcorner()], num.float)

branches/numpy/anuga/abstract_2d_finite_volumes/test_general_mesh.py

@@ -311 +311 @@
         self.failUnless(num.alltrue(nodes_absolute[2] == node), msg)
        
-        # repeat get_node(absolute=True), see if result same
+        # repeat get_node(2, absolute=True), see if result same
         node = domain.get_node(2, absolute=True)     
         msg = ('\nnodes_absolute[2]=%s\nnode=%s'