Changeset 4905

Timestamp:

Jan 4, 2008, 1:58:14 PM (16 years ago)

Author:

duncan

Message:

minor mod

Location:

anuga_core/source/anuga/pmesh

Files:

• graphical_mesh_generator.py (modified) (2 diffs)
• mesh.py (modified) (1 diff)
• test_mesh.py (modified) (1 diff)

anuga_core/source/anuga/pmesh/graphical_mesh_generator.py

@@ -849 +849 @@
             pass
         meshArea = 0
-        for triangle in tempMesh.getTriangulation():
-             meshArea += triangle.calcArea()
-        print "meshArea: ", meshArea
-
+        #print "tempMesh.getTriangulation()", tempMesh.getTriangulation()
+        meshArea = tempMesh.tri_mesh.calc_mesh_area()
         maxArea = meshArea/numTriangles
 
@@ -1428 +1426 @@
         #self.createSetIcons()
         self.createVisualiseIcons()
-        #self.addCylinders() # !!!DSG start pmesh with a triangle
+        print "FIX THIS BEFORE "
+        self.addCylinders() # !!!DSG start pmesh with a triangle
         self.selectFunc('pointer')
         self.currentPath = os.getcwd() 

anuga_core/source/anuga/pmesh/mesh.py

@@ -568 +568 @@
                 outline = colour,fill = ''
                 )
- 
+            
+    def calc_mesh_area(self):
+        area = 0
+        for tri in self.triangles:
+            vertices = []
+            for v_index in range(3):
+                vertices.append(self.vertices[tri[v_index]])
+            ax = vertices[0][0]
+            ay = vertices[0][1]
+            
+            bx = vertices[1][0]
+            by = vertices[1][1]
+            
+            cx = vertices[2][0]
+            cy = vertices[2][1]
+            
+            area += abs((bx*ay-ax*by)+(cx*by-bx*cy)+(ax*cy-cx*ay))/2
+        return area            
         
 class Mesh:

anuga_core/source/anuga/pmesh/test_mesh.py

@@ -2347 +2347 @@
         #print "", mode
         
+  
+    
+    def testgenerateMesh_calc_mesh_area(self):
+        a = Vertex (0.0, 0.0)
+        d = Vertex (0.0, 4.0)
+        f = Vertex (4.0,0.0)
+
+        s1 = Segment(a,d)
+        s2 = Segment(d,f)
+        s3 = Segment(a,f)
+
+        r1 = Region(0.3, 0.3,tag = 1.3,maxArea = .6)
+        #print r1
+        m = Mesh(userVertices=[a,d,f], userSegments=[s1,s2,s3], regions=[r1] )
+        
+        m.generateMesh("Q", maxArea = 2.1 )
+        calc_mesh_area = m.tri_mesh.calc_mesh_area()
+        #print "calc_mesh_area", calc_mesh_area
+        delta  = 0.0000000001
+        self.failUnless((8.0 < calc_mesh_area + delta) or
+                        (8.0 > calc_mesh_area - delta),
+                        'generated mesh is wrong!')
         
 def list_comp(A,B):