Changeset 6536 for anuga_core/source/anuga/fit_interpolate/search_functions.py

Timestamp:

Mar 17, 2009, 11:14:17 PM (14 years ago)

Author:

ole

Message:

Added first step in dealing with ticket:314 - a different way of
assessing whether a point is inside a triangle. Next step is to remove
all the now unnecessary epsilon tests in search_functions.py.

Tests using the Okushiri fitting example revealed that this approach is
over 30% faster.

File:

• anuga_core/source/anuga/fit_interpolate/search_functions.py (modified) (2 diffs)

anuga_core/source/anuga/fit_interpolate/search_functions.py

@@ -8 +8 @@
 import time
 
+from anuga.utilities.polygon import is_inside_triangle
 from anuga.utilities.numerical_tools import get_machine_precision
 from anuga.config import max_float
@@ -145 +146 @@
     for k, tri_verts_norms in triangles:
         tri = tri_verts_norms[0]
-        n0, n1, n2 = tri_verts_norms[1]
+
         # k is the triangle index
         # tri is a list of verts (x, y), representing a tringle
         # Find triangle that contains x (if any) and interpolate
-        element_found, sigma0, sigma1, sigma2 =\
-                       find_triangle_compute_interpolation(tri, n0, n1, n2, x)
+        if is_inside_triangle(x, tri, closed=True):
+            n0, n1, n2 = tri_verts_norms[1]        
+            element_found, sigma0, sigma1, sigma2 =\
+                find_triangle_compute_interpolation(tri, n0, n1, n2, x)
+        else:
+            element_found = False
+
+            
         if element_found is True:
             # Don't look for any other triangles in the triangle list