Changeset 3586

Timestamp:

Sep 14, 2006, 9:27:07 AM (19 years ago)

Author:

ole

Message:

Moved parallel api

Location:

anuga_core/source/anuga_parallel

Files:

• parallel_api.py (moved) (moved from anuga_work/production/wollongong_2006/parallel_api.py)
• parallel_shallow_water.py (modified) (1 diff)
• test_parallel_sw.py (modified) (5 diffs)

anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -255 +255 @@
     def write_time(self):
         if self.min_timestep == self.max_timestep:
-            print 'Processor %d, Time = %.4f, delta t = %.8f, steps=%d (%d)'\
-                  %(self.processor, self.time, self.min_timestep, self.number_of_steps,
+            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, Time = %.4f, steps=%d (%d)'\
-                  %(self.processor, self.time, self.number_of_steps,
+            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, Time = %.4f, delta t in [%.8f, %.8f], steps=%d (%d)'\
-                  %(self.processor, self.time, self.min_timestep,
+            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)

anuga_core/source/anuga_parallel/test_parallel_sw.py

@@ -3 +3 @@
 # a run of the parallel shallow water domain.
 # WARNING: This assumes that the command to run jobs is mpirun.
-# Tested with MPICH.
+# Tested with MPICH and LAM (Ole)
 
 #mesh_filename = "test-100.tsh"
@@ -118 +118 @@
         if myid == 0:
             domain.write_time()
+            #print edges[:,1]            
             for p in range(1, numprocs):
                 pypar.receive(p, recv_norm)
@@ -161 +162 @@
         domain_full.write_time()
         edge = domain_full.quantities[quantity].edge_values
+        #print edge[:,1]
         l1norm[0] = l1_norm(edge[:,0])
         l1norm[1] = l1_norm(edge[:,1])
@@ -199 +201 @@
         if pypar.rank() == 0:
             l1norm_seq, l2norm_seq, linfnorm_seq = sequential_test()
+            
         l1norm_par, l2norm_par, linfnorm_par = parallel_test()
+        
         if pypar.rank() == 0:
+            #print l2norm_seq, l2norm_par
+            
             assert_(len(l1norm_seq) == len(l1norm_par))
             assert_(len(l2norm_seq) == len(l2norm_par))
@@ -224 +230 @@
                         assert_(abs(l2norm_par[x][y] - l2norm_par[x-1][y]) < tol)
                         assert_(abs(linfnorm_par[x][y] - linfnorm_par[x-1][y]) < tol)
+
+        if pypar.rank() == 0:
+            print 'Parallel test OK'
+
         pypar.finalize()
-