Changeset 4863

Timestamp:

Nov 29, 2007, 5:46:55 PM (17 years ago)

Author:

ole

Message:

Fixed ticket:232 - the problem was that the only proper floats can be compared
to None - not the single precision values that have been reinstated in the
sww file.

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -70 +70 @@
 from Numeric import concatenate, array, Float, Int, Int32, resize, sometrue, \
      searchsorted, zeros, allclose, around, reshape, transpose, sort, \
-     NewAxis, ArrayType, compress, take, arange, argmax, alltrue,shape,Float32
+     NewAxis, ArrayType, compress, take, arange, argmax, alltrue, shape, Float32
 
 import string
@@ -5625 +5625 @@
     
     
-        # Get the relevant quantities
-        elevation = fid.variables['elevation'][:] 
-        stage = fid.variables['stage'][:]
+        # Get the relevant quantities (Convert from single precison)
+        elevation = array(fid.variables['elevation'][:], Float) 
+        stage = array(fid.variables['stage'][:], Float)
     
     

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -7327 +7327 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
+
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_get_maximum_inundation')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_header')
     suite = unittest.makeSuite(Test_Data_Manager,'test')