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

Timestamp:

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

Author:

steve

Message:

Commit a working copy of numpy version of build_commun

File:

• anuga_core/source/anuga_parallel/parallel_meshes.py (modified) (9 diffs)

anuga_core/source/anuga_parallel/parallel_meshes.py

@@ -15 +15 @@
 
 import sys
-from Numeric import array, zeros, Float, Int, ones, sum
-
+#from Numeric import array, zeros, Float, Int, ones, sum
+
+import numpy as num
 import pypar
 
@@ -86 +87 @@
     E = EIndex(n,m)
 
-    points = zeros( (Np,2), Float)
+    points = num.zeros( (Np,2), num.float)
 
     for i in range(m+1):
@@ -98 +99 @@
 
 
-    elements = zeros( (Nt,3), Int)
+    elements = num.zeros( (Nt,3), num.int)
     boundary = {}
     Idgl = []
@@ -170 +171 @@
         print Idgr
         
-        Idfl = array(Idfl,Int)
-        Idgr = array(Idgr,Int)
+        Idfl = num.array(Idfl,num.int)
+        Idgr = num.array(Idgr,num.int)
 
         print Idfl
@@ -184 +185 @@
         Idfl.extend(Idfr)
         Idgr.extend(Idgl)
-        Idfl = array(Idfl,Int)
-        Idgr = array(Idgr,Int)
+        Idfl = num.array(Idfl,num.int)
+        Idgr = num.array(Idgr,num.int)
         full_send_dict[(processor-1)%numproc]  = [Idfl, Idfl]
         ghost_recv_dict[(processor-1)%numproc] = [Idgr, Idgr]
     else:
-        Idfl = array(Idfl,Int)
-        Idgl = array(Idgl,Int)
-
-        Idfr = array(Idfr,Int)
-        Idgr = array(Idgr,Int)
+        Idfl = num.array(Idfl,num.int)
+        Idgl = num.array(Idgl,num.int)
+
+        Idfr = num.array(Idfr,num.int)
+        Idgr = num.array(Idgr,num.int)
 
         full_send_dict[(processor-1)%numproc]  = [Idfl, Idfl]
@@ -252 +253 @@
     E = EIndex(n,m)
 
-    points = zeros( (Np,2), Float)
+    points = num.zeros( (Np,2), num.float)
 
     for i in range(m+1):
@@ -264 +265 @@
 
 
-    elements = zeros( (Nt,3), Int)
+    elements = num.zeros( (Nt,3), num.int)
     boundary = {}
     ghosts = {}
@@ -389 +390 @@
     E = EIndex(n,m)
 
-    points = zeros( (Np,2), Float)
+    points = num.zeros( (Np,2), num.float)
 
     for i in range(m+1):
@@ -401 +402 @@
 
 
-    elements = zeros( (Nt,3), Int)
+    elements = num.zeros( (Nt,3), num.int)
     boundary = {}
     ghosts = {}