Changeset 5899 for anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_ermapper.py

Timestamp:

Nov 6, 2008, 12:28:22 PM (15 years ago)

Author:

rwilson

Message:

Initial NumPy? changes (again!).

File:

• anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_ermapper.py (modified) (9 diffs)

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_ermapper.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Oct 28, 2008 by alter_code1.py
+
 #!/usr/bin/env python
 
@@ -5 +7 @@
 
 import ermapper_grids
-import Numeric
+##import numpy.oldnumeric as Numeric
+import numpy
 from os import remove
 
@@ -19 +22 @@
         data_filename = 'test_write_ermapper_grid'
         
-        original_grid = Numeric.array([[0.0, 0.1, 1.0], [2.0, 3.0, 4.0]])
+        original_grid = numpy.array([[0.0, 0.1, 1.0], [2.0, 3.0, 4.0]])
 
         # Check that the function works when passing the filename without
@@ -25 +28 @@
         ermapper_grids.write_ermapper_grid(data_filename, original_grid)
         new_grid = ermapper_grids.read_ermapper_grid(data_filename)
-        assert Numeric.allclose(original_grid, new_grid)
+        assert numpy.allclose(original_grid, new_grid)
 
         # Check that the function works when passing the filename with
@@ -31 +34 @@
         ermapper_grids.write_ermapper_grid(header_filename, original_grid)
         new_grid = ermapper_grids.read_ermapper_grid(header_filename)
-        assert Numeric.allclose(original_grid, new_grid)
+        assert numpy.allclose(original_grid, new_grid)
 
         # Clean up created files
@@ -40 +43 @@
         # Setup test data
         filename = 'test_write_ermapper_grid'
-        original_grid = Numeric.array([0.0, 0.1, 1.0, 2.0, 3.0, 4.0])
+        original_grid = numpy.array([0.0, 0.1, 1.0, 2.0, 3.0, 4.0])
 
         # Write test data
-        ermapper_grids.write_ermapper_data(original_grid, filename, Numeric.Float64)
+        ermapper_grids.write_ermapper_data(original_grid, filename, numpy.float64)
 
         # Read in the test data
-        new_grid = ermapper_grids.read_ermapper_data(filename, Numeric.Float64)
+        new_grid = ermapper_grids.read_ermapper_data(filename, numpy.float64)
 
         # Check that the test data that has been read in matches the original data
-        assert Numeric.allclose(original_grid, new_grid)
+        assert numpy.allclose(original_grid, new_grid)
 
         # Clean up created files
@@ -57 +60 @@
         # Setup test data
         filename = 'test_write_ermapper_grid'
-        original_grid = Numeric.array([0.0, 0.1, 1.0, 2.0, 3.0, 4.0])
+        original_grid = numpy.array([0.0, 0.1, 1.0, 2.0, 3.0, 4.0])
 
         # Write test data
@@ -66 +69 @@
 
         # Check that the test data that has been read in matches the original data
-        assert Numeric.allclose(original_grid, new_grid)
+        assert numpy.allclose(original_grid, new_grid)
 
         # Clean up created files
@@ -75 +78 @@
 
         # setup test data
-        original_grid = Numeric.array([[0, 1, 2, 3], [4, 5, 6, 7], [8, 9, 10, 11]])
+        original_grid = numpy.array([[0, 1, 2, 3], [4, 5, 6, 7], [8, 9, 10, 11]])
         # Write test data
         ermapper_grids.write_ermapper_data(original_grid, data_filename)