Changeset 8425

Timestamp:

May 8, 2012, 9:59:56 PM (13 years ago)

Author:

steve

Message:

Have a working test_parallel_frac_op unittest

Location:

trunk/anuga_core/source/anuga_parallel

Files:

• parallel_boyd_box_operator.py (modified) (1 diff)
• test_parallel_frac_op.py (modified) (11 diffs)

trunk/anuga_core/source/anuga_parallel/parallel_boyd_box_operator.py

@@ -97 +97 @@
     def parallel_safe(self):
 
-        print "ZZZZ parallel_boyd"
         return True
 

trunk/anuga_core/source/anuga_parallel/test_parallel_frac_op.py

@@ -15 +15 @@
                             
 #from anuga.culvert_flows.culvert_routines import boyd_generalised_culvert_model
-     
+
+
+#------------------------------------------
+# Import pypar without the initial output
+#------------------------------------------
+class NullStream:
+    def write(self,text):
+        pass
+sys.stdout = NullStream()
+import pypar
+sys.stdout = sys.__stdout__
+
+
 from math import pi, pow, sqrt
 
@@ -24 +36 @@
 
 from parallel_operator_factory import Inlet_operator, Boyd_box_operator
-import pypar
+
 import random
 import unittest
@@ -33 +45 @@
 This test exercises the parallel culvert and checks values
 """
-verbose = True
-nprocs = 2
+verbose = False
+nprocs = 3
     
 
@@ -170 +182 @@
                                   verbose=False)
         
-    if inlet0 is not None: inlet0.print_statistics()
-    if inlet1 is not None: inlet1.print_statistics()
-    if boyd_box0 is not None: boyd_box0.print_statistics()
+    if inlet0 is not None and verbose: inlet0.print_statistics()
+    if inlet1 is not None and verbose: inlet1.print_statistics()
+    if boyd_box0 is not None and verbose: boyd_box0.print_statistics()
 
 #    if parallel:
@@ -210 +222 @@
     ##-----------------------------------------------------------------------
 
-    for t in domain.evolve(yieldstep = 0.1, finaltime = 38):
-        if myid == 0:
+    for t in domain.evolve(yieldstep = 2.0, finaltime = 2.0):
+        if myid == 0 and verbose:
             domain.write_time()
 
@@ -219 +231 @@
 
 
-        if boyd_box0 is not None: boyd_box0.print_timestepping_statistics()
+        if boyd_box0 is not None and verbose : boyd_box0.print_timestepping_statistics()
  
         #for i in range(samples):
@@ -282 +294 @@
 
 
-        #assert(success)
+        assert(success)
 
     return control_data
@@ -290 +302 @@
 # against the sequential code.
 
-class Test_parallel_shallow_domain(unittest.TestCase):
-    def test_parallel_shallow_domain(self):
+class Test_parallel_frac_op(unittest.TestCase):
+    def test_parallel_frac_op(self):
         #print "Expect this test to fail if not run from the parallel directory."
-        result = os.system("mpirun -np %d python test_parallel_shallow_domain.py" % nprocs)
+        result = os.system("mpirun -np %d python test_parallel_frac_op.py" % nprocs)
         assert_(result == 0)
 
@@ -307 +319 @@
     if numprocs == 1:
         runner = unittest.TextTestRunner()
-        suite = unittest.makeSuite(Test_parallel_shallow_domain, 'test')
+        suite = unittest.makeSuite(Test_parallel_frac_op, 'test')
+        #print "Running for numproc = 1"
         runner.run(suite)
     else:
-
+        #print "Running for numproc > 1"
         pypar.barrier()
         test_points = []
@@ -328 +341 @@
 
         if myid == 0:
-            control_data = run_test(parallel=False, test_points = test_points, verbose = True)
+            control_data = run_test(parallel=False, test_points = test_points, verbose = verbose)
 
             for proc in range(1,numprocs):
@@ -337 +350 @@
 
         pypar.barrier()
-        run_test(parallel=True, control_data = control_data, test_points = test_points, verbose = True)
+        run_test(parallel=True, control_data = control_data, test_points = test_points, verbose = verbose)