Changeset 3129

Timestamp:

Jun 9, 2006, 1:26:51 PM (18 years ago)

Author:

ole

Message:

Addressed memory issue better

Location:

inundation

Files:

• coordinate_transforms/geo_reference.py (modified) (3 diffs)
• coordinate_transforms/test_geo_reference.py (modified) (1 diff)
• pyvolution/general_mesh.py (modified) (1 diff)

inundation/coordinate_transforms/geo_reference.py

@@ -7 +7 @@
 
 import types, sys
-from Numeric import array, Float, ArrayType, reshape
+from Numeric import array, Float, ArrayType, reshape, allclose
 from utilities.numerical_tools import ensure_numeric
 from utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError 
@@ -178 +178 @@
             
         return points
-    
+
+    
+    def is_absolute(self):
+        """Return True if xllcorner==yllcorner==0 indicating that points
+        in question are absolute.
+        """
+
+        return allclose([self.xllcorner, self.yllcorner], 0) 
+
+        
     
     def get_absolute(self, points):
@@ -186 +195 @@
         """
 
+        if self.is_absolute():
+            return points
+        
 
         is_list = False

inundation/coordinate_transforms/test_geo_reference.py

@@ -222 +222 @@
             self.failUnless(point[0]+x==new_point[0], ' failed')
             self.failUnless(point[1]+y==new_point[1], ' failed')
+                        
+    def test_is_absolute(self):
+        
+        g = Geo_reference(34,0,0)
+        points = [[3.0,34.0], [64.0,6.0]]
+
+        assert g.is_absolute()
+
+        g = Geo_reference(34,7,-6)
+        assert not g.is_absolute()        
+
                         
     def test___cmp__(self):

inundation/pyvolution/general_mesh.py

@@ -211 +211 @@
         V = self.vertex_coordinates
         if absolute is True:
-            V0 = self.geo_reference.get_absolute(V[:,0:2])
-            V1 = self.geo_reference.get_absolute(V[:,2:4])
-            V2 = self.geo_reference.get_absolute(V[:,4:6])
-
-            if not allclose(V0, V[:,0:2]):
-                # Only create new object if necessary (as it takes memory) 
+            if not self.geo_reference.is_absolute():
+            
+                V0 = self.geo_reference.get_absolute(V[:,0:2])
+                V1 = self.geo_reference.get_absolute(V[:,2:4])
+                V2 = self.geo_reference.get_absolute(V[:,4:6])
+
+                # This does double the memory need 
                 V = concatenate( (V0, V1, V2), axis=1 )
 
                 
         if obj is True:
-            #return concatenate( (V[:,0:2], V[:,2:4], V[:,4:6]), axis=0)
 
             N = V.shape[0]