Changeset 2282

Timestamp:

Jan 25, 2006, 2:42:47 PM (19 years ago)

Author:

duncan

Message:

making imports more robust

Location:

inundation/pmesh

Files:

• mesh_interface.py (modified) (1 diff)
• test_mesh.py (modified) (1 diff)
• test_mesh_interface.py (modified) (2 diffs)

inundation/pmesh/mesh_interface.py

@@ -5 +5 @@
 
 from coordinate_transforms.geo_reference import Geo_reference
-from pmesh.mesh import Mesh
+# This is due to pmesh not having a class mesh and
+# the current dir being unknown 
+try:
+    from pmesh.mesh import Mesh
+except ImportError:  
+    from mesh import Mesh
 from coordinate_transforms.redfearn import redfearn
 from utilities.polygon import populate_polygon

inundation/pmesh/test_mesh.py

@@ -3 +3 @@
 import tempfile
 import unittest
+
+try:
+    from pmesh.mesh import *
+except ImportError:  
+    from mesh import *
+    
 from mesh import *
 from load_mesh.loadASCII import *

inundation/pmesh/test_mesh_interface.py

@@ -28 +28 @@
         polygon = geo_ref_poly.change_points_geo_ref(polygon_absolute)
 
-        boundary_tags = {'walls':[0,1,2,3]}
+        boundary_tags = {'walls':[0,1],'bom':[2]}
         
         inner1_polygon_absolute = [[10,10],[20,10],[20,20],[10,20]]
@@ -42 +42 @@
                                      boundary_tags,
                                      10000000,
-                                     filename="test_eagle.tsh",
                                      interior_regions=interior_regions,
                                      poly_geo_reference=geo_ref_poly)
+
+        # Test the mesh instance
+        
+        self.failUnless(len(m.regions)==3,
+                        'FAILED!')
+        segs = m.getUserSegments()
+        self.failUnless(len(segs)==12,
+                        'FAILED!')
+        self.failUnless(len(m.userVertices)==12,
+                        'FAILED!') 
+        self.failUnless(segs[0].tag=='walls',
+                        'FAILED!')  
+        self.failUnless(segs[1].tag=='walls',
+                        'FAILED!') 
+         
+        self.failUnless(segs[2].tag=='bom',
+                        'FAILED!') 
+        self.failUnless(segs[3].tag=='',
+                        'FAILED!')
 
 #-------------------------------------------------------------