Changeset 8664 for trunk/anuga_core

Timestamp:

Dec 5, 2012, 7:35:27 PM (12 years ago)

Author:

steve

Message:

Removed print statement in sww_merge

Location:

trunk/anuga_core/source

Files:

• anuga/utilities/sww_merge.py (modified) (1 diff)
• anuga_parallel/parallel_shallow_water.py (modified) (1 diff)

trunk/anuga_core/source/anuga/utilities/sww_merge.py

@@ -333 +333 @@
             #             num.array(fid.variables[quantity],dtype=num.float32)
             q = fid.variables[quantity]
-            print quantity, q.shape
+            #print quantity, q.shape
             out_s_quantities[quantity][f_node_l2g] = \
                          num.array(q,dtype=num.float32)[fl_nodes]

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -156 +156 @@
     def sww_merge(self, verbose=False, delete_old=False):
 
+        # make sure all the computations have finished
+
+        pypar.barrier()
+
+        # now on processor pull all the separate sww files together
         if self.processor == 0 and self.numproc > 1 and self.store :
             import anuga.utilities.sww_merge as merge