Changeset 8283

Timestamp:

Dec 14, 2011, 7:57:13 PM (13 years ago)

Author:

steve

Message:

This working on sww_merge

Location:

trunk/anuga_core/source/anuga_parallel

Files:

• parallel_shallow_water.py (modified) (1 diff)
• run_parallel_sw_merimbula.py (modified) (1 diff)
• test-20.tsh (added)

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -134 +134 @@
             import anuga.utilities.sww_merge as merge
             
-            merge.sww_merge(self.get_global_name(),self.numproc,verbose)
+            merge.sww_merge_parallel(self.get_global_name(),self.numproc,verbose)
 
 

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -44 +44 @@
 #mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
 #mesh_filename = "merimbula_43200.tsh"   ; x0 = 756000.0 ; x1 = 756500.0
-mesh_filename = "test-100.tsh" ; x0 = 0.25 ; x1 = 0.5
+#mesh_filename = "test-100.tsh" ; x0 = 0.25 ; x1 = 0.5
+mesh_filename = "test-20.tsh" ; x0 = 0.25 ; x1 = 0.5
 yieldstep = 20
-finaltime = 500
+finaltime = 40
 verbose = True