Changeset 2301

Timestamp:

Jan 30, 2006, 3:27:09 PM (18 years ago)

Author:

duncan

Message:

adding functionality to pmesh.mesh for momentum sink.

Files:

• development/momentum_sink/create_buildings.py (modified) (1 diff)
• inundation/pmesh/mesh.py (modified) (3 diffs)
• inundation/pmesh/pmesh.py (modified) (2 diffs)
• inundation/pmesh/test_mesh.py (modified) (1 diff)
• inundation/pmesh/test_mesh_interface.py (modified) (1 diff)
• production/gippsland_2005/create_mesh2.py (modified) (1 diff)

development/momentum_sink/create_buildings.py

@@ -28 +28 @@
     m.add_hole_from_polygon(polygon, tags={'wall':[0,1,2,3]})
 
+    m.add_circle([20,70], 5, hole=True, tag='wall')
     m.generate_mesh(maximum_triangle_area=maximum_triangle_area)
-    triangle_count = len(m.getTriangulation())
+    triangle_count = m.get_triangle_count()
     
     if mesh_file is None:    

inundation/pmesh/mesh.py

@@ -673 +673 @@
         so if the user whats to modify it they can.     
         """
-        return self._add_area_from_polygon(polygon, tags=tags,
-                                max_triangle_area=max_triangle_area,
-                                      geo_reference=geo_reference)
+        if max_triangle_area is None:
+            create_region = False
+        else:
+            create_region = True
+            
+        region = self._add_area_from_polygon(polygon, tags=tags,
+                                             geo_reference=geo_reference,
+                                             region=create_region)
+        if max_triangle_area is not None:
+            region.setMaxArea(max_triangle_area)
+        return region
+    
         
     def _add_area_from_polygon(self, polygon, tags=None,
-                                max_triangle_area=None,
                                geo_reference=None,
-                               hole=False):
+                               hole=False,
+                               region=False):
         """
         Add a polygon with tags to the current mesh, as a region.
@@ -733 +742 @@
         region_dict['segment_tags'] = segment_tags
     
-        self.addVertsSegs(region_dict) #this is assuming absolute geos
-
-        inner = None
-        
-        if max_triangle_area is not None and hole is False:
+        self.addVertsSegs(region_dict) #this is passing absolute values
+
+        if region is True:
             #get inner point - absolute values
             inner_point = point_in_polygon(polygon)
             inner = self.add_region(inner_point[0], inner_point[1],
                                     geo_reference=None) 
-            inner.setMaxArea(max_triangle_area)
-
-        if hole is True:
+        elif hole is True:
             #get inner point - absolute values
             inner_point = point_in_polygon(polygon)
             inner = self.add_hole(inner_point[0], inner_point[1],
-                                    geo_reference=None) 
+                                    geo_reference=None)
+        else:
+            inner = None
             
         return inner
+
+    def add_circle(self, center, radius, segment_count=100,
+                   center_geo_reference=None, tag = None,
+                   region=False, hole=False):
+        """
+        center is a point, in absulute or relative to center_geo_ref
+        radius is the radius of the circle
+        segment_count is the number of segments used to represent the circle
+        tag is a string name, given to the segments.
+        If region is True a region object is returned.
+        If hole is True a hole object is returned.
+           (Don't have them both True.)
+
+           
+        """
+        pass
+        # convert center and radius to a polygon
+        ### pi = math.pi
+        ### num_of_cuts = 100
+        cuts = []
+        factor = 2* math.pi/segment_count
+        for cut in range(segment_count):
+             cuts.append(cut*factor)
+
+        polygon = []
+        for cut in cuts:
+            
+            x = center[0] + radius * math.cos(cut)
+            y = center[1] + radius * math.sin(cut)
+            polygon.append([x,y])
+        # build the tags
+        tags = {tag:range(segment_count)}
+        
+        return self._add_area_from_polygon(polygon, tags=tags,
+                                           region=region, hole=hole,
+                                           geo_reference=center_geo_reference)
+        
+    def addVertsSegs(self, outlineDict):
+        """
+        Add out-line (user Mesh) attributes given a dictionary of the lists
+        points: [(x1,y1),(x2,y2),...] (Tuples of doubles)  
+        segments: [(point1,point2),(p3,p4),...] (Tuples of integers)
+        segment_tags: [S1Tag, S2Tag, ...] (list of strings)
+
+        Assume the values are in Eastings and Northings, with no reference
+        point. eg absolute
+        """
+        if not outlineDict.has_key('segment_tags'):
+            outlineDict['segment_tags'] = []
+            for i in range(len(outlineDict['segments'])):
+                outlineDict['segment_tags'].append('')
+        #print "outlineDict['segment_tags']",outlineDict['segment_tags']
+        #print "outlineDict['points']",outlineDict['points']
+        #print "outlineDict['segments']",outlineDict['segments']
+        
+        localUserVertices = []
+        #index = 0
+        for point in outlineDict['points']:
+            v=Vertex(point[0]-self.geo_reference.xllcorner,
+                     point[1]-self.geo_reference.yllcorner)
+            #v.index = index
+            #index +=1
+            self.userVertices.append(v)
+            localUserVertices.append(v)
+            
+        #index = 0
+        for seg,seg_tag in map(None,outlineDict['segments'],
+                       outlineDict['segment_tags']):
+            segObject = Segment( localUserVertices[seg[0]],
+                           localUserVertices[seg[1]] )
+            if not seg_tag == '':
+                segObject.set_tag(seg_tag)
+            #segObject.index = index
+            #index +=1
+            self.userSegments.append(segObject)
+            #DSG!!!
+        
+    def get_triangle_count(self):
+        return len(self.getTriangulation())
         
     def getUserVertices(self):
@@ -1342 +1428 @@
             #index +=1
             self.regions.append(Object)
-        
-    def addVertsSegs(self, outlineDict):
-        """
-        Add out-line (user Mesh) attributes given a dictionary of the lists
-        points: [(x1,y1),(x2,y2),...] (Tuples of doubles)  
-        segments: [(point1,point2),(p3,p4),...] (Tuples of integers)
-        segment_tags: [S1Tag, S2Tag, ...] (list of strings)
-
-        Assume the values are in Eastings and Northings, with no reference
-        point. eg absolute
-        """
-        if not outlineDict.has_key('segment_tags'):
-            outlineDict['segment_tags'] = []
-            for i in range(len(outlineDict['segments'])):
-                outlineDict['segment_tags'].append('')
-        #print "outlineDict['segment_tags']",outlineDict['segment_tags']
-        #print "outlineDict['points']",outlineDict['points']
-        #print "outlineDict['segments']",outlineDict['segments']
-        
-        localUserVertices = []
-        #index = 0
-        for point in outlineDict['points']:
-            v=Vertex(point[0]-self.geo_reference.xllcorner,
-                     point[1]-self.geo_reference.yllcorner)
-            #v.index = index
-            #index +=1
-            self.userVertices.append(v)
-            localUserVertices.append(v)
-            
-        #index = 0
-        for seg,seg_tag in map(None,outlineDict['segments'],
-                       outlineDict['segment_tags']):
-            segObject = Segment( localUserVertices[seg[0]],
-                           localUserVertices[seg[1]] )
-            if not seg_tag == '':
-                segObject.set_tag(seg_tag)
-            #segObject.index = index
-            #index +=1
-            self.userSegments.append(segObject)
-            #DSG!!!
             
     def TestautoSegment(self):

inundation/pmesh/pmesh.py

@@ -490 +490 @@
         self.Segments = None
         self.Triangles = None
-        
+
+
     def addCylinders(self):
         """
         Automatically add some verts and segs to the mesh.Used in Debugging
-        """
+
+        center and radius
+        
+        """
+        
+        
         from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
         offset_x = 30
         offset_y = 40
-        v1 = self.drawVertex(0-offset_x,0-offset_y,None)
-        v2 = self.drawVertex(50-offset_x,2-offset_y,None)
-        v3 = self.drawVertex(70-offset_x,30-offset_y,None)
-        v4 = self.drawVertex(25-offset_x,50-offset_y,None)
-        v5 = self.drawVertex(-10-offset_x,20-offset_y,None)
-        #v5 = self.drawVertex(25,50,None)
-        s1 = self.drawSegment(v1,v2)
-        s1.set_tag("s1")
-        s2 = self.drawSegment(v2,v3)
-        s2.set_tag("s2")
-        s3 = self.drawSegment(v3,v4)
-        s3.set_tag("s3")
-        s4 = self.drawSegment(v4,v5)
-        s4.set_tag("s4")
-        s5 = self.drawSegment(v1,v5)
-        s5.set_tag("s5")
 
         x_origin = 10-offset_x
@@ -567 +557 @@
         #Since the new vertex may be off screen
         self.scrolledcanvas.resizescrollregion()
-
-        # generate the mesh
-        minAngle = 30.0
-        numTriangles = 20000
-        self.clearSelections()
-        self.canvas.delete(ALL)
-        self.mesh = self.MeshGenAreaNumTriangles (minAngle,
-                                          numTriangles,
-                                          self.mesh)
-        self.UserMeshChanged = False
-        self.visualiseMesh(self.mesh)
-        print "Mesh Generation finished"
             
     def selectFunc(self, tag):

inundation/pmesh/test_mesh.py

@@ -1849 +1849 @@
             self.failUnless(point_x == new_point_x, ' failed')
             self.failUnless(point_y == new_point_y, ' failed')
-            
-       
+
+    def test_add_circle(self):
+        x=-500
+        y=-1000
+        m=Mesh(geo_reference=Geo_reference(56,x,y))
+
+        # These are the absolute values
+        tag = 'hey'
+        segment_count = 104
+        radius = 30
+        circle_center_absolute = [100,80]        
+        x_p = -.666
+        y_p = -.777
+        geo_ref_poly = Geo_reference(56, x_p, y_p)
+        circle_center = \
+                geo_ref_poly.change_points_geo_ref(circle_center_absolute)
+        circle_center = circle_center[0] #make a list of lists a list
+        poly_point = m.add_circle(circle_center, radius, segment_count,
+                                  tag=tag,
+                                  region=True,
+                                  center_geo_reference=geo_ref_poly)
+        # poly_point values are relative to the mesh geo-ref
+        # make them absolute
+        #print "poly_point.x+x",poly_point.x+x
+        #print "polygon_absolute", polygon_absolute 
+      
+        
+        m.export_mesh_file("aaat.msh")
+        
+        self.failUnless(len(m.regions)==1,
+                        'FAILED!')
+        segs = m.getUserSegments()
+        self.failUnless(len(segs)==segment_count,
+                        'FAILED!')
+        self.failUnless(len(m.userVertices)==segment_count,
+                        'FAILED!') 
+        self.failUnless(segs[0].tag==tag,
+                        'FAILED!')  
+        self.failUnless(segs[1].tag==tag,
+                        'FAILED!') 
+         
+        verts = m.getUserVertices()
+        
+        m.export_mesh_file("aaat.msh")
+        
        
 def list_comp(A,B):

inundation/pmesh/test_mesh_interface.py

@@ -47 +47 @@
 
         # Test the mesh instance
-        
         self.failUnless(len(m.regions)==3,
                         'FAILED!')

production/gippsland_2005/create_mesh2.py

@@ -3 +3 @@
 """
 
-#import os, sys
-#sys.path.append('..')
-
-
-
-# add storm_surge dir to your pythonpath
+# add inundation dir to your pythonpath
 from pmesh.mesh import *
-from pyvolution.coordinate_transforms.geo_reference import Geo_reference
+from coordinate_transforms.geo_reference import Geo_reference