Changeset 9220

Timestamp:

Jun 25, 2014, 9:03:17 PM (10 years ago)

Author:

steve

Message:

Should produce the same error for each run of test_parallel_frac_op.py

File:

• trunk/anuga_core/source/anuga_parallel/test_parallel_frac_op.py (modified) (7 diffs)

trunk/anuga_core/source/anuga_parallel/test_parallel_frac_op.py

@@ -13 +13 @@
 import warnings
 warnings.simplefilter("ignore")
-
-#from anuga.structures.boyd_box_operator import Boyd_box_operator
-#from anuga.structures.inlet_operator import Inlet_operator
-                            
-#from anuga.culvert_flows.culvert_routines import boyd_generalised_culvert_model
 
 
@@ -38 +33 @@
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
 
-#from parallel_operator_factory import Inlet_operator, Boyd_box_operator
 from anuga import Inlet_operator, Boyd_box_operator
 
@@ -246 +240 @@
                 if verbose: 
                     print 'P%d tri %d, control = %s, actual = %s, Success = %s' %(myid, i, control_data[i], stage.centroid_values[tri_ids[i]], local_success) 
-                assert local_success, 'Ouput P%d tri %d, control = %s, actual = %s, Success = %s' %(myid, i, control_data[i], stage.centroid_values[tri_ids[i]], local_success) 
-
-
-                
+                if not local_success:
+                    print 'Ouput P%d tri %d, control = %s, actual = %s, Success = %s' %(myid, i, control_data[i], stage.centroid_values[tri_ids[i]], local_success) 
+
+
+        #assert success        
                 
         if inlet0 is not None:
@@ -274 +269 @@
         #assert(success)
 
-    return control_data
+    return control_data, success
 
 
@@ -308 +303 @@
         if myid == 0:
             if verbose: print 'PARALLEL START'
+            random.seed(2)
             for i in range(samples):
                 x = random.randrange(0,1000)/1000.0 * length
@@ -320 +316 @@
 
         if myid == 0:
-            control_data = run_test(parallel=False, test_points = test_points, verbose = verbose)
+            control_data, success  = run_test(parallel=False, test_points = test_points, verbose = verbose)
 
             for proc in range(1,numprocs):
@@ -329 +325 @@
 
         pypar.barrier()
-        run_test(parallel=True, control_data = control_data, test_points = test_points, verbose = verbose)
-
+        _, success = run_test(parallel=True, control_data = control_data, test_points = test_points, verbose = verbose)
+
+        sys.stdout.flush()
+
+        pypar.barrier()
+
+        msg = 'Discrepency between sequential and parallel runs on P%g' % myid
+        assert success, msg
 
     finalize()