Changeset 7701

Timestamp:

Apr 29, 2010, 3:14:45 PM (15 years ago)

Author:

James Hudson

Message:

Fixed crash bug if triangles not in numeric form.

File:

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

anuga_core/source/anuga/fit_interpolate/search_functions.py

@@ -8 +8 @@
 import time
 
+from anuga.utilities.numerical_tools import get_machine_precision
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.config import max_float
+
 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
+    from polygon_ext import _is_inside_triangle        
+else:
+    msg = 'C implementations could not be accessed by %s.\n ' %__file__
+    msg += 'Make sure compile_all.py has been run as described in '
+    msg += 'the ANUGA installation guide.'
+    raise Exception, msg
 
 import numpy as num
@@ -97 +102 @@
     """
     global last_triangle
+
+    x = ensure_numeric(x, num.float)    
     
     # These statments are needed if triangles is empty
@@ -107 +114 @@
     for k, tri_verts_norms in triangles:
         tri = tri_verts_norms[0]
+        tri = ensure_numeric(tri)               
         # 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
-
-        # Input check disabled to speed things up.
-        if _is_inside_triangle(x, tri, 
-                              int(True), 1.0e-12, 1.0e-12):
+        
+        # Input check disabled to speed things up.      
+        if bool(_is_inside_triangle(x, tri, int(True), 1.0e-12, 1.0e-12)):
             
             n0, n1, n2 = tri_verts_norms[1]