Changeset 1190

Timestamp:

Apr 4, 2005, 10:33:44 AM (20 years ago)

Author:

prow

Message:

domain(tri,points,use_incribed_circle = False)

File:

• inundation/ga/storm_surge/pyvolution/mesh.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/mesh.py

@@ -58 +58 @@
 
     def __init__(self, coordinates, triangles, boundary = None,
-                 tagged_elements = None, geo_reference = None):
+                 tagged_elements = None, geo_reference = None,
+                 use_incribed_circle = False):
         """
         Build triangles from x,y coordinates (sequence of 2-tuples or
@@ -96 +97 @@
             self.centroid_coordinates[i] = centroid
 
+#OLD
+            if use_incribed_circle == False:
             #Midpoints
-            m0 = array([(x1 + x2)/2, (y1 + y2)/2])
-            m1 = array([(x0 + x2)/2, (y0 + y2)/2])
-            m2 = array([(x1 + x0)/2, (y1 + y0)/2])
-
-            #The radius is the distance from the centroid of
-            #a triangle to the midpoint of the side of the triangle
-            #closest to the centroid
-            d0 = sqrt(sum( (centroid-m0)**2 ))
-            d1 = sqrt(sum( (centroid-m1)**2 ))
-            d2 = sqrt(sum( (centroid-m2)**2 ))
-
-            self.radii[i] = min(d0, d1, d2)
+                m0 = array([(x1 + x2)/2, (y1 + y2)/2])
+                m1 = array([(x0 + x2)/2, (y0 + y2)/2])
+                m2 = array([(x1 + x0)/2, (y1 + y0)/2])
+
+                #The radius is the distance from the centroid of
+                #a triangle to the midpoint of the side of the triangle
+                #closest to the centroid
+                d0 = sqrt(sum( (centroid-m0)**2 ))
+                d1 = sqrt(sum( (centroid-m1)**2 ))
+                d2 = sqrt(sum( (centroid-m2)**2 ))
+
+                self.radii[i] = min(d0, d1, d2)
+
+#NEW
+            else:
+                from math import sqrt
+                a = sqrt((x0-x1)**2+(y0-y1)**2)
+                b = sqrt((x1-x2)**2+(y1-y2)**2)
+                c = sqrt((x2-x0)**2+(y2-y0)**2)
+
+                self.radii[i]=self.areas[i]/(2*(a+b+c)) 
 
             #Initialise Neighbours (-1 means that it is a boundary neighbour)