Changeset 7276 for misc/tools/write_large_files

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.

Location:

misc/tools/write_large_files

Files:

• rw_big_file.py (modified) (4 diffs)
• rwi4_big_file.py (modified) (3 diffs)
• rwi_big_file.py (modified) (3 diffs)
• rwil_big_file.py (modified) (3 diffs)
• write_big_file.py (modified) (2 diffs)

misc/tools/write_large_files/rw_big_file.py

@@ -7 +7 @@
 import getopt
 import time
-import Numeric
+import numpy as num
 import Scientific.IO.NetCDF as nc
 
@@ -59 +59 @@
 def read_file(filename, variable_size, num_variables):
     # create a data array slice
-    slice_array_mask = Numeric.ones((XDIM,), 'd')
+    slice_array_mask = num.ones((XDIM,), 'd')
 
     # if timing file read, get start time
@@ -102 +102 @@
 
             var_array = fid.variables[varname][index,:]
-            if var_array != slice_array:
+            if num.any(var_array != slice_array):
                 result = False
                 if Verbose:
@@ -148 +148 @@
 
     # create a data array slice
-    slice_array_mask = Numeric.ones((XDIM,), 'd')
+    slice_array_mask = num.ones((XDIM,), 'd')
 
     # if timing file write, remember start time

misc/tools/write_large_files/rwi4_big_file.py

@@ -19 +19 @@
 import getopt
 import time
-import Numeric
+import numpy as num
 import Scientific.IO.NetCDF as nc
 
@@ -63 +63 @@
 def read_file(filename, variable_size, num_variables):
     # create a data array slice
-    slice_array_mask = Numeric.ones((XDIM,), 'd')
+    slice_array_mask = num.ones((XDIM,), 'd')
 
     # if timing file read, get start time
@@ -134 +134 @@
 
     # create a data array slice
-    slice_array_mask = Numeric.ones((XDIM,), 'd')
+    slice_array_mask = num.ones((XDIM,), 'd')
 
     # if timing file write, remember start time

misc/tools/write_large_files/rwi_big_file.py

@@ -19 +19 @@
 import getopt
 import time
-import Numeric
+import numpy as num
 import Scientific.IO.NetCDF as nc
 
@@ -63 +63 @@
 def read_file(filename, variable_size, num_variables):
     # create a data array slice
-    slice_array_mask = Numeric.ones((XDIM,), 'd')
+    slice_array_mask = num.ones((XDIM,), 'd')
 
     # if timing file read, get start time
@@ -137 +137 @@
 
     # create a data array slice
-    slice_array_mask = Numeric.ones((XDIM,), 'd')
+    slice_array_mask = num.ones((XDIM,), 'd')
 
     # if timing file write, remember start time

misc/tools/write_large_files/rwil_big_file.py

@@ -19 +19 @@
 import getopt
 import time
-import Numeric
+import numpy as num
 import Scientific.IO.NetCDF as nc
 
@@ -63 +63 @@
 def read_file(filename, variable_size, num_variables):
     # create a data array slice
-    slice_array_mask = Numeric.ones((XDIM,), 'd')
+    slice_array_mask = num.ones((XDIM,), 'd')
 
     # if timing file read, get start time
@@ -134 +134 @@
 
     # create a data array slice
-    slice_array_mask = Numeric.ones((XDIM,), 'd')
+    slice_array_mask = num.ones((XDIM,), 'd')
 
     # if timing file write, remember start time

misc/tools/write_large_files/write_big_file.py

@@ -7 +7 @@
 import getopt
 import time
-import Numeric
+import numpy as num
 import Scientific.IO.NetCDF as nc
 
@@ -54 +54 @@
 
     # create a data array slice
-    slice_array = Numeric.ones((XDIM,), 'i')
+    slice_array = num.ones((XDIM,), 'i')
 
     # if timing file write, remember start time