Changeset 7276 for anuga_core/source/anuga/caching/caching.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/caching/caching.py (modified) (4 diffs)

anuga_core/source/anuga/caching/caching.py

@@ -51 +51 @@
   unix = True
 
-import Numeric as num
+import numpy as num
 
 
@@ -1394 +1394 @@
       I.sort()    
       val = myhash(I, ids)
-  elif type(T) == num.ArrayType:
+  elif isinstance(T, num.ndarray):
       T = num.array(T) # Ensure array is contiguous
 
@@ -1465 +1465 @@
             identical = compare(a, b, ids)
             
-    elif type(A) == num.ArrayType:
+    elif isinstance(A, num.ndarray):
         # Use element by element comparison
         identical = num.alltrue(A==B)
@@ -2439 +2439 @@
       argstr = argstr + "'"+str(args)+"'"
     else:
-      # Truncate large Numeric arrays before using str()
-      if type(args) == num.ArrayType:
+      # Truncate large numeric arrays before using str()
+      if isinstance(args, num.ndarray):
 #        if len(args.flat) > textwidth:  
 #        Changed by Duncan and Nick 21/2/07 .flat has problems with