Changeset 4888

Timestamp:

Dec 17, 2007, 4:39:16 PM (16 years ago)

Author:

duncan

Message:

tweaking the tagging of regions

Files:

• anuga_core/documentation/user_manual/anuga_user_manual.tex (modified) (2 diffs)
• anuga_core/source/anuga/pmesh/mesh.py (modified) (8 diffs)
• anuga_core/source/anuga/pmesh/mesh_interface.py (modified) (1 diff)
• anuga_core/source/anuga/pmesh/test_mesh.py (modified) (3 diffs)
• anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py (modified) (1 diff)

anuga_core/documentation/user_manual/anuga_user_manual.tex

@@ -1633 +1633 @@
 \end{methoddesc}
 
-\begin{methoddesc}  {add\_region\_from\_polygon}{self, polygon, tags=None,
+\begin{methoddesc}  {add\_region\_from\_polygon}{self, polygon, 
+segment_tags=None, region_tag=None
                                 max_triangle_area=None}
 Module: \module{pmesh.mesh},  Class: \class{Mesh}
@@ -1643 +1644 @@
 region boundary is described by the input \code{polygon}.  Additionally, the
 user specifies a list of segment tags, one for each edge of the
-bounding polygon.
+bounding polygon.  The regional tag is set using  \code{region}.
 
 \end{methoddesc}

anuga_core/source/anuga/pmesh/mesh.py

@@ -731 +731 @@
             self.userVertices.append(v)
             
-    def add_hole_from_polygon(self, polygon, tags=None, geo_reference=None):
+    def add_hole_from_polygon(self, polygon, segment_tags=None,
+                              geo_reference=None):
         """
         Add a polygon with tags to the current mesh, as a region.
@@ -748 +749 @@
         it they can.       
         """
-        return self._add_area_from_polygon(polygon, tags=tags,
+        return self._add_area_from_polygon(polygon,
+                                           segment_tags=segment_tags,
                                            hole=True,
                                            geo_reference=geo_reference
@@ -754 +756 @@
 
         
-    def add_region_from_polygon(self, polygon, tags=None,
-                                max_triangle_area=None, geo_reference=None):
+    def add_region_from_polygon(self, polygon, segment_tags=None,
+                                max_triangle_area=None, geo_reference=None,
+                                region_tag=None):
         """
         Add a polygon with tags to the current mesh, as a region.
@@ -767 +770 @@
         polygon a list of points, in meters that describe the polygon
              (e.g. [[x1,y1],[x2,y2],...]
-        tags (e.g.{'wall':[0,1,3],'ocean':[2]})
+        segment_tags (e.g.{'wall':[0,1,3],'ocean':[2]}) add tags to the
+        segements of the region
+        region_tags  - add a tag to all of the triangles in the region.
 
         This returns the region instance (if a max_triangle_area is given),
@@ -777 +782 @@
             create_region = True
             
-        region = self._add_area_from_polygon(polygon, tags=tags,
+        region = self._add_area_from_polygon(polygon,
+                                             segment_tags=segment_tags,
                                              geo_reference=geo_reference,
                                              region=create_region)
         if max_triangle_area is not None:
             region.setMaxArea(max_triangle_area)
+        if region_tag is not None:
+            region.setTag(region_tag)
+        
+        
         return region
     
         
-    def _add_area_from_polygon(self, polygon, tags=None,
+    def _add_area_from_polygon(self, polygon, segment_tags=None,
                                geo_reference=None,
                                hole=False,
@@ -800 +810 @@
         polygon a list of points, in meters that describe the polygon
              (e.g. [[x1,y1],[x2,y2],...]
-        tags (e.g.{'wall':[0,1,3],'ocean':[2]})
+        segment_tags (e.g.{'wall':[0,1,3],'ocean':[2]})add tags to the
+        segements of the region.
 
         This returns the region instance, so if the user whats to modify
@@ -831 +842 @@
             segments.append( [lo, hi] ) 
         region_dict['segments'] = segments
-        region_dict['segment_tags'] = self._tag_dict2list(tags, N)
+        region_dict['segment_tags'] = self._tag_dict2list(segment_tags, N)
        
     
@@ -903 +914 @@
         tags = {tag:range(segment_count)}
         
-        return self._add_area_from_polygon(polygon, tags=tags,
+        return self._add_area_from_polygon(polygon, segment_tags=tags,
                                            region=region, hole=hole,
                                            geo_reference=center_geo_reference)

anuga_core/source/anuga/pmesh/mesh_interface.py

@@ -229 +229 @@
     # Do bounding polygon
     m.add_region_from_polygon(bounding_polygon,
-                              tags=boundary_tags,
+                              segment_tags=boundary_tags,
                               geo_reference=poly_geo_reference)
 

anuga_core/source/anuga/pmesh/test_mesh.py

@@ -1905 +1905 @@
         m=Mesh()
         region = m.add_region_from_polygon([[0,0],[1,0],[0,1]],
-                                  max_triangle_area = 88)
+                                  max_triangle_area = 88,
+                                           region_tag='cassady')
         self.failUnless(len(m.regions)==1,
                         'FAILED!')
@@ -1913 +1914 @@
                         'FAILED!')
         self.failUnless(len(m.userVertices)==3,
+                        'FAILED!')
+        self.failUnless(region.getTag()=='cassady',
                         'FAILED!')
        
@@ -2137 +2140 @@
         #m.export_mesh_file("aaat.msh")
         
-    def FIXMEtest_auto_set_geo_reference(self):
+    def NOTIMPLEMENTEDtest_auto_set_geo_reference(self):
         x=50000
         y=1000

anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py

@@ -37 +37 @@
             ,save=False
             )
-        print "time", time
-        print "mem", mem
+        #print "time", time
+        #print "mem", mem
         if host.find('tornado') == 0 or host.find('compute-1') == 0:
             # Tornado headnode or node