Changeset 1426

Timestamp:

May 18, 2005, 11:18:36 PM (20 years ago)

Author:

steve

Message:

 

Location:

inundation/ga/storm_surge

Files:

• parallel/parallel_advection.py (modified) (6 diffs)
• parallel/run_parallel_advection.py (modified) (1 diff)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/parallel/parallel_advection.py

@@ -28 +28 @@
         self.processor = pypar.rank()
         self.numproc   = pypar.size()
-        print 'Processor %d'%self.processor
-        velocity = [(self.processor+1),0.0]
-
-        print 'velocity',velocity
+        #print 'Processor %d'%self.processor
+        #velocity = [(self.processor+1),0.0]
+
+        #print 'velocity',velocity
 
         Advection_Domain.__init__(self, coordinates, vertices, boundary, velocity)
@@ -84 +84 @@
 
         # update of non-local ghost cells
-#        for iproc in range(self.numproc):
-#
-#            if iproc == self.processor:
-#                #Send data from iproc processor to other processors
-#                for send_proc in full_send_dict:
-#                    if send_proc != iproc:
-#                        Idf  = full_send_dict[iproc][0]
-#                        Xout = full_send_dict[iproc][1]
-#                        for i _ in enumerate(X):
-#                            Xout[i] = stage_cv[Idf[i]]
-#                        pypar.send(Xout,send_proc)
-#            else:
-#                #Receive data from the iproc processor
-#                if  ghost_recv_dict.has_key(iproc):
-#                    Idg = ghost_recv_dict[iproc][0]
-#                    X   = ghost_recv_dict[iproc][1]
-#                    X = pypar.receive(iproc,X)
-#                    for i _ in enumerate(X):
-#                        stage_cv[Idg[i]] = X[i]
+        for iproc in range(self.numproc):
+
+            if iproc == self.processor:
+                #Send data from iproc processor to other processors
+                for send_proc in self.full_send_dict:
+                    if send_proc != iproc:
+                        Idf  = self.full_send_dict[send_proc][0]
+                        Xout = self.full_send_dict[send_proc][1]
+                        for i, _ in enumerate(Xout):
+                            Xout[i] = stage_cv[Idf[i]]
+
+                        pypar.send(Xout,send_proc)
+                        print 'Processor %d Sending to Processor %d'%(self.processor,send_proc)
+            else:
+                #Receive data from the iproc processor
+                if  self.ghost_recv_dict.has_key(iproc):
+                    Idg = self.ghost_recv_dict[iproc][0]
+                    X   = self.ghost_recv_dict[iproc][1]
+
+                    X = pypar.receive(iproc,X)
+                    print 'Processor %d receiving from Processor %d'%(self.processor,iproc)
+                    for i, _ in enumerate(X):
+                        stage_cv[Idg[i]] = X[i]
+            pypar.barrier()
 
         #local update of ghost cells
@@ -220 +225 @@
     elements = zeros( (Nt,3), Int)
     boundary = {}
-    Idg = []
-    Xg  = []
-    Idf = []
-    Xf  = []
+    Idgl = []
+    Xgl  = []
+    Idfl = []
+    Xfl  = []
+    Idgr = []
+    Xgr  = []
+    Idfr = []
+    Xfr  = []
 
     full_send_dict = {}
@@ -240 +249 @@
             if i == m-1:
                 #print 'nt =',nt
-                Idg.append(nt)
-                Idf.append(E(1,j))
-            if i == 0:
-                Idg.append(nt)
-                Idf.append(E(m-2,j))
+                Idgr.append(nt)
+                Idfr.append(E(1,j))
+            if i == 0:
+                Idgl.append(nt)
+                Idfl.append(E(m-2,j))
 
             if i == m-1:
@@ -255 +264 @@
             nt = E(i,j)+1
             if i == m-1:
-                Idg.append(nt)
-                Idf.append(E(1,j)+1)
-            if i == 0:
-                Idg.append(nt)
-                Idf.append(E(m-2,j)+1)
+                Idgr.append(nt)
+                Idfr.append(E(1,j)+1)
+            if i == 0:
+                Idgl.append(nt)
+                Idfl.append(E(m-2,j)+1)
 
             if i == 0:
@@ -267 +276 @@
             elements[nt,:] = [i1,i2,i3]
 
-    Idf = array(Idf,Int)
-    Idg = array(Idg,Int)
-    Xf  = zeros(Idf.shape,Float)
-    Xg  = zeros(Idg.shape,Float)
+    Idfl = array(Idfl,Int)
+    Idgl = array(Idgl,Int)
+    Xfl  = zeros(Idfl.shape,Float)
+    Xgl  = zeros(Idgl.shape,Float)
+
+    Idfr = array(Idfr,Int)
+    Idgr = array(Idgr,Int)
+    Xfr  = zeros(Idfr.shape,Float)
+    Xgr  = zeros(Idgr.shape,Float)
 
     #print Idf
     #print Idg
-    full_send_dict[processor]  = [Idf, Xf]
-    ghost_recv_dict[processor] = [Idg, Xg]
+    full_send_dict[(processor-1)%numproc]  = [Idfl, Xfl]
+    ghost_recv_dict[(processor-1)%numproc] = [Idgl, Xgl]
+    full_send_dict[(processor+1)%numproc]  = [Idfr, Xfr]
+    ghost_recv_dict[(processor+1)%numproc] = [Idgr, Xgr]
 
     return  points, elements, boundary, full_send_dict, ghost_recv_dict

inundation/ga/storm_surge/parallel/run_parallel_advection.py

@@ -52 +52 @@
         return self.h*((x>self.x0)&(x<self.x1))
 
-domain.set_quantity('stage', Set_Stage(0.2,0.4,1.0))
+if myid == 0:
+    domain.set_quantity('stage', Set_Stage(0.2,0.4,1.0))
 
 #Check that the boundary value gets propagated to all elements
-for t in domain.evolve(yieldstep = 0.01, finaltime = 1.0):
+for t in domain.evolve(yieldstep = 0.01, finaltime = 0.02):
     domain.write_time()