Changeset 6458

Timestamp:

Mar 5, 2009, 9:44:01 AM (16 years ago)

Author:

rwilson

Message:

Test failed because quantities read from SWW file are 32 bit floats.
Cast test data to 64 bits after read to pass test. NOTE FOR VALIDATION TESTS.

File:

• branches/numpy/anuga/abstract_2d_finite_volumes/test_util.py (modified) (3 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/test_util.py

@@ -386 +386 @@
         x = fid.variables['x'][:]
         y = fid.variables['y'][:]
+        # we 'cast' to 64 bit floats to pass this test
+        # SWW file quantities are stored as 32 bits
+        x = num.array(x, num.float)
+        y = num.array(y, num.float)
+
         stage = fid.variables['stage'][:]
         xmomentum = fid.variables['xmomentum'][:]
@@ -419 +424 @@
         Dy = num.take(num.reshape(y, (16,1)), [0,5,10,15], axis=0)
 
-        diag = num.concatenate( (Dx, Dy), axis=1)
+        diag = num.concatenate((Dx, Dy), axis=1)
         d_midpoints = (diag[1:] + diag[:-1])/2
 
@@ -1981 +1986 @@
 
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Util,'test')
+    suite = unittest.makeSuite(Test_Util, 'test')
 #    runner = unittest.TextTestRunner(verbosity=2)
     runner = unittest.TextTestRunner(verbosity=1)