Changeset 7700

Timestamp:

Apr 29, 2010, 11:11:52 AM (15 years ago)

Author:

hudson

Message:

Ticket 327 - marginal 5% speed increase by removing is_inside_triangle wrapper to C function and just calling directly.

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 import compile
+if compile.can_use_C_extension('polygon_ext.c'):
+    # Underlying C implementations can be accessed
+    from polygon_ext import _is_inside_triangle  
+        
+#from anuga.utilities.polygon import is_inside_triangle
 from anuga.utilities.numerical_tools import get_machine_precision
 from anuga.config import max_float
@@ -105 +110 @@
         # tri is a list of verts (x, y), representing a tringle
         # Find triangle that contains x (if any) and interpolate
-        
+
         # Input check disabled to speed things up.
-        if is_inside_triangle(x, tri, 
-                              closed=True,
-                              check_inputs=False):
+        if _is_inside_triangle(x, tri, 
+                              int(True), 1.0e-12, 1.0e-12):
             
             n0, n1, n2 = tri_verts_norms[1]