Changeset 8969 for trunk/anuga_core/source/anuga

Timestamp:

Sep 10, 2013, 8:12:49 AM (11 years ago)

Author:

steve

Message:

Got rid of comparison warnings with nans in test_interpolate2d.py

Location:

trunk/anuga_core/source/anuga/fit_interpolate

Files:

• interpolate2d.py (modified) (2 diffs)
• test_interpolate2d.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/fit_interpolate/interpolate2d.py

@@ -142 +142 @@
 
     # Identify elements that are outside interpolation domain or NaN
+    oldset = numpy.seterr(invalid='ignore')  # Suppress comparison with nan warning
     outside = (xi < x[0]) + (eta < y[0]) + (xi > x[-1]) + (eta > y[-1])
     outside += numpy.isnan(xi) + numpy.isnan(eta)
-
+    numpy.seterr(**oldset)  # Restore warnings
+    
     # Restrict interpolation points to those that are inside the grid
     inside = -outside  # Invert boolean array to find elements inside
@@ -271 +273 @@
 
     if bounds_error:
-        xi0 = min(xi)
-        xi1 = max(xi)
-        eta0 = min(eta)
-        eta1 = max(eta)
+        xi0 = numpy.nanmin(xi)
+        xi1 = numpy.nanmax(xi)
+        eta0 = numpy.nanmin(eta)
+        eta1 = numpy.nanmax(eta)
 
         msg = ('Interpolation point xi=%f was less than the smallest '

trunk/anuga_core/source/anuga/fit_interpolate/test_interpolate2d.py

@@ -250 +250 @@
         xis = numpy.linspace(x[0], x[-1], 10)
         etas = numpy.linspace(y[0], y[-1], 10)
+        
         xis[6:7] = numpy.nan
         etas[3] = numpy.nan
         points = axes2points(xis, etas)
-
+        
         vals = interpolate2d(x, y, A, points, mode='linear')
         refs = linear_function(points[:, 0], points[:, 1])
+        
         assert nanallclose(vals, refs, rtol=1e-12, atol=1e-12)
 
@@ -279 +281 @@
         etas = numpy.linspace(y[0], y[-1], 10)
         points = axes2points(xis, etas)
+
 
         vals = interpolate2d(x, y, A, points, mode='linear')