Changeset 1192

Timestamp:

Apr 4, 2005, 11:27:27 AM (20 years ago)

Author:

prow

Message:

set_to_inc. now returns min and max ratio between new and old radii.

File:

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

inundation/ga/storm_surge/pyvolution/mesh.py

@@ -152 +152 @@
 
 
-    def set_to_incribed_circle(self):
+    def set_to_incribed_circle(self,safety_factor = 1):
         #FIXME phase out eventually
         from math import sqrt
         N = self.number_of_elements
         V = self.vertex_coordinates
-        for i in range(N):
+
+        #initialising min and max ratio
+        i=0
+        old_rad = self.radii[i]
+        x0 = V[i, 0]; y0 = V[i, 1]
+        x1 = V[i, 2]; y1 = V[i, 3]
+        x2 = V[i, 4]; y2 = V[i, 5]
+        a = sqrt((x0-x1)**2+(y0-y1)**2)
+        b = sqrt((x1-x2)**2+(y1-y2)**2)
+        c = sqrt((x2-x0)**2+(y2-y0)**2)
+        ratio = old_rad/self.radii[i]
+        max_ratio = ratio
+        min_ratio = ratio
+
+        for i in range(N):
+            old_rad = self.radii[i]
             x0 = V[i, 0]; y0 = V[i, 1]
             x1 = V[i, 2]; y1 = V[i, 3]
@@ -164 +179 @@
             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)) 
+            self.radii[i]=self.areas[i]/(2*(a+b+c))*safety_factor
+            ratio = old_rad/self.radii[i]
+            if ratio >= max_ratio: max_ratio = ratio
+            if ratio <= min_ratio: min_ratio = ratio
+        return max_ratio,min_ratio
 
     def build_neighbour_structure(self):