Changeset 7447 for anuga_core/source/anuga_parallel/parallel_shallow_water.py

Timestamp:

Aug 28, 2009, 2:34:39 PM (15 years ago)

Author:

steve

Message:

Concentrating code

File:

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

anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -22 +22 @@
 
 
-from anuga.shallow_water.shallow_water_domain import *
+from anuga.interface import Domain
 
 
@@ -52 +52 @@
         N = len(self) # number_of_triangles
 
-#        self.processor = pypar.rank()
-#        self.numproc   = pypar.size()
-#
-#        # Setup Communication Buffers
-#        self.nsys = 3
-#        for key in full_send_dict:
-#            buffer_shape = full_send_dict[key][0].shape[0]
-#            full_send_dict[key].append(num.zeros( (buffer_shape,self.nsys) ,num.loat))
-#
-#
-#        for key in ghost_recv_dict:
-#            buffer_shape = ghost_recv_dict[key][0].shape[0]
-#            ghost_recv_dict[key].append(num.zeros( (buffer_shape,self.nsys) ,num.float))
-#
-#        self.full_send_dict  = full_send_dict
-        self.ghost_recv_dict = ghost_recv_dict
 
         # Buffers for synchronisation of timesteps
@@ -73 +57 @@
         self.global_timestep = num.zeros(1, num.float)
 
-        self.local_timesteps = num.zeros(self.numproc, num.loat)
+        self.local_timesteps = num.zeros(self.numproc, num.float)
 
 
@@ -150 +134 @@
 
         import time
+
         #Compute minimal timestep across all processes
         self.local_timestep[0] = self.flux_timestep
@@ -167 +152 @@
                 for i in range(1, self.numproc):
                     pypar.receive(i,
-                                  buffer=self.local_timestep,
-                                  bypass=True)
+                                  buffer=self.local_timestep)
 
                     if self.local_timestep[0] < self.global_timestep[0]:
@@ -174 +158 @@
             else:
                 pypar.send(self.local_timestep, 0,
-                           use_buffer=True, bypass=True)
+                           use_buffer=True)
 
 
@@ -187 +171 @@
         self.communication_broadcast_time += time.time()-t0
 
-        #old_timestep = self.flux_timestep
+        old_timestep = self.flux_timestep
         self.flux_timestep = self.global_timestep[0]
         #print 'Flux Timestep %15.5e %15.5e P%d_%d' %(self.flux_timestep, old_timestep, self.processor, self.numproc)
@@ -209 +193 @@
         # the separate processors
 
-
-        from Numeric import take,put
+        import numpy as num
         import time
         t0 = time.time()
@@ -227 +210 @@
                             #print 'Send',i,q
                             Q_cv =  self.quantities[q].centroid_values
-                            Xout[:,i] = take(Q_cv, Idf)
-
-                        pypar.send(Xout, send_proc,
-                                   use_buffer=True, bypass = True)
+                            Xout[:,i] = num.take(Q_cv, Idf)
+
+                        pypar.send(Xout, int(send_proc), use_buffer=True)
 
 
@@ -238 +220 @@
 
                     Idg = self.ghost_recv_dict[iproc][0]
-                    X = self.ghost_recv_dict[iproc][2]
-
-                    X = pypar.receive(iproc, buffer=X, bypass = True)
+                    X   = self.ghost_recv_dict[iproc][2]
+
+                    X = pypar.receive(int(iproc), buffer=X)
 
                     for i, q in enumerate(self.conserved_quantities):
                         #print 'Receive',i,q
                         Q_cv =  self.quantities[q].centroid_values
-                        put(Q_cv, Idg, X[:,i])
+                        num.put(Q_cv, Idg, X[:,i])
 
         #local update of ghost cells
@@ -262 +244 @@
                 #print 'LOCAL SEND RECEIVE',i,q
                 Q_cv =  self.quantities[q].centroid_values
-                put(Q_cv,     Idg, take(Q_cv,     Idf))
+                num.put(Q_cv, Idg, num.take(Q_cv, Idf))
 
         self.communication_time += time.time()-t0
 
-'''
-This was removed due to not beening required to be redefined in parallel_shallow_water
-the original "write_time" is good... however might need some small edits to work properly 
-with parallel- Nick and Ole April 2007
-    def write_time(self):
-        if self.min_timestep == self.max_timestep:
-            print 'Processor %d/%d, Time = %.4f, delta t = %.8f, steps=%d (%d)'\
-                  %(self.processor, self.numproc,
-                    self.time, self.min_timestep, self.number_of_steps,
-                    self.number_of_first_order_steps)
-        elif self.min_timestep > self.max_timestep:
-            print 'Processor %d/%d, Time = %.4f, steps=%d (%d)'\
-                  %(self.processor, self.numproc,
-                    self.time, self.number_of_steps,
-                    self.number_of_first_order_steps)
-        else:
-            print 'Processor %d/%d, Time = %.4f, delta t in [%.8f, %.8f], steps=%d (%d)'\
-                  %(self.processor, self.numproc,
-                    self.time, self.min_timestep,
-                    self.max_timestep, self.number_of_steps,
-                    self.number_of_first_order_steps)
-'''
+
+## This was removed due to not beening required to be redefined in parallel_shallow_water
+## the original "write_time" is good... however might need some small edits to work properly 
+## with parallel- Nick and Ole April 2007
+##     def write_time(self):
+##         if self.min_timestep == self.max_timestep:
+##             print 'Processor %d/%d, Time = %.4f, delta t = %.8f, steps=%d (%d)'\
+##                   %(self.processor, self.numproc,
+##                     self.time, self.min_timestep, self.number_of_steps,
+##                     self.number_of_first_order_steps)
+##         elif self.min_timestep > self.max_timestep:
+##             print 'Processor %d/%d, Time = %.4f, steps=%d (%d)'\
+##                   %(self.processor, self.numproc,
+##                     self.time, self.number_of_steps,
+##                     self.number_of_first_order_steps)
+##         else:
+##             print 'Processor %d/%d, Time = %.4f, delta t in [%.8f, %.8f], steps=%d (%d)'\
+##                   %(self.processor, self.numproc,
+##                     self.time, self.min_timestep,
+##                     self.max_timestep, self.number_of_steps,
+##                     self.number_of_first_order_steps)
+
 
 # commented out on the 7/11/06