Changeset 1588 for inundation/ga/storm_surge/parallel/parallel_shallow_water.py

Timestamp:

Jul 7, 2005, 5:02:56 PM (19 years ago)

Author:

steve

Message:

Sped up communications with numeric put and take commands

File:

• inundation/ga/storm_surge/parallel/parallel_shallow_water.py (modified) (5 diffs)

inundation/ga/storm_surge/parallel/parallel_shallow_water.py

@@ -108 +108 @@
 
 
+        from Numeric import take,put
         import time
         t0 = time.time()
@@ -125 +126 @@
                         Xout = self.full_send_dict[send_proc][2]
 
-                        N = len(Idf)
-
-                        for i in range(N):
-                            Xout[i,0] = stage_cv[Idf[i]]
-                            Xout[i,1] = xmomentum_cv[Idf[i]]
-                            Xout[i,2] = ymomentum_cv[Idf[i]]
-
+                        Xout[:,0] = take(stage_cv,     Idf)
+                        Xout[:,1] = take(xmomentum_cv, Idf)
+                        Xout[:,2] = take(ymomentum_cv, Idf)
 
                         pypar.send(Xout,send_proc)
@@ -144 +141 @@
 
                     X = pypar.receive(iproc,X)
-                    N = len(Idg)
 
-                    for i in range(N):
-                        stage_cv[Idg[i]]     = X[i,0]
-                        xmomentum_cv[Idg[i]] = X[i,1]
-                        ymomentum_cv[Idg[i]] = X[i,2]
-
+                    put(stage_cv,     Idg, X[:,0])
+                    put(xmomentum_cv, Idg, X[:,1])
+                    put(ymomentum_cv, Idg, X[:,2])
 
         #local update of ghost cells
@@ -164 +158 @@
             Idg = self.ghost_recv_dict[iproc][0]
 
-            N = len(Idg)
-
-            for i in range(N):
-                stage_cv[Idg[i]]     = stage_cv[Idf[i]]
-                xmomentum_cv[Idg[i]] = xmomentum_cv[Idf[i]]
-                ymomentum_cv[Idg[i]] = ymomentum_cv[Idf[i]]
+            put(stage_cv,     Idg, take(stage_cv,     Idf))
+            put(xmomentum_cv, Idg, take(xmomentum_cv, Idf))
+            put(ymomentum_cv, Idg, take(ymomentum_cv, Idf))
 
         self.communication_time += time.time()-t0
@@ -203 +194 @@
             #Pass control on to outer loop for more specific actions
             yield(t)
-