Changeset 9384

Timestamp:

Dec 17, 2014, 12:57:26 PM (10 years ago)

Author:

steve

Message:

added code to deal with numpy.add.at not being available in version <1.8

File:

• trunk/anuga_core/source/anuga/file/sww.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/file/sww.py

@@ -1372 +1372 @@
         shape = quantity.shape
         
+        def my_num_add_at(a,indices,b):
+            """ 
+            Use the numpy add.at opperation if it is available, (numpy version >1.8)
+            otherwise just use a quick and dirty implementation via a python loop
+            """
+            
+            try:
+                num.add.at(a, indices, b)
+            except:
+                n_ids = len(indices)
+                b_array = num.zeros_like(indices,dtype=num.float)
+                b_array[:] = b
+             
+                for n in xrange(n_ids):
+                    a[indices[n]] = a[indices[n]] + b_array[n]
+                    
+        
+        
         if len(shape) == 2:
             # time array
@@ -1384 +1402 @@
         
             count_uv = num.zeros(len(mesh.nodes))
-            num.add.at(count_uv, mesh_ids, 1)
+            my_num_add_at(count_uv, mesh_ids, 1)
    
             for i in range(n_time):
-                num.add.at(temp_uv[i,:], mesh_ids, quantity[i,:] )
+                my_num_add_at(temp_uv[i,:], mesh_ids, quantity[i,:] )
                 temp_uv[i,:] = temp_uv[i,:]/count_uv
    
@@ -1399 +1417 @@
 
             count_uv = num.zeros(len(mesh.nodes))
-            num.add.at(count_uv, mesh_ids, 1)
-            num.add.at(temp_uv, mesh_ids, quantity )
+            my_num_add_at(count_uv, mesh_ids, 1)
+            my_num_add_at(temp_uv, mesh_ids, quantity )
             
         else: