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

Timestamp:

Mar 11, 2013, 8:17:49 PM (12 years ago)

Author:

davies

Message:

Updates to gd in-development algorithms

Location:

trunk/anuga_work/development/gareth/tests

Files:

• channel_floodplain/channel_floodplain1.py (modified) (1 diff)
• dam_break/dam_break.py (modified) (1 diff)
• dam_break/plotme.py (modified) (1 diff)
• okushiri/run_okushiri.py (modified) (1 diff)
• parabolic/parabolaplot.py (modified) (1 diff)
• runup/runup.py (modified) (1 diff)
• runup_sinusoid/runup_sinusoid.py (modified) (8 diffs)
• runup_sinusoid/runup_sinusoidplot.py (modified) (1 diff)
• shallow_steep_slope/channel_SU_sparse.py (modified) (2 diffs)
• wave_runup (added)
• wave_runup/Shoreline.csv (added)
• wave_runup/initial_condition.txt (added)
• wave_runup/plotme.py (added)
• wave_runup/readme.txt (added)
• wave_runup/runup.py (added)
• wave_runup/t160.csv (added)
• wave_runup/t175.csv (added)
• wave_runup/t220.csv (added)
• wave_runup/util.py (added)

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

@@ -14 +14 @@
 #from anuga import *
 #from balanced_basic import *
-#from balanced_dev import *
-from anuga_tsunami import *
+from balanced_dev import *
+#from anuga_tsunami import *
 #from balanced_basic.swb2_domain import *
 #from balanced_basic.swb2_domain import Domain

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

@@ -51 +51 @@
 # Setup Algorithm
 #------------------------------------------------------------------------------
-domain.set_timestepping_method('rk2')
-domain.set_default_order(2)
+#domain.set_timestepping_method('rk2')
+#domain.set_default_order(2)
 
 print domain.get_timestepping_method()
 
-domain.use_edge_limiter = True
+#domain.use_edge_limiter = True
 #domain.use_edge_limiter = False
-domain.tight_slope_limiters = True
-domain.use_centroid_velocities = False
+#domain.tight_slope_limiters = True
+#domain.use_centroid_velocities = False
 
-domain.CFL = 1.0
+#domain.CFL = 1.0
 
 #domain.beta_w      = 0.6

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_20120831_172309/dam_break.sww', 0.001)
+p_dev = util.get_output('dam_break_20130219_202649/dam_break.sww', 0.001)
 p2_dev=util.get_centroids(p_dev, velocity_extrapolation=True)
 

trunk/anuga_work/development/gareth/tests/okushiri/run_okushiri.py

@@ -24 +24 @@
 import anuga
 import project
-#from balanced_dev import *
-from anuga_tsunami import *
+from balanced_dev import *
+#from anuga_tsunami import *
 
 def main(elevation_in_mesh=False):

trunk/anuga_work/development/gareth/tests/parabolic/parabolaplot.py

@@ -11 +11 @@
 import util
 
-p=util.get_output('parabola_v2.sww', 0.01)
+p=util.get_output('parabola_v2.sww', 0.001)
 p2=util.get_centroids(p, velocity_extrapolation=True)
 

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

@@ -56 +56 @@
 Bt=anuga.Transmissive_boundary(domain)          # Continue all values of boundary -- not used in this example
 Bd=anuga.Dirichlet_boundary([-0.2,0.,0.])       # Constant boundary values -- not used in this example
-Bw=anuga.Time_boundary(domain=domain,
-        f=lambda t: [(0.0*sin(t*2*pi)-0.1)*exp(-t)-0.1,0.0,0.0]) # Time varying boundary -- get rid of the 0.0 to do a runup.
+#Bw=anuga.Time_boundary(domain=domain,
+#       f=lambda t: [(0.0*sin(t*2*pi)-0.1)*exp(-t)-0.1,0.0,0.0]) # Time varying boundary -- get rid of the 0.0 to do a runup.
 
 #----------------------------------------------

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

@@ -14 +14 @@
 #from swb2_domain import *
 #from balanced_basic import *
-#from balanced_dev import *
-from anuga_tsunami import *
+from balanced_dev import *
+#from anuga_tsunami import *
+
 #---------
 #Setup computational domain
@@ -23 +24 @@
 domain=Domain(points,vertices,boundary)    # Create Domain
 domain.set_name('runup_sinusoid_v2')                         # Output to file runup.sww
-domain.set_datadir('.')                          # Use current folder
-domain.set_quantities_to_be_stored({'stage': 2, 'xmomentum': 2, 'ymomentum': 2, 'elevation': 1})
-#domain.set_store_vertices_uniquely(True)
+
 #------------------
 # Define topography
 #------------------
 scale_me=1.0
-
 #domain.minimum_allowed_height=domain.minimum_allowed_height*scale_me # Seems needed to make the algorithms behave
 
@@ -37 +35 @@
 
 def stagefun(x,y):
-    stge=-0.2*scale_me #+0.01*(x>0.9) 
+    stge=-0.2*scale_me #+0.1*(x>0.9) 
     #topo=topography(x,y) 
     return stge#*(stge>topo) + (topo)*(stge<=topo)
@@ -53 +51 @@
 domain.get_quantity('stage').smooth_vertex_values()
 
+#print domain.forcing_terms
+#assert 0==1
 # Experiment with rain.
 # rainin = anuga.shallow_water.forcing.Rainfall(domain, rate=0.001) #, center=(0.,0.), radius=1000. )
@@ -64 +64 @@
 Bd=anuga.Dirichlet_boundary([-0.1*scale_me,0.,0.])       # Constant boundary values -- not used in this example
 def waveform(t):
-    return (0.0*sin(t*2*pi)-0.1)*exp(-t)-0.1
+    return -0.1 #(0.0*sin(t*2*pi)-0.1)*exp(-t)-0.1
 Bt2=anuga.Transmissive_n_momentum_zero_t_momentum_set_stage_boundary(domain,waveform)
 #Bw=anuga.Time_boundary(domain=domain,
@@ -72 +72 @@
 # Associate boundary tags with boundary objects
 #----------------------------------------------
-domain.set_boundary({'left': Br, 'right': Bd, 'top': Br, 'bottom':Br})
+domain.set_boundary({'left': Br, 'right': Bt2, 'top': Br, 'bottom':Br})
 
 #------------------------------
@@ -78 +78 @@
 #------------------------------
 
-for t in domain.evolve(yieldstep=0.2,finaltime=40.0):
+for t in domain.evolve(yieldstep=0.200,finaltime=40.00):
     print domain.timestepping_statistics()
     xx = domain.quantities['xmomentum'].centroid_values
@@ -84 +84 @@
     dd = domain.quantities['stage'].centroid_values - domain.quantities['elevation'].centroid_values 
     dd_raw=1.0*dd
-    dd = (dd)*(dd>1.0e-03)+1.0e-03
+    dd = dd*(dd>1.0e-03)+1.0e-03*(dd<=1.0e-03)
     vv = ( (xx/dd)**2 + (yy/dd)**2)**0.5
     vv = vv*(dd>1.0e-03)

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

@@ -15 +15 @@
 #------------------
 #v=(p.y==0.5)
-v=(p2.y==p2.y[80])
+myind=(abs(p2.y-0.5)).argmin()
+v=(p2.y==p2.y[myind])
 
 #--------------------

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

@@ -29 +29 @@
 # Setup computational domain
 #------------------------------------------------------------------------------
-points, vertices, boundary = rectangular_cross(10, 10,
-                                len1=100.0, len2=100.0) # Mesh
+points, vertices, boundary = rectangular_cross(14, 10,
+                                len1=140.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
 #------------------------------------------------------------------------------
 # Setup initial conditions
 #------------------------------------------------------------------------------
 def topography(x, y):
-        return -x/10. #+ numpy.sin(x/10.) +abs(y-50.)/100. # linear bed slope
+        return -x/10. + 1.*(numpy.sin(x/10.) +abs(y-50.)/10.) -0.*(x>80.) # linear bed slope
 
 def stagetopo(x,y):
-    stg= -x/10. +0.06309625 # Constant depth
+    stg= topography(x,y) + 0.163 #-x/10. +0.06309625 -50.*(x>80.)# Constant depth
     #topo=topography(x,y)
     return stg#*(stg>topo) + topo*(stg<=topo)
@@ -68 +66 @@
 #Bo = anuga.Transmissive_boundary(domain)
 #Bd = anuga.Dirichlet_boundary([-20., 0., 0.])
-domain.set_boundary({'left': Br, 'right': Bo, 'top': Br, 'bottom': Br})
+domain.set_boundary({'left': Br, 'right': Br, 'top': Br, 'bottom': Br})