Changeset 838

Timestamp:

Feb 7, 2005, 3:12:40 PM (20 years ago)

Author:

duncan

Message:

pmesh/mesh - checking in speed-up changes I was half way thru

Location:

inundation/ga/storm_surge/pmesh

Files:

• mesh.py (modified) (1 diff)
• pmesh.py (modified) (2 diffs)

inundation/ga/storm_surge/pmesh/mesh.py

@@ -1306 +1306 @@
         #print [xmin, ymin, xmax, ymax]
      
+    def boxsizeVerts(self):
+        """
+        Returns a list of verts denoting a box or triangle that contains verts on the xmin, ymin, xmax and ymax axis.
+        Structure: list of verts 
+        """
+        # FIXME dsg!!! large is a hack
+        #You want the kinds package, part of Numeric:
+        #In [2]: import kinds
+        
+        #In [3]: kinds.default_float_kind.M
+        #kinds.default_float_kind.MAX         kinds.default_float_kind.MIN
+    #kinds.default_float_kind.MAX_10_EXP  kinds.default_float_kind.MIN_10_EXP
+        #kinds.default_float_kind.MAX_EXP     kinds.default_float_kind.MIN_EXP
+
+        #In [3]: kinds.default_float_kind.MIN
+        #Out[3]: 2.2250738585072014e-308
+
+        large = 1e100
+        xmin= large
+        xmax=-large
+        ymin= large
+        ymax=-large
+        for vertex in self.userVertices:
+            if vertex.x < xmin:
+                xmin = vertex.x
+                xminVert = vertex
+            if vertex.x > xmax:
+                xmax = vertex.x
+                xmaxVert = vertex
+                
+            if vertex.y < ymin:
+                ymin = vertex.y 
+                yminVert = vertex
+            if vertex.y > ymax:
+                ymax = vertex.y
+                ymaxVert = vertex
+        verts, count = self.removeDuplicatedVertices([xminVert,xmaxVert,yminVert,ymaxVert])
+         
+        return verts
+    
     def boxsize(self):
         """

inundation/ga/storm_surge/pmesh/pmesh.py

@@ -1118 +1118 @@
             self.clearMesh()
             self.mesh = newmesh
+
+            #FIXME - to speed things up, don't visualise the mesh
+            # use ResizeToFitWrapper
             self.visualiseMesh(self.mesh)
             self.ResizeToFit()
@@ -1130 +1133 @@
             showerror('File error',
                       'file ' + ofile + ' could not be found.')
+
         except RuntimeError: 
             showerror('File error',