Changeset 8950

Timestamp:

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

Author:

steve

Message:

Some changes to bottineau files

Location:

trunk/anuga_core/source

Files:

• anuga/structures/structure_operator.py (modified) (1 diff)
• anuga/utilities/plot_utils.py (modified) (6 diffs)
• anuga_parallel/parallel_boyd_box_operator.py (modified) (1 diff)
• anuga_parallel/parallel_shallow_water.py (modified) (3 diffs)
• anuga_parallel/parallel_structure_operator.py (modified) (1 diff)
• anuga_parallel/run_parallel_sw_merimbula.py (modified) (3 diffs)
• anuga_validation_tests/analytical_exact/runup_on_sinusoid_beach (modified) (1 prop)
• anuga_validation_tests/other_references/radial_dam_break_wet (modified) (1 prop)

trunk/anuga_core/source/anuga/structures/structure_operator.py

@@ -193 +193 @@
         # set outflow
         if old_inflow_depth > 0.0 :
-                timestep_star = timestep*new_inflow_depth/old_inflow_depth
+            timestep_star = timestep*new_inflow_depth/old_inflow_depth
         else:
             timestep_star = 0.0

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

@@ -200 +200 @@
     """
     def __init__(self,p, velocity_extrapolation=False):
+        
         self.time, self.x, self.y, self.stage, self.xmom,\
              self.ymom, self.elev, self.xvel, \
@@ -213 +214 @@
     # Make 3 arrays, each containing one index of a vertex of every triangle.
     l=len(p.vols)
-    vols0=numpy.zeros(l, dtype='int')
-    vols1=numpy.zeros(l, dtype='int')
-    vols2=numpy.zeros(l, dtype='int')
+    #vols0=numpy.zeros(l, dtype='int')
+    #vols1=numpy.zeros(l, dtype='int')
+    #vols2=numpy.zeros(l, dtype='int')
 
     # FIXME: 22/2/12/ - I think this loop is slow, should be able to do this
     # another way
-    for i in range(l):
-        vols0[i]=p.vols[i][0]
-        vols1[i]=p.vols[i][1]
-        vols2[i]=p.vols[i][2]
+#    for i in range(l):
+#        vols0[i]=p.vols[i][0]
+#        vols1[i]=p.vols[i][1]
+#        vols2[i]=p.vols[i][2]
+
+
+
+    vols0=p.vols[:,0]
+    vols1=p.vols[:,1]
+    vols2=p.vols[:,2]
+
+    #print vols0.shape
+    #print p.vols.shape
 
     # Then use these to compute centroid averages 
@@ -262 +272 @@
             xvel_cent[i,:]=xmom_cent[i,:]/(stage_cent[i,:]-elev_cent+1.0e-06)*(stage_cent[i,:]>elev_cent+p.minimum_allowed_height)
             yvel_cent[i,:]=ymom_cent[i,:]/(stage_cent[i,:]-elev_cent+1.0e-06)*(stage_cent[i,:]>elev_cent+p.minimum_allowed_height)
-   
+
+
 
     # Compute velocity 
@@ -378 +389 @@
 ########################
 # TRIANGLE AREAS, WATER VOLUME
-def triangle_areas(p, subset='null'):
+def triangle_areas(p, subset=None):
     # Compute areas of triangles in p -- assumes p contains vertex information
     # subset = vector of centroid indices to include in the computation. 
 
-    if(subset=='null'):
+    if(subset is None):
         subset=range(len(p.vols[:,0]))
     
@@ -406 +417 @@
 ###
 
-def water_volume(p,p2, per_unit_area=False, subset='null'):
+def water_volume(p,p2, per_unit_area=False, subset=None):
     # Compute the water volume from p(vertex values) and p2(centroid values)
 
-    if(subset=='null'):
+    if(subset is None):
         subset=range(len(p2.x))
 
@@ -431 +442 @@
 
 
-
+def get_triangle_containing_point(p,point):
+
+    V = p.vols
+
+    x = p.x
+    y = p.y
+
+    l = len(x)
+
+    from anuga.geometry.polygon import is_outside_polygon,is_inside_polygon
+
+    # FIXME: Horrible brute force
+    for i in xrange(l):
+        i0 = V[i,0]
+        i1 = V[i,1]
+        i2 = V[i,2]
+        poly = [ [x[i0], y[i0]], [x[i1], y[i1]], [x[i2], y[i2]] ]
+
+        if is_inside_polygon(point, poly, closed=True):
+            return i
+
+    msg = 'Point %s not found within a triangle' %str(point)
+    raise Exception(msg)
+
+
+def get_extent(p):
+
+    import numpy
+
+    x_min = numpy.min(p.x)
+    x_max = numpy.max(p.x)
+
+    y_min = numpy.min(p.y)
+    y_max = numpy.max(p.y)
+
+    return x_min, x_max, y_min, y_max
+
+
+
+

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()