Changeset 9007 for trunk/anuga_work/development/gareth/tests/merimbula_steve

Timestamp:

Oct 11, 2013, 5:12:24 PM (12 years ago)

Author:

davies

Message:

Working on audusse development version

File:

• trunk/anuga_work/development/gareth/tests/merimbula_steve/run_sw_merimbula.py (modified) (3 diffs)

trunk/anuga_work/development/gareth/tests/merimbula_steve/run_sw_merimbula.py

@@ -28 +28 @@
 #from anuga import Domain
 #from balanced_basic import *
-from balanced_dev import *
+#from balanced_dev import *
+from bal_and import *
 #from anuga_tsunami import *
 
@@ -51 +52 @@
 #mesh_filename = "test-100.tsh" ; x0 = 0.25 ; x1 = 0.5
 #mesh_filename = "test-20.tsh" ; x0 = 250.0 ; x1 = 350.0
-yieldstep = 20
+yieldstep = 20.0
 finaltime = 200
 verbose = True
@@ -117 +118 @@
 for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
     domain.write_time()
+    mom_norm=(domain.quantities['xmomentum'].centroid_values**2 + domain.quantities['ymomentum'].centroid_values**2)**0.5
+    dpth=domain.quantities['height'].centroid_values
+    dpth=dpth*(dpth>1.0e-03)+1.0e-03*(dpth<=1.0e-03)
+    vel=(mom_norm/(dpth))
+    #print 'Peak velocity: ', vel.max(), 'Location peak: ', vel.argmax(), 'depth at location peak: ', dpth[vel.argmax()]
+    #print 'Max speed', domain.max_speed.max(), 'Location peak: ', domain.max_speed.argmax()
+    #print 'Centroid vel & depth', vel[domain.max_speed.argmax()], dpth[domain.max_speed.argmax()] 
+    # 
+    # Compute edge quantities
+    #
+    mom_norm_edge=(domain.quantities['xmomentum'].edge_values**2 + domain.quantities['ymomentum'].edge_values**2)**0.5
+    dpth_edge=domain.quantities['height'].edge_values
+    dpth_edge=dpth_edge*(dpth_edge>1.0e-03)+1.0e-03*(dpth_edge<=1.0e-03)
+    vel_edge=mom_norm_edge/dpth_edge
+    #print 'Edge peak vel: vel & depth', vel_edge.max()#, dpth_edge[vel_edge.argmax()] 
 
 print 'That took %.2f seconds' %(time.time()-t0)