Changeset 5897 for anuga_core/source/anuga/utilities/test_system_tools.py

Timestamp:

Nov 6, 2008, 12:17:15 PM (16 years ago)

Author:

ole

Message:

Reverted numpy changes to the trunk that should have been made to the branch.
The command was svn merge -r 5895:5890 .

File:

• anuga_core/source/anuga/utilities/test_system_tools.py (modified) (4 diffs)

anuga_core/source/anuga/utilities/test_system_tools.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
+
 import unittest
-import numpy
+from Numeric import zeros, array, allclose, Float
 import zlib
 from os.path import join, split, sep
@@ -80 +81 @@
             pass
         else:
-            test_array = numpy.array([[7.0, 3.14], [-31.333, 0.0]])
+            test_array = array([[7.0, 3.14], [-31.333, 0.0]])
 
             # First file
@@ -86 +87 @@
             fid = NetCDFFile(filename1, 'w')
             fid.createDimension('two', 2)
-            fid.createVariable('test_array', numpy.dtype(numpy.float).char, ('two', 'two'))
+            fid.createVariable('test_array', Float,
+                               ('two', 'two'))
             fid.variables['test_array'][:] = test_array
             fid.close()
@@ -94 +96 @@
             fid = NetCDFFile(filename2, 'w')
             fid.createDimension('two', 2)
-            fid.createVariable('test_array', numpy.dtype(numpy.float).char, ('two', 'two'))
+            fid.createVariable('test_array', Float,
+                               ('two', 'two'))
             fid.variables['test_array'][:] = test_array
             fid.close()