Changeset 7400 for anuga_core/source/anuga_parallel/pmesh_divide.py

Timestamp:

Aug 21, 2009, 2:02:46 PM (15 years ago)

Author:

steve

Message:

Commit a working copy of numpy version of build_commun

File:

• anuga_core/source/anuga_parallel/pmesh_divide.py (modified) (10 diffs)

anuga_core/source/anuga_parallel/pmesh_divide.py

@@ -12 +12 @@
 #  Modified: Linda Stals, Nov 2005
 #            Jack Kelly, Nov 2005
+#            Steve Roberts, Aug 2009 (updating to numpy)
 #
 #
@@ -20 +21 @@
 from math import floor
 
-from Numeric import zeros, Float, Int, reshape, argsort, ArrayType
-
+import numpy as num
+#import zeros, float, Int, reshape, argsort, ArrayType
 
 #########################################################
@@ -49 +50 @@
     # Temporary storage area
 
-    index = zeros(N, Int)
+    index = num.zeros(N, num.int)
     q_reord = {}
 
@@ -62 +63 @@
 
     for k in quantities:
-        q_reord[k] = zeros((N, 3), Float)
+        q_reord[k] = num.zeros((N, 3), num.float)
         for i in range(N):
             q_reord[k][index[i]]=quantities[k].vertex_values[i]
@@ -88 +89 @@
 
 try:
-    
     from pymetis.metis import partMeshNodal
 except ImportError:
@@ -96 +96 @@
     print "***************************************************"
     raise ImportError
+
 def pmesh_divide_metis(domain, n_procs):
     
@@ -121 +122 @@
         n_vert = domain.get_number_of_nodes()
         t_list = domain.triangles.copy()
-        t_list = reshape(t_list, (-1,))
+        t_list = num.reshape(t_list, (-1,))
     
         # The 1 here is for triangular mesh elements.
@@ -133 +134 @@
         # Sometimes (usu. on x86_64), partMeshNodal returnes an array of zero
         # dimensional arrays. Correct this.
-        if type(epart[0]) == ArrayType:
-            epart_new = zeros(len(epart), Int)
+        if type(epart[0]) == num.ndarray:
+            epart_new = num.zeros(len(epart), num.int)
             for i in range(len(epart)):
                 epart_new[i] = epart[i][0]
@@ -184 +185 @@
         quantities = {}
         for k in domain.quantities:
-            quantities[k] = zeros((n_tri, 3), Float)
+            quantities[k] = num.zeros((n_tri, 3), num.float)
             for i in range(n_tri):
                 quantities[k][i] = domain.quantities[k].vertex_values[i]
@@ -195 +196 @@
     # this helps with the communication
 
-    ttriangles = zeros((len(triangles), 3), Int)
+    ttriangles = num.zeros((len(triangles), 3), num.int)
     for i in range(len(triangles)):
         ttriangles[i] = triangles[i]