Changeset 7276 for anuga_core/source/anuga/abstract_2d_finite_volumes/ermapper_grids.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (15 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/ermapper_grids.py (modified) (5 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/ermapper_grids.py

@@ -2 +2 @@
 
 # from os import open, write, read
-import Numeric as num
-
-celltype_map = {'IEEE4ByteReal': num.Float32, 'IEEE8ByteReal': num.Float64}
+import numpy as num
+
+celltype_map = {'IEEE4ByteReal': num.float32, 'IEEE8ByteReal': num.float64}
 
 
@@ -11 +11 @@
     write_ermapper_grid(ofile, data, header = {}):
     
-    Function to write a 2D Numeric array to an ERMapper grid.  There are a series of conventions adopted within
+    Function to write a 2D numeric array to an ERMapper grid.  There are a series of conventions adopted within
     this code, specifically:
     1)  The registration coordinate for the data is the SW (or lower-left) corner of the data
     2)  The registration coordinates refer to cell centres
-    3)  The data is a 2D Numeric array with the NW-most data in element (0,0) and the SE-most data in element (N,M)
+    3)  The data is a 2D numeric array with the NW-most data in element (0,0) and the SE-most data in element (N,M)
         where N is the last line and M is the last column
     4)  There has been no testng of the use of a rotated grid.  Best to keep data in an NS orientation
@@ -163 +163 @@
     return header                      
 
-def write_ermapper_data(grid, ofile, data_format = num.Float32):
+def write_ermapper_data(grid, ofile, data_format=num.float32):
 
 
@@ -193 +193 @@
 
 
-def read_ermapper_data(ifile, data_format = num.Float32):
+def read_ermapper_data(ifile, data_format = num.float32):
     # open input file in a binary format and read the input string
     fid = open(ifile,'rb')
@@ -199 +199 @@
     fid.close()
 
-    # convert input string to required format (Note default format is num.Float32)
+    # convert input string to required format (Note default format is num.float32)
     grid_as_float = num.fromstring(input_string,data_format)
     return grid_as_float