Changeset 3128

Timestamp:

Jun 9, 2006, 12:34:16 PM (19 years ago)

Author:

ole

Message:

Fixed potential for excessive memory use

Location:

inundation/pyvolution

Files:

• general_mesh.py (modified) (2 diffs)
• neighbour_mesh.py (modified) (1 diff)

inundation/pyvolution/general_mesh.py

@@ -1 +1 @@
 
-from Numeric import concatenate, reshape, take
+from Numeric import concatenate, reshape, take, allclose
 from Numeric import array, zeros, Int, Float, sqrt, sum
 
@@ -213 +213 @@
             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])            
-            
-            V = concatenate( (V0, V1, V2), axis=1 )
-
-
+            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) 
+                V = concatenate( (V0, V1, V2), axis=1 )
+
+                
         if obj is True:
             #return concatenate( (V[:,0:2], V[:,2:4], V[:,4:6]), axis=0)

inundation/pyvolution/neighbour_mesh.py

@@ -449 +449 @@
 
 
-        # Assemble dictionary of boundary segments and choose starting point 
+        # Assemble dictionary of boundary segments and choose starting point
         segments = {}
         inverse_segments = {}
+        p0 = None
         mindist = sqrt(sum((pmax-pmin)**2)) #Start value across entire mesh
         for i, edge_id in self.boundary.keys():