Changeset 8384 for trunk/anuga_work

Timestamp:

Apr 5, 2012, 12:37:54 AM (13 years ago)

Author:

davies

Message:

balanced_dev: more application adjustments

Location:

trunk/anuga_work/development/gareth

Files:

• experimental/balanced_dev/swb2_domain.py (modified) (1 diff)
• experimental/balanced_dev/swb2_domain_ext.c (modified) (4 diffs)
• tests/channel_floodplain/plotme.py (modified) (1 diff)
• tests/dam_break/plotme.py (modified) (1 diff)
• tests/urban_flow/ideal_urban.py (modified) (5 diffs)
• tests/urban_flow/plotme.py (modified) (1 diff)
• tests/wave/run_wave.py (modified) (5 diffs)

trunk/anuga_work/development/gareth/experimental/balanced_dev/swb2_domain.py

@@ -101 +101 @@
         self.set_store_vertices_smoothly(False)
 
+        self.maximum_allowed_speed=0.0
+
         print '##########################################################################'
         print '#'

trunk/anuga_work/development/gareth/experimental/balanced_dev/swb2_domain_ext.c

@@ -731 +731 @@
   // Any provisional jump with magnitude < TINY does not contribute to 
   // the limiting process.
+  
   for (i=0;i<3;i++){
     if (dqv[i]<-TINY)
@@ -742 +743 @@
   
   phi=min(r*beta_w,1.0);
+  //phi=1.;
   //for (i=0;i<3;i++)
   dqv[0]=dqv[0]*phi;
@@ -1082 +1084 @@
       // vertices of the auxiliary triangle and compute jumps 
       // from the centroid to the min and max
+      //
       find_qmin_and_qmax(dq0, dq1, dq2, &qmin, &qmax);
+
       //beta_tmp = beta_uh;
       //if (hmin<minimum_allowed_height)
@@ -1139 +1143 @@
       // vertices of the auxiliary triangle and compute jumps 
       // from the centroid to the min and max
+      //
       find_qmin_and_qmax(dq0, dq1, dq2, &qmin, &qmax);
       

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

@@ -4 +4 @@
 
 # Time-index to plot outputs from
-index=900
+index=53
 
 #p2 = util.get_output('channel_floodplain1_bal_dev.sww', minimum_allowed_height=0.01)

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

@@ -9 +9 @@
 p2_st=util.get_centroids(p_st)
 
-p_dev = util.get_output('dam_break_20120313_153101/dam_break.sww', 0.001)
+
+p_dev = util.get_output('dam_break_20120404_230353/dam_break.sww', 0.001)
 p2_dev=util.get_centroids(p_dev, velocity_extrapolation=True)
 

trunk/anuga_work/development/gareth/tests/urban_flow/ideal_urban.py

@@ -9 +9 @@
 import anuga
 import numpy
+#from anuga import create_domain_from_regions as create_domain_from_regions
 #from anuga.structures.inlet_operator import Inlet_operator
 
@@ -25 +26 @@
 #bankwidth = 2. # Width of the bank regions -- note that these protrude into the channel
 man_n=0.01 # Manning's n
-l0 = 0.05 #0.2501 # Length scale associated with triangle side length in channel (min_triangle area = 0.5*l0^2)
+l0 = 0.1 #0.2501 # Length scale associated with triangle side length in channel (min_triangle area = 0.5*l0^2)
 
 #assert chan_width < floodplain_width, \
@@ -59 +60 @@
 
 domain.set_name('urban_flow0p05') # Output name
-
+#domain.extrapolate_velocity_second_order=False
 #------------------------------------------------------------------------------
 #
@@ -95 +96 @@
     elev2 = (x>6.9)*(x<7.7)*(y<1.3)*structure_height + \
             (x>6.9)*(x<7.7)*(3.6-y<1.3)*structure_height
+
+    # Add sloping edges
+    elev2b = (0.34 - y)*(0.155/0.34)*(y<0.34) + (0.155 - (floodplain_width-y)*(0.155/0.34))*(y>=floodplain_width-0.34)
+
     # Define building.
     # Do this by using rotated coordinates.
@@ -113 +118 @@
             (c2 > (ll[1] + 1.0/numpy.tan(alpha)*ll[0]) )*\
             structure_height
-    return elev1 + elev2 + elev3
+    return elev1 + elev2 + elev2b + elev3
 
 #Function for stage

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

@@ -14 +14 @@
 G6=numpy.array([-1.87,1.10]) + offset
 
-p=util.get_output('urban_flow0p1.sww')
+p2=util.get_output('urban_flow0p05.sww',0.001)
+p=util.get_centroids(p2,velocity_extrapolation=True)
 
 G1ind = ((p.x-G1[0])**2 + (p.y-G1[1])**2).argmin()

trunk/anuga_work/development/gareth/tests/wave/run_wave.py

@@ -13 +13 @@
 import anuga
 from anuga import Domain
-#from balanced_dev import *
+
+from balanced_dev import *
+from balanced_dev import Domain as Domain
 
 from math import cos
@@ -39 +41 @@
 # Setup domain
 #------------------------------------------------------------------------------
-dx = 500.
+dx = 1000.
 dy = dx
 L = 100000.
@@ -55 +57 @@
 # Setup Algorithm
 #------------------------------------------------------------------------------
-domain.set_timestepping_method('rk2')
-domain.set_default_order(2)
-domain.set_beta(2.0)
+#domain.set_timestepping_method('rk2')
+#domain.set_default_order(2)
+#domain.set_beta(2.0)
 
-print domain.get_timestepping_method()
+#print domain.get_timestepping_method()
 
 #domain.use_edge_limiter = True
@@ -81 +83 @@
 Bd = anuga.Dirichlet_boundary([1,0.,0.]) # Constant boundary values
 amplitude = 1
-wave_length = 3000.0
+wave_length = 300.0
 Bw = anuga.Time_boundary(domain=domain,     # Time dependent boundary
 ## Sine wave
@@ -116 +118 @@
 #------------------------------------------------------------------------------
 
-for t in domain.evolve(yieldstep = 10.0, finaltime = 60*60.*10.):
+for t in domain.evolve(yieldstep = 10.0, finaltime = 60*60.*3.):
     domain.write_time()
     if interactive_visualisation: