Changeset 6553 for branches/numpy/anuga/shallow_water/data_manager.py

Timestamp:

Mar 19, 2009, 1:43:34 PM (16 years ago)

Author:

rwilson

Message:

Merged trunk into numpy, all tests and validations work.

File:

• branches/numpy/anuga/shallow_water/data_manager.py (modified) (3 diffs)

branches/numpy/anuga/shallow_water/data_manager.py

@@ -3236 +3236 @@
             volumes.append([v4,v3,v2]) #Lower element
 
-    volumes = num.array(volumes)
+    volumes = num.array(volumes, num.int)      #array default#
 
     if origin is None:
@@ -4152 +4152 @@
             volumes.append([v4,v2,v3]) #Lower element
 
-    volumes = num.array(volumes)
+    volumes = num.array(volumes, num.int)      #array default#
 
     geo_ref = Geo_reference(refzone, min(x), min(y))
@@ -5571 +5571 @@
     for i in range(len(quantities)):
         for file_in in files_in[i]:
-            if (os.access(file_in, os.F_OK) == 0):
+            if (os.access(file_in, os.R_OK) == 0):
                 msg = 'File %s does not exist or is not accessible' % file_in
                 raise IOError, msg