Changeset 9292 for trunk/anuga_work

Timestamp:

Aug 12, 2014, 12:10:51 PM (11 years ago)

Author:

davies

Message:

Adding local extrapolation and flux updating

Location:

trunk/anuga_work/development/gareth/tests

Files:

• dam_break/dam_break.py (modified) (3 diffs)
• dam_break/plotme.py (modified) (1 diff)
• runup_sinusoid/runup_sinusoid.py (modified) (3 diffs)

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

@@ -14 +14 @@
 from numpy import zeros, float
 from time import localtime, strftime, gmtime
-from bal_and import *
+#from bal_and import *
 #from anuga_tsunami import *
 
@@ -42 +42 @@
 points, vertices, boundary = anuga.rectangular_cross(int(L/dx), int(W/dy), L, W, (0.0, -W/2))
 
-#domain = anuga.Domain(points, vertices, boundary) 
-domain = Domain(points, vertices, boundary) 
+domain = anuga.Domain(points, vertices, boundary) 
+#domain = Domain(points, vertices, boundary) 
 
 domain.set_name(output_file)                
@@ -56 +56 @@
 print domain.get_timestepping_method()
 
+domain.set_flow_algorithm('DE0')
+#domain.set_local_extrapolation_and_flux_updating(nlevels=8)
 #domain.use_edge_limiter = True
 #domain.use_edge_limiter = False

trunk/anuga_work/development/gareth/tests/dam_break/plotme.py

@@ -4 +4 @@
 """
 from anuga.utilities import plot_utils as util
-from bal_and import plot_utils as util2
 from matplotlib import pyplot as pyplot
 
-p_st = util.get_output('dam_break_20120305_124724/dam_break.sww')
+p_st = util.get_output('dam_break_20140811_130209/dam_break.sww')
 p2_st=util.get_centroids(p_st)
 
 
-p_dev = util2.get_output('dam_break_20131204_145613/dam_break.sww', 0.001)
-p2_dev=util2.get_centroids(p_dev, velocity_extrapolation=True)
+p_dev = util.get_output('dam_break_20140811_130049/dam_break.sww', 0.001)
+p2_dev=util.get_centroids(p_dev, velocity_extrapolation=True)
 
 pyplot.clf()

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

@@ -20 +20 @@
 domain.set_name('runup_sinusoid_v2')                         # Output to file runup.sww
 #domain.set_store_centroids(True)
-domain.set_flow_algorithm('DE1')
+domain.set_flow_algorithm('DE0')
 domain.set_quantities_to_be_stored({'stage': 2, 'xmomentum': 2, 
          'ymomentum': 2, 'elevation': 2})
@@ -42 +42 @@
 bumpiness=50. # Higher = shorter wavelength oscillations in topography
 tstep=0.2
-lasttime=90.
+lasttime=30.
 
 #domain.minimum_allowed_height=domain.minimum_allowed_height*scale_me # Seems needed to make the algorithms behave
@@ -110 +110 @@
     print 'Their difference is:', vol-flux_integral
     #print 'Volume less flux int', sum(dd_raw*domain.areas) - domain.boundary_flux_integral
-    
+    print 'Update_next_flux range:'
+    print domain.update_extrapolation.min(), domain.update_extrapolation.max()
+    print 'Flux_update_frequency range:'
+    print domain.flux_update_frequency.min(), domain.flux_update_frequency.max()
 
 vel_final_inds=(vv>1.0e-01).nonzero()