Changeset 8006

Timestamp:

Sep 4, 2010, 10:53:31 PM (14 years ago)

Author:

steve

Message:

Added hole_tags argument to create_domain_from_regions. See buildings.py in demos for example of use.

Location:

trunk/anuga_core

Files:

• documentation/user_manual/demos (modified) (1 prop)
• documentation/user_manual/demos/buildings.py (modified) (3 diffs)
• source/anuga/__init__.py (modified) (5 diffs)
• source/anuga/pmesh (modified) (1 prop)
• source/anuga/pmesh/graphical_mesh_generator.py (modified) (1 diff)
• source/anuga/pmesh/mesh_interface.py (modified) (1 diff)

trunk/anuga_core/documentation/user_manual/demos/buildings.py

@@ -35 +35 @@
                     poly_from_box(22.5, 27.5, 1.5, 6.5),    # middle box
                     poly_from_box(35, 40, 3.5, 8.5)]        # downstream box
+                                        
+building_tags = [ { 'upstream'   : [0,1,2,3]},
+                  { 'middle'     : None},
+                  { 'downstream' : [0,1,2,3]} ]
+
+#building_tags = None
 
 # create a domain mesh, with 3 building holes in it
@@ -45 +51 @@
                                             mesh_filename = 'building.msh',
                                             interior_holes = building_polys,
+                                            hole_tags = building_tags,
                                             use_cache=True, # to speed it up
                                             verbose=True)   # log output on
@@ -70 +77 @@
 
 domain.set_boundary({'left': Bi, 'right': Bo, 'top': Br, 'bottom': Br,
-                        'exterior': Br # this is the internal building boundary
+                        'middle': Br      , # this is the internal middle building boundary
+                        'downstream' : Br , # downstream building
+                        'upstream' : Br     # upstream building boundary
                     })
 

trunk/anuga_core/source/anuga/__init__.py

@@ -166 +166 @@
                                interior_regions=None,
                                interior_holes=None,
+                                                           hole_tags = None,
                                poly_geo_reference=None,
                                mesh_geo_reference=None,
@@ -197 +198 @@
     need to be closed, but their points must be specified in a counter-clockwise
     order.
+        
+        hole_tags  is a list of tag segment dictionaries.
 
     This function does not allow segments to share points - use underlying
@@ -232 +235 @@
               'interior_regions': interior_regions,
               'interior_holes': interior_holes,
+                          'hole_tags': hole_tags,
               'poly_geo_reference': poly_geo_reference,
               'mesh_geo_reference': mesh_geo_reference,
@@ -265 +269 @@
                                 interior_regions=None,
                                 interior_holes=None,
+                                                                hole_tags=None,
                                 poly_geo_reference=None,
                                 mesh_geo_reference=None,
@@ -284 +289 @@
                              filename=mesh_filename,
                              interior_holes=interior_holes,
+                                                         hole_tags=hole_tags,
                              poly_geo_reference=poly_geo_reference,
                              mesh_geo_reference=mesh_geo_reference,

trunk/anuga_core/source/anuga/pmesh/graphical_mesh_generator.py

@@ -637 +637 @@
         #The screen canvas has y 'flipped'.  -1* unflips it
         self.lasty = self.starty = -1*self.canvas.canvasy(event.y)
-        log.critical "----------------------")
+        log.critical("----------------------")
         self.mouseDownCurFunc( self.lastx,
                                self.lasty,event) #!!! remove the event?

trunk/anuga_core/source/anuga/pmesh/mesh_interface.py

@@ -314 +314 @@
     # Do interior holes
     if interior_holes is not None:    
-        for polygon in interior_holes:
+        for n, polygon in enumerate(interior_holes):
+            try:
+                tags = hole_tags[n]
+            except:
+                tags = None
             m.add_hole_from_polygon(polygon,
-                                    segment_tags=hole_tags,
+                                    segment_tags=tags,
                                     geo_reference=poly_geo_reference)