Changeset 8549 for trunk/anuga_work/development/gareth/tests

Timestamp:

Sep 1, 2012, 7:44:08 PM (13 years ago)

Author:

davies

Message:

Bugfixes for balanced_dev

Location:

trunk/anuga_work/development/gareth/tests

Files:

• runup_sinusoid/runup_sinusoid.py (modified) (3 diffs)
• shallow_steep_slope/channel_SU_sparse.py (modified) (3 diffs)

trunk/anuga_work/development/gareth/tests/runup_sinusoid/runup_sinusoid.py

@@ -37 +37 @@
 
 def stagefun(x,y):
-    stge=-0.2*scale_me # +0.01*(x>0.9) 
+    stge=-0.2*scale_me #+0.01*(x>0.9) 
     #topo=topography(x,y) 
     return stge#*(stge>topo) + (topo)*(stge<=topo)
@@ -72 +72 @@
 # Associate boundary tags with boundary objects
 #----------------------------------------------
-domain.set_boundary({'left': Br, 'right': Br, 'top': Br, 'bottom':Br})
+domain.set_boundary({'left': Br, 'right': Bd, 'top': Br, 'bottom':Br})
 
 #------------------------------
@@ -78 +78 @@
 #------------------------------
 
-for t in domain.evolve(yieldstep=0.2,finaltime=20.0):
+for t in domain.evolve(yieldstep=0.2,finaltime=40.0):
     print domain.timestepping_statistics()
     xx = domain.quantities['xmomentum'].centroid_values

trunk/anuga_work/development/gareth/tests/shallow_steep_slope/channel_SU_sparse.py

@@ -30 +30 @@
 #------------------------------------------------------------------------------
 points, vertices, boundary = rectangular_cross(10, 10,
-len1=100.0, len2=100.0) # Mesh
+                                len1=100.0, len2=100.0) # Mesh
 domain = Domain(points, vertices, boundary) # Create domain
 domain.set_name('channel_SU_2_v2') # Output name
-domain.set_store_vertices_uniquely(True)
-domain.CFL=1.0
+#domain.set_store_vertices_uniquely(True)
+#domain.CFL=1.0
 #------------------------------------------------------------------------------
 # Setup initial conditions
 #------------------------------------------------------------------------------
 def topography(x, y):
-        return -x/10. + numpy.sin(x/10.) +abs(y-50.)/100. # linear bed slope
+        return -x/10. #+ numpy.sin(x/10.) +abs(y-50.)/100. # linear bed slope
 
 def stagetopo(x,y):
@@ -53 +53 @@
 domain.set_quantity('friction', 0.03) # Constant friction
 domain.set_quantity('stage', stagetopo)
+
 #------------------------------------------------------------------------------
 # Setup boundary conditions
@@ -69 +70 @@
 domain.set_boundary({'left': Br, 'right': Bo, 'top': Br, 'bottom': Br})
 
+
+myindex=((domain.centroid_coordinates[:,0] - 50.)**2 + (domain.centroid_coordinates[:,1] - 50.)**2).argmin()
+
 #------------------------------------------------------------------------------
 # Evolve system through time
 #------------------------------------------------------------------------------
 for t in domain.evolve(yieldstep=4.0, finaltime=400.0):
-        print domain.timestepping_statistics()
+    print domain.timestepping_statistics()
+    #print domain.quantities['stage'].centroid_values[myindex] - domain.quantities['elevation'].centroid_values[myindex]
+    s3 = domain.get_flow_through_cross_section([[30., 0.0], [30., 100.]])
+    s4 = domain.get_flow_through_cross_section([[32., 0.0], [32., 100.]])
+    s5 = domain.get_flow_through_cross_section([[34., 0.0], [34., 100.]])
+    s2 = domain.get_flow_through_cross_section([[45., 0.0], [45., 100.]])
+    s1 = domain.get_flow_through_cross_section([[53., 0.0], [53., 100.]])
+    s0 = domain.get_flow_through_cross_section([[60., 0.0], [60., 100.]])
+    print 'Xsectional flow:', s0, s1, s2, s3, s4, s5
+