Changeset 8026

Timestamp:

Sep 24, 2010, 5:56:21 PM (13 years ago)

Author:

steve

Message:

fixed up pypar_available

File:

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

trunk/anuga_core/source/anuga_parallel/parallel_meshes.py

@@ -17 +17 @@
 import numpy as num
 
-from anuga_parallel.parallel_abstraction import pypar_available
-import pypar
-
 from anuga.config import epsilon
 
 
-if pypar_available 
+from parallel_api import distribute
+from parallel_api import myid, numprocs, get_processor_name
+from parallel_api import send, receive
+from parallel_api import pypar_available, barrier, finalize
+
 
 
@@ -40 +41 @@
     """
 
-    processor = pypar.rank()
-    numproc   = pypar.size()
-
-    #print 'numproc',numproc
-    #print 'processor ',processor
-
-    m_low, m_high = pypar.balance(m_g, numproc, processor)
+
+
+    m_low, m_high = pypar.balance(m_g, numprocs, myid)
     
     n = n_g
@@ -132 +129 @@
 
             if i == m-1:
-                if processor == numproc-1:
+                if myid == numprocs-1:
                     boundary[nt, 2] = 'right'
                 else:
@@ -156 +153 @@
 
             if i == 0:
-                if processor == 0:
+                if myid == 0:
                     boundary[nt, 2] = 'left'
                 else:
@@ -164 +161 @@
             elements[nt,:] = [i1,i2,i3]
 
-    if numproc==1:
+    if numprocs==1:
         Idfl.extend(Idfr)
         Idgr.extend(Idgl)
@@ -177 +174 @@
         #print Idgr
         
-        full_send_dict[processor]  = [Idfl, Idfl]
-        ghost_recv_dict[processor] = [Idgr, Idgr]
-
-        #print  full_send_dict[processor]
-        #print ghost_recv_dict[processor]
-    elif numproc == 2:
+        full_send_dict[myid]  = [Idfl, Idfl]
+        ghost_recv_dict[myid] = [Idgr, Idgr]
+
+
+    elif numprocs == 2:
         Idfl.extend(Idfr)
         Idgr.extend(Idgl)
         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]
+        full_send_dict[(myid-1)%numprocs]  = [Idfl, Idfl]
+        ghost_recv_dict[(myid-1)%numprocs] = [Idgr, Idgr]
     else:
         Idfl = num.array(Idfl,num.int)
@@ -196 +192 @@
         Idgr = num.array(Idgr,num.int)
 
-        full_send_dict[(processor-1)%numproc]  = [Idfl, Idfl]
-        ghost_recv_dict[(processor-1)%numproc] = [Idgl, Idgl]
-        full_send_dict[(processor+1)%numproc]  = [Idfr, Idfr]
-        ghost_recv_dict[(processor+1)%numproc] = [Idgr, Idgr]
+        full_send_dict[(myid-1)%numprocs]  = [Idfl, Idfl]
+        ghost_recv_dict[(myid-1)%numprocs] = [Idgl, Idgl]
+        full_send_dict[(myid+1)%numprocs]  = [Idfr, Idfr]
+        ghost_recv_dict[(myid+1)%numprocs] = [Idgr, Idgr]
 
 
@@ -291 +287 @@
 
             if i == m-1:
-                if processor == numproc-1:
+                if myid == numprocs-1:
                     boundary[nt, 2] = 'right'
                 else:
@@ -313 +309 @@
 
             if i == 0:
-                if processor == 0:
+                if myid == 0:
                     boundary[nt, 2] = 'left'
                 else:
@@ -422 +418 @@
 
             if i == m-1:
-                if processor == numproc-1:
+                if myid == numprocs-1:
                     boundary[nt, 2] = 'right'
                 else:
@@ -438 +434 @@
 
             if i == 0:
-                if processor == 0:
+                if myid == 0:
                     boundary[nt, 2] = 'left'
                 else: