Changeset 3452 for inundation/fit_interpolate

Timestamp:

Aug 4, 2006, 2:26:23 PM (19 years ago)

Author:

duncan

Message:

In numerical_tools, changing INF name to NAN.

Location:

inundation/fit_interpolate

Files:

• general_fit_interpolate.py (modified) (1 diff)
• interpolate.py (modified) (4 diffs)
• test_interpolate.py (modified) (4 diffs)

inundation/fit_interpolate/general_fit_interpolate.py

@@ -30 +30 @@
 from coordinate_transforms.geo_reference import Geo_reference
 from pyvolution.quad import build_quadtree
-from utilities.numerical_tools import ensure_numeric, mean, INF
+from utilities.numerical_tools import ensure_numeric
 from utilities.polygon import in_and_outside_polygon
 from geospatial_data.geospatial_data import Geospatial_data, \

inundation/fit_interpolate/interpolate.py

@@ -33 +33 @@
 from coordinate_transforms.geo_reference import Geo_reference
 from pyvolution.quad import build_quadtree
-from utilities.numerical_tools import ensure_numeric, mean, INF
+from utilities.numerical_tools import ensure_numeric, mean, NAN
 from utilities.polygon import in_and_outside_polygon
 from geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
@@ -201 +201 @@
         #print "z", z
         for i in self.outside_poly_indices: 
-            z[i] = INF
+            z[i] = NAN
         return z
 
@@ -330 +330 @@
             depth = w - z 
               
-            if w == INF or z == INF or uh == INF or vh == INF:
-                velocity = INF
+            if w == NAN or z == NAN or uh == NAN or vh == NAN:
+                velocity = NAN
             else:
                 momentum = sqrt(uh*uh + vh*vh)
@@ -598 +598 @@
             #Linear temporal interpolation    
             if ratio > 0:
-                if Q0 == INF and Q1 == INF:
+                if Q0 == NAN and Q1 == NAN:
                     q[i]  = Q0
                 else:

inundation/fit_interpolate/test_interpolate.py

@@ -21 +21 @@
 from coordinate_transforms.geo_reference import Geo_reference
 from shallow_water import Domain, Transmissive_boundary
-from utilities.numerical_tools import mean, INF
+from utilities.numerical_tools import mean, NAN
 from data_manager import get_dataobject
 from geospatial_data.geospatial_data import Geospatial_data
@@ -523 +523 @@
 
         z = interp.interpolate(f, point_coords) #, verbose=True)
-        answer = array([ [INF, INF, INF, INF]]) # (-1,-1)
+        answer = array([ [NAN, NAN, NAN, NAN]]) # (-1,-1)
 
         #print "***********"
@@ -1135 +1135 @@
         t = time[0]
         for j in range(50): #t in [1, 6]
-            self.failUnless(I(t, 5) == INF, 'Fail!')
+            self.failUnless(I(t, 5) == NAN, 'Fail!')
             t += 0.1  
             
@@ -1343 +1343 @@
                   2*linear_function(point_coords) ]
         answer = transpose(answer)
-        answer[2,:] = [INF, INF]
-        answer[3,:] = [INF, INF]
-        answer[11,:] = [INF, INF]
+        answer[2,:] = [NAN, NAN]
+        answer[3,:] = [NAN, NAN]
+        answer[11,:] = [NAN, NAN]
         #print "z",z
         #print "answer _ fixed",answer