Changeset 8286

Timestamp:

Dec 15, 2011, 10:51:25 PM (11 years ago)

Author:

steve

Message:

working version of sww_merge

Location:

trunk/anuga_core/source

Files:

• anuga/file/sww.py (modified) (2 diffs)
• anuga_parallel/run_parallel_sw_merimbula.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/file/sww.py

@@ -703 +703 @@
         #outfile.createDimension('numbers_in_range', 2)
 
-        print 'store parallel data'
+        #print 'store parallel data'
         outfile.number_of_global_triangles = number_of_global_triangles
         outfile.number_of_global_nodes = number_of_global_nodes
@@ -712 +712 @@
         outfile.createVariable('tri_full_flag', netcdf_int, ('number_of_volumes',))
 
-        print tri_l2g.shape
-        print tri_l2g
-        print outfile.variables['tri_l2g'].shape
+        #print tri_l2g.shape
+        #print tri_l2g
+        #print outfile.variables['tri_l2g'].shape
 
         outfile.variables['tri_l2g'][:] = tri_l2g.astype(num.int32)
 
-        print node_l2g.shape
-        print node_l2g
-        print outfile.variables['node_l2g'].shape
+        #print node_l2g.shape
+        #print node_l2g
+        #print outfile.variables['node_l2g'].shape
 
         outfile.variables['node_l2g'][:] = node_l2g.astype(num.int32)
 
-        print tri_full_flag.shape
-        print tri_full_flag
-        print outfile.variables['tri_full_flag'].shape
+        #print tri_full_flag.shape
+        #print tri_full_flag
+        #print outfile.variables['tri_full_flag'].shape
 
         outfile.variables['tri_full_flag'][:] = tri_full_flag.astype(num.int32)

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -42 +42 @@
 #--------------------------------------------------------------------------
 
-#mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
+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-20.tsh" ; x0 = 250.0 ; x1 = 350.0
+#mesh_filename = "test-20.tsh" ; x0 = 250.0 ; x1 = 350.0
 yieldstep = 20
-finaltime = 40
+finaltime = 1000
 verbose = True
 
@@ -85 +85 @@
     domain = create_domain_from_file(mesh_filename)
     domain.set_quantity('stage', Set_Stage(x0, x1, 2.0))
-    domain.set_quantity('elevation', Set_Elevation(500.0))
+    #domain.set_quantity('elevation', Set_Elevation(500.0))
 
-    print domain.statistics()
-    print domain.get_extent()
-    print domain.get_extent(absolute=True)
-    print domain.geo_reference
+    #print domain.statistics()
+    #print domain.get_extent()
+    #print domain.get_extent(absolute=True)
+    #print domain.geo_reference
 else:
     domain = None
@@ -109 +109 @@
 domain.set_name('merimbula')
 
-for p in range(numprocs):
-    if myid == p:
-        print 'P%d'%p
-        print domain.get_extent()
-        print domain.get_extent(absolute=True)
-        print domain.geo_reference
-        print domain.s2p_map
-        print domain.p2s_map
-        print domain.tri_l2g
-        print domain.node_l2g
-    else:
-        pass
-    
-    barrier()
+#for p in range(numprocs):
+#    if myid == p:
+#        print 'P%d'%p
+#        print domain.get_extent()
+#        print domain.get_extent(absolute=True)
+#        print domain.geo_reference
+#        print domain.s2p_map
+#        print domain.p2s_map
+#        print domain.tri_l2g
+#        print domain.node_l2g
+#    else:
+#        pass
+#
+#    barrier()