Changeset 9591 for trunk/anuga_core/anuga/pmesh

Timestamp:

Feb 3, 2015, 4:27:32 PM (10 years ago)

Author:

steve

Message:

added extra unit test for setting hole_tags when using create_mesh_from_regions

Location:

trunk/anuga_core/anuga/pmesh

Files:

• mesh.py (modified) (2 diffs)
• tests/test_mesh_interface.py (modified) (6 diffs)

trunk/anuga_core/anuga/pmesh/mesh.py

@@ -803 +803 @@
         factor = 2* math.pi/segment_count
         for cut in range(segment_count):
-             cuts.append(cut*factor)
+            cuts.append(cut*factor)
 
         polygon = []
@@ -971 +971 @@
         self.alphaUserSegments = []
 
-       #FIXME see where this is used. return an array instead
+    #FIXME see where this is used. return an array instead
     def getTriangulation(self):
         #return self.meshTriangles

trunk/anuga_core/anuga/pmesh/tests/test_mesh_interface.py

@@ -636 +636 @@
             
     def test_create_mesh_with_breaklines(self):
-         # These are the absolute values
+        # These are the absolute values
         polygon = [[100,100], [1000,100], [1000,1000], [100,1000]]
 
@@ -645 +645 @@
                                      10000000,
                                      breaklines=[[[50,50],[2000,2000]]])
-                                                                         
+
         self.assertTrue(len(m.regions) == 1, 'FAILED!')
         segs = m.getUserSegments()
@@ -653 +653 @@
 
     def test_create_mesh_with_interior_holes(self):
-         # These are the absolute values
+        # These are the absolute values
         polygon = [[100,100], [1000,100], [1000,1000], [100,1000]]
         
@@ -714 +714 @@
             msg = 'Passing a single polygon should have raised an error '
             raise Exception, msg
-
-                
+        
+        
+    def test_create_mesh_with_interior_holes_and_tags(self):
+        # These are the absolute values
+        polygon = [[100,100], [1000,100], [1000,1000], [100,1000]]
+        
+        interior_poly1 = [[101,101],[200,200], [101,200]]
+        interior_poly2 = [[300,300],[500,500], [400,200]]
+
+        boundary_tags = {'walls': [0,1], 'bom': [2,3]}
+
+
+        # This should work with one hole
+        m = create_mesh_from_regions(polygon,
+                                     boundary_tags,
+                                     10000000,
+                                     interior_holes=[interior_poly1],
+                                     hole_tags=[{'edge0' : [0], 'edge1': [1], 'edge2': [2]}])
+
+        self.assertTrue(len(m.getUserSegments()) == 7, 'FAILED!')
+        self.assertTrue(len(m.userVertices) == 7, 'FAILED!')
+
+        m.generate_mesh()
+        
+        tags_list = m.getMeshSegmentTags()
+        
+        assert len([x for x in tags_list if x == 'edge0']) == 7
+        assert len([x for x in tags_list if x == 'edge1']) == 6
+        assert len([x for x in tags_list if x == 'edge2']) == 54              
+
+
     def test_create_mesh_from_regions_with_duplicate_verts(self):
         # These are the absolute values
@@ -799 +828 @@
 
     def concept_ungenerateII(self):
-        from anuga.shallow_water import Domain, Reflective_boundary, \
-                            Dirichlet_boundary
+        from anuga import Domain, Reflective_boundary, Dirichlet_boundary
 
         x=0
@@ -869 +897 @@
 
     def concept_ungenerateIII(self):
-        from anuga.shallow_water import Domain, Reflective_boundary, \
+        from anuga import Domain, Reflective_boundary, \
                             Dirichlet_boundary
         from anuga.pmesh.mesh_interface import create_mesh_from_regions