Changeset 8950 for trunk/anuga_core/source/anuga_parallel

Timestamp:

Aug 9, 2013, 4:30:31 PM (12 years ago)

Author:

steve

Message:

Some changes to bottineau files

Location:

trunk/anuga_core/source/anuga_parallel

Files:

• parallel_boyd_box_operator.py (modified) (1 diff)
• parallel_shallow_water.py (modified) (3 diffs)
• parallel_structure_operator.py (modified) (1 diff)
• run_parallel_sw_merimbula.py (modified) (3 diffs)

trunk/anuga_core/source/anuga_parallel/parallel_boyd_box_operator.py

@@ -191 +191 @@
         # Get attribute from outflow enquiry point
         if self.myid == self.master_proc:
+            
             if self.myid == self.enquiry_proc[self.outflow_index]:
                 outflow_enq_depth = self.inlets[self.outflow_index].get_enquiry_depth()

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -229 +229 @@
 
         if myid == 0:
+
+            fig = plt.figure()
             fx = {}
             fy = {}
@@ -252 +254 @@
                 triang = num.array(range(0,3*n))
                 triang.shape = (n, 3)
-                plt.triplot(fx[i], fy[i], triang, 'g-')
+                plt.triplot(fx[i], fy[i], triang, 'g-', linewidth = 0.5)
 
             # Plot ghost triangles
@@ -260 +262 @@
                     triang = num.array(range(0,3*n))
                     triang.shape = (n, 3)
-                    plt.triplot(gx[i], gy[i], triang, 'b--')
+                    plt.triplot(gx[i], gy[i], triang, 'b--', linewidth = 0.5)
 
             # Save triangulation to location pointed by filename
-            plt.savefig(filename)
+            plt.savefig(filename, dpi=600)
 
         else:

trunk/anuga_core/source/anuga_parallel/parallel_structure_operator.py

@@ -308 +308 @@
             gain = outflow_extra_depth*outflow_area
 
-        # Update Stats
+            # Update Stats
             self.discharge  = Q#outflow_extra_depth*self.outflow.get_area()/timestep
             self.velocity = barrel_speed#self.discharge/outlet_depth/self.width

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -43 +43 @@
 #--------------------------------------------------------------------------
 
-mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 10; finaltime = 1000
+mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 10; finaltime = 10
 #mesh_filename = "merimbula_17156.tsh"   ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 50; finaltime = 500
 #mesh_filename = "merimbula_43200_1.tsh"   ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 50; finaltime = 500
@@ -113 +113 @@
 
 domain.set_flow_algorithm('2_0')
-#domain.set_store_vertices_smoothly(True)
-
-#domain.smooth = False
-#domain.set_default_order(2)
-#domain.set_timestepping_method('rk2')
-#domain.set_CFL(0.7)
-#domain.set_beta(1.5)
 
 
@@ -197 +190 @@
 domain.sww_merge(delete_old=False)
 
+
+domain.dump_triangulation()
+
 finalize()