Changeset 8865 for trunk/anuga_work/development/gareth/tests/runup_sinusoid/runup_sinusoid.py

Timestamp:

May 12, 2013, 8:11:11 PM (12 years ago)

Author:

davies

Message:

Updates to balanced_dev

File:

• trunk/anuga_work/development/gareth/tests/runup_sinusoid/runup_sinusoid.py (modified) (5 diffs)

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

@@ -24 +24 @@
 domain=Domain(points,vertices,boundary)    # Create Domain
 domain.set_name('runup_sinusoid_v2')                         # Output to file runup.sww
-
+#domain.set_timestepping_method('euler')
 #------------------
 # Define topography
 #------------------
 scale_me=1.0
+boundary_ws=-0.1
+init_ws=-0.2
+bumpiness=10. # Higher = shorter wavelength oscillations in topography
 #domain.minimum_allowed_height=domain.minimum_allowed_height*scale_me # Seems needed to make the algorithms behave
 
 def topography(x,y):
-        return (-x/2.0 +0.05*numpy.sin((x+y)*50.0))*scale_me
+        return (-x/2.0 +0.05*numpy.sin((x+y)*bumpiness))*scale_me
 
 def stagefun(x,y):
-    stge=-0.2*scale_me #+0.1*(x>0.9) 
+    stge=init_ws*scale_me# +0.1*(x>0.9)*scale_me 
     #topo=topography(x,y) 
     return stge#*(stge>topo) + (topo)*(stge<=topo)
@@ -41 +44 @@
 domain.set_quantity('elevation',topography)     # Use function for elevation
 domain.get_quantity('elevation').smooth_vertex_values() 
-domain.set_quantity('friction',0.03)             # Constant friction
+domain.set_quantity('friction',0.00)             # Constant friction
 
 #def frict_change(x,y):
@@ -64 +67 @@
 Bd=anuga.Dirichlet_boundary([-0.1*scale_me,0.,0.])       # Constant boundary values -- not used in this example
 def waveform(t):
-    return -0.1 #(0.0*sin(t*2*pi)-0.1)*exp(-t)-0.1
+    return boundary_ws*scale_me
+    #return -0.2*scale_me #-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,
@@ -78 +82 @@
 #------------------------------
 
-for t in domain.evolve(yieldstep=0.200,finaltime=40.00):
+for t in domain.evolve(yieldstep=0.2,finaltime=120.00):
     print domain.timestepping_statistics()
-    print domain.boundary_flux_integral
+    #print domain.boundary_flux_integral
     xx = domain.quantities['xmomentum'].centroid_values
     yy = domain.quantities['ymomentum'].centroid_values
@@ -88 +92 @@
     vv = ( (xx/dd)**2 + (yy/dd)**2)**0.5
     vv = vv*(dd>1.0e-03)
-    print 'Peak velocity is: ', vv.max(), vv.argmax()
+    print 'Peak velocity is: ', vv.max(), vv.argmax(), dd[vv.argmax()]
     print 'Volume is', sum(dd_raw*domain.areas)    
-    print 'Volume less flux int', sum(dd_raw*domain.areas) - domain.boundary_flux_integral
+    #print 'Volume less flux int', sum(dd_raw*domain.areas) - domain.boundary_flux_integral