Changeset 5717

Timestamp:

Aug 29, 2008, 4:40:31 PM (17 years ago)

Author:

duncan

Message:

adding a data check

Location:

anuga_core/source/anuga/pmesh

Files:

• mesh_interface.py (modified) (4 diffs)
• test_mesh_interface.py (modified) (1 diff)

anuga_core/source/anuga/pmesh/mesh_interface.py

@@ -5 +5 @@
 from Numeric import Float
 from anuga.utilities.polygon import inside_polygon
+
+
 
 # This is due to pmesh being a package and a module and
@@ -15 +17 @@
 import exceptions
 class PolygonError(exceptions.Exception): pass
+class SegmentError(exceptions.Exception): pass
 
 def create_mesh_from_regions(bounding_polygon,
@@ -129 +132 @@
     See create_mesh_from_regions for documentation.
     """
-    #FIXME (OLE-DSG)
+
+    
     # check the segment indexes - throw an error if they are out of bounds
-    #(DSG) Yes!
+    if boundary_tags is not None:
+        max_segs = len(bounding_polygon)
+        for key in boundary_tags.keys():
+            if len([x for x in boundary_tags[key] if x > max_segs-1]) >= 1:
+                msg = 'Boundary tag %s has segment out of bounds.'\
+                      %(str(key))
+                raise SegmentError, msg
+
+        
 
     
     #In addition I reckon the polygons could be of class Geospatial_data 
     #(DSG) If polygons were classes caching would break in places.
-
-    # First check that interior polygons are fully contained in bounding
-    # polygon
-    #Note, Both poly's have the same geo_ref, therefore don't take into account
-    # geo_ref
 
     # Simple check
@@ -149 +156 @@
 
     # 
-    if interior_regions is not None:        
-        # Test that all the interior polygons are inside the bounding_poly
-        # and throw out those that aren't fully included.
+    if interior_regions is not None:
+        
+        # Test that all the interior polygons are inside the
+        # bounding_poly and throw out those that aren't fully
+        # included.  #Note, Both poly's have the same geo_ref,
+        # therefore don't take into account # geo_ref
+
 
         polygons_inside_boundary = []

anuga_core/source/anuga/pmesh/test_mesh_interface.py

@@ -930 +930 @@
         for t in domain.evolve(yieldstep, finaltime):    
             domain.write_time()
+
+            
+        
+    def test_create_mesh_from_regions_check_segs(self):
+        """Test that create_mesh_from_regions fails when an interior region is
+         outside bounding polygon.       """
+        
+
+        # These are the absolute values
+        min_x = 10 
+        min_y = 88
+        polygon = [[min_x,min_y],[1000,100],[1000,1000],[100,1000]]
+        
+        boundary_tags = {'walls':[0,1,3],'bom':[2]}
+#        boundary_tags = {'walls':[0,1]}
+        # This one is inside bounding polygon - should pass
+        inner_polygon = [[800,400],[900,500],[800,600]]
+
+        interior_regions = [(inner_polygon, 5)]
+        m = create_mesh_from_regions(polygon,
+                                     boundary_tags,
+                                     10000000,
+                                     interior_regions=interior_regions)
+
+        boundary_tags = {'walls':[0,1,3,4],'bom':[2]}
+        
+        try:
+            m = create_mesh_from_regions(polygon,
+                                         boundary_tags,
+                                         10000000,
+                                         interior_regions=interior_regions)
+        except:
+            pass
+        else:
+            msg = 'segment out of bounds not caught '
+            raise msg
+
+        
 #-------------------------------------------------------------
 if __name__ == "__main__":
     suite = unittest.makeSuite(TestCase,'test')
-    #suite = unittest.makeSuite(TestCase,'concept_ungenerateIII')
+    #suite = unittest.makeSuite(TestCase,'test_create_mesh_from_regions_check_segs')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)