Changeset 3193 for inundation/pmesh/mesh.py

Timestamp:

Jun 21, 2006, 3:33:49 PM (18 years ago)

Author:

duncan

Message:

bug fixing

File:

• inundation/pmesh/mesh.py (modified) (7 diffs)

inundation/pmesh/mesh.py

@@ -31 +31 @@
 from geospatial_data.geospatial_data import Geospatial_data, ensure_geospatial
 
+try:  
+    import kinds  
+except ImportError:  
+    # Hand-built mockup of the things we need from the kinds package, since it  
+    # was recently removed from the standard Numeric distro.  Some users may  
+    # not have it by default.  
+    class _bunch:  
+        pass  
+         
+    class _kinds(_bunch):  
+        default_float_kind = _bunch()  
+        default_float_kind.MIN = 2.2250738585072014e-308  #smallest +ve number
+        default_float_kind.MAX = 1.7976931348623157e+308  
+     
+    kinds = _kinds()
+    
 SET_COLOUR='red'
 
@@ -225 +241 @@
     
     def setMaxArea(self,MaxArea):
-        if self.isMaxArea(): 
-            self.attributes[self.MAXAREA] = float(MaxArea)
-        else:
-            self.attributes.append( float(MaxArea) )
+        if MaxArea is not None:
+            if self.isMaxArea(): 
+                self.attributes[self.MAXAREA] = float(MaxArea)
+            else:
+                self.attributes.append( float(MaxArea) )
     
     def deleteMaxArea(self):
@@ -940 +957 @@
         
     def generate_mesh(self,
-                      maximum_triangle_area=None,
+                      maximum_triangle_area="",
                       minimum_triangle_angle=28.0,
-                      verbose=False):
+                      verbose=True):
         if verbose is True:
             silent = ''
@@ -990 +1007 @@
         if maxArea != None:
             self.mode += 'a' + str(maxArea)
-        #FIXME (DSG-DSG) This isn't explained.  I don't think it works
-        # well with  maxArea = None as well.
+        #FIXME (DSG-DSG) This isn't explained. 
         if isRegionalMaxAreas:
             self.mode += 'a'
-         
+        #print "mesh#generateMesh# self.mode",self.mode  
         meshDict = self.Mesh2triangList()
         #print "*************************!@!@ This is going to triangle   !@!@"
@@ -1783 +1799 @@
         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
+       
+        large = kinds.default_float_kind.MAX
         xmin= large
         xmax=-large
@@ -1827 +1832 @@
         Structure: [xmin, ymin, xmax, ymax] 
         """
-        # 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_fltesting oat_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
+      
+        large = kinds.default_float_kind.MAX
         xmin= large
         xmax=-large
@@ -1862 +1856 @@
         Structure: [xmin, ymin, xmax, ymax] 
         """
-        # FIXME dsg!!! large is a hacktesting 
-        #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
+       
+        large = kinds.default_float_kind.MAX
         min= large
         max=-large