Changeset 8115

Timestamp:

Jan 25, 2011, 5:51:31 PM (14 years ago)

Author:

steve

Message:

Updating a few parallel test

Location:

trunk/anuga_core/source/anuga_parallel

Files:

• interface.py (deleted)
• parallel_abstraction.py (modified) (1 diff)
• parallel_shallow_water.py (modified) (1 diff)
• run_parallel_sw_merimbula.py (modified) (1 diff)
• test_all.py (modified) (2 diffs)
• test_parallel_distribute_mesh.py (modified) (1 diff)
• test_parallel_file_boundary.py (modified) (1 diff)
• test_parallel_sw_flow.py (modified) (7 diffs)

trunk/anuga_core/source/anuga_parallel/parallel_abstraction.py

@@ -5 +5 @@
 """
 
+class NullStream:
+    def write(self,text):
+        pass
+        
+
+
+
 try:
-    import pypar 
+    import sys
+    sys.stdout = NullStream()
+    import pypar
+    sys.stdout = sys.__stdout__ 
 except:
     print 'WARNING: Could not import pypar - defining sequential interface'

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -66 +66 @@
 
 
+
     def update_ghosts(self):
 

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -109 +109 @@
 
 if myid == 0:
+    print 'Number of processors %g ' %numprocs
     print 'That took %.2f seconds' %(time.time()-t0)
     print 'Communication time %.2f seconds'%domain.communication_time

trunk/anuga_core/source/anuga_parallel/test_all.py

@@ -20 +20 @@
 #List files that should be excluded from the testing process.
 #E.g. if they are known to fail and under development
-exclude_files = ['test_parallel_distribute_domain.py','test_parallel_sw_flow.py']
+exclude_files = ['test_parallel_distribute_domain.py']
 
 # Directories that should not be searched for test files.
@@ -201 +201 @@
         test_verbose = False
     suite = regressionTest(test_verbose)
-    runner = unittest.TextTestRunner(verbosity=2)
+    runner = unittest.TextTestRunner(verbosity=1)
     runner.run(suite)
 

trunk/anuga_core/source/anuga_parallel/test_parallel_distribute_mesh.py

@@ -15 +15 @@
 from anuga_parallel.distribute_mesh import extract_hostmesh, rec_submesh, send_submesh
 
-from anuga_parallel.interface import myid, numprocs, barrier, finalize
+from anuga_parallel import myid, numprocs, barrier, finalize
 
 import numpy as num

trunk/anuga_core/source/anuga_parallel/test_parallel_file_boundary.py

@@ -56 +56 @@
 from anuga import create_domain_from_file
 
-from anuga_parallel.interface import distribute, myid, numprocs, send, receive, barrier, finalize
+from anuga_parallel import distribute, myid, numprocs, send, receive, barrier, finalize
 
 from anuga.file.test_mux import Test_Mux

trunk/anuga_core/source/anuga_parallel/test_parallel_sw_flow.py

@@ -27 +27 @@
 
 
-from anuga_parallel.interface import distribute, myid, numprocs, send, receive, barrier, finalize
+from anuga_parallel import distribute, myid, numprocs, send, receive, barrier, finalize
 
 #--------------------------------------------------------------------------
@@ -35 +35 @@
 finaltime = 6.0
 nprocs = 4
-N = 25
-M = 25
-verbose = True 
+N = 29
+M = 29 
+verbose = False
 
 #---------------------------------
@@ -48 +48 @@
 # Setup Test
 ##########################################################################
-def evolution_test(parallel=False, G = None, seq_interpolation_points=None):
+def evolution_test(parallel=False, G = None, seq_interpolation_points=None, verbose=False):
 
     #--------------------------------------------------------------------------
@@ -103 +103 @@
 
         #if is_inside_polygon(point, domain.get_boundary_polygon()):
+        #print "Point ", myid, i, point
         try:
             k = domain.get_triangle_containing_point(point)
@@ -112 +113 @@
             tri_ids.append(-2)
 
-
+        #print "  tri_ids ",myid, i, tri_ids[-1]
+                
     if verbose: print 'P%d has points = %s' %(myid, tri_ids)
 
@@ -120 +122 @@
     for id in tri_ids:
         if id<1:
-            print 'ERROR: All interpolation points be within the sequential domain!'
+            if verbose: print 'WARNING: Interpolation point not within the domain!'
         interpolation_points.append(c_coord[id,:])
             
@@ -170 +172 @@
 class Test_parallel_sw_flow(unittest.TestCase):
     def test_parallel_sw_flow(self):
-        print "Expect this test to fail if not run from the parallel directory."
+        if verbose : print "Expect this test to fail if not run from the parallel directory."
         result = os.system("mpirun -np %d python test_parallel_sw_flow.py" % nprocs)
         assert_(result == 0)