Changeset 3452

Timestamp:

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

Author:

duncan

Message:

In numerical_tools, changing INF name to NAN.

Location:

inundation

Files:

• damage/inundation_damage.py (modified) (2 diffs)
• fit_interpolate/general_fit_interpolate.py (modified) (1 diff)
• fit_interpolate/interpolate.py (modified) (4 diffs)
• fit_interpolate/test_interpolate.py (modified) (4 diffs)
• pyvolution/test_util.py (modified) (7 diffs)
• utilities/numerical_tools.py (modified) (1 diff)

inundation/damage/inundation_damage.py

@@ -31 +31 @@
 from pyvolution.util import file_function
 from geospatial_data.geospatial_data import ensure_absolute
-from utilities.numerical_tools import INF
+from utilities.numerical_tools import NAN
 from anuga_config import epsilon
 depth_epsilon = epsilon
@@ -132 +132 @@
             if depth > max_depths[point_i]:
                 max_depths[point_i] = depth
-            if w == INF or z == INF or uh == INF or vh == INF:
+            if w == NAN or z == NAN or uh == NAN or vh == NAN:
                 continue
             momentum = sqrt(uh*uh + vh*vh)

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

inundation/pyvolution/test_util.py

@@ -11 +11 @@
 from data_manager import timefile2netcdf
 
-from utilities.numerical_tools import INF
+from utilities.numerical_tools import NAN
 
 def test_function(x, y):
@@ -621 +621 @@
                     q1 = F(t+60, point_id=id)
 
-                if q0 == INF:
+                if q0 == NAN:
                     actual = q0
                 else:
@@ -632 +632 @@
                 print "actual", actual
                 #print
-                if q0 == INF:
+                if q0 == NAN:
                      self.failUnless( q == actual, 'Fail!')
                 else:
@@ -792 +792 @@
                     q1 = F(t+60, point_id=id)
 
-                if q0 == INF:
+                if q0 == NAN:
                     actual = q0
                 else:
@@ -803 +803 @@
                 #print "actual", actual
                 #print
-                if q0 == INF:
+                if q0 == NAN:
                      self.failUnless( q == actual, 'Fail!')
                 else:
@@ -836 +836 @@
                     q1 = F(t+60, point_id=id)
 
-                if q0 == INF:
+                if q0 == NAN:
                     actual = q0
                 else:
@@ -849 +849 @@
                 print "actual", actual
                 #print
-                if q0 == INF:
+                if q0 == NAN:
                      self.failUnless( q == actual, 'Fail!')
                 else:

inundation/utilities/numerical_tools.py

@@ -14 +14 @@
 
 # Getting an infinite number to use when using Numeric
-INF = (array([1])/0.)[0]
-
+#INF = (array([1])/0.)[0]
+
+NAN = (array([1])/0.)[0]
+# Note, INF is used instead of NAN (Not a number), since Numeric has no NAN
+# if we use a package that has NAN, this should be updated to use NAN.