Changeset 8990 for trunk/anuga_work/development/gareth/tests/channel_floodplain

Timestamp:

Sep 26, 2013, 11:27:01 AM (12 years ago)

Author:

davies

Message:

First-draft Audusse-type solver in anuga_work/gareth/development/experimental/bal_and

Location:

trunk/anuga_work/development/gareth/tests/channel_floodplain

Files:

• channel_floodplain1.py (modified) (1 diff)
• plotme.py (modified) (5 diffs)

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 balanced_dev import *
+from bal_and import *
 #from anuga_tsunami import *
 #from balanced_basic.swb2_domain import *

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

@@ -1 @@
-import util
+#import util
+from bal_and import plot_utils as util
 from matplotlib import pyplot as pyplot
 #import pylab
 
 # Time-index to plot outputs from
-index=900
+index=150
+#index=900
 
 #p2 = util.get_output('channel_floodplain1_bal_dev.sww', minimum_allowed_height=0.01)
@@ -28 +30 @@
 
 # Numerical results along a central channel 'slice'
-V1 = p.stage[index,v] - p.elev[v]
+V1 = p.stage[index,v] - p.elev[index,v]
 V2 = p.yvel[index,v]
 V3 = p.xvel[index,v]
@@ -90 +92 @@
 
 pyplot.clf()
-analytical_stage = min(p.elev[v1]) + dc_analytical
-analytic_vel = ( (1./300.)*(analytical_stage-p.elev[v1])**(4./3.)*(1./0.03)**2.)**0.5
-analytic_vel = analytic_vel*(analytical_stage>p.elev[v1])
+analytical_stage = min(p.elev[index,v1]) + dc_analytical
+analytic_vel = ( (1./300.)*(analytical_stage-p.elev[index,v1])**(4./3.)*(1./0.03)**2.)**0.5
+analytic_vel = analytic_vel*(analytical_stage>p.elev[index,v1])
 pyplot.figure(figsize=(12.,8.))
 pyplot.plot(p.x[v1], p.yvel[index,v1],'o', label='computed velocity (m/s)')
 pyplot.plot(p.x[v1], analytic_vel,'o', label='analytical velocity (m/s)')
-pyplot.plot(p.x[v1],p.elev[v1],'o', label='bed elevation (m)')
+pyplot.plot(p.x[v1],p.elev[index,v1],'o', label='bed elevation (m)')
 pyplot.plot(p.x[v1],p.stage[index,v1],'o', label='computed stage (m)')
 pyplot.plot(p.x[v1],p.stage[index,v1]*0. + analytical_stage,'o', label='analytical stage (m)')
@@ -109 +111 @@
 
 pyplot.clf()
-analytical_stage = min(p.elev[v1]) + dc_analytical
-analytic_vel = ( (1./300.)*(analytical_stage-p.elev[v1])**(4./3.)*(1./0.03)**2.)**0.5
-analytic_vel = analytic_vel*(analytical_stage>p.elev[v1])
+analytical_stage = min(p.elev[index,v1]) + dc_analytical
+analytic_vel = ( (1./300.)*(analytical_stage-p.elev[index,v1])**(4./3.)*(1./0.03)**2.)**0.5
+analytic_vel = analytic_vel*(analytical_stage>p.elev[index,v1])
 pyplot.figure(figsize=(12.,8.))
 pyplot.plot(p.x[v1], p.yvel[index,v1],'o', label='computed velocity (m/s)')
 pyplot.plot(p.x[v1], analytic_vel,'o', label='analytical velocity (m/s)')
-pyplot.plot(p.x[v1],p.elev[v1],'o', label='bed elevation (m)')
+pyplot.plot(p.x[v1],p.elev[index,v1],'o', label='bed elevation (m)')
 pyplot.plot(p.x[v1],p.stage[index,v1],'o', label='computed stage (m)')
 pyplot.plot(p.x[v1],p.stage[index,v1]*0. + analytical_stage,'o', label='analytical stage (m)')
@@ -127 +129 @@
 
 pyplot.clf()
-analytical_stage = min(p.elev[v1]) + dc_analytical
-analytic_vel = ( (1./300.)*(analytical_stage-p.elev[v1])**(4./3.)*(1./0.03)**2.)**0.5
-analytic_vel = analytic_vel*(analytical_stage>p.elev[v1])
+analytical_stage = min(p.elev[index,v1]) + dc_analytical
+analytic_vel = ( (1./300.)*(analytical_stage-p.elev[index,v1])**(4./3.)*(1./0.03)**2.)**0.5
+analytic_vel = analytic_vel*(analytical_stage>p.elev[index,v1])
 pyplot.figure(figsize=(12.,8.))
 pyplot.plot(p.x[v1], p.yvel[index,v1],'o', label='computed velocity (m/s)')
 pyplot.plot(p.x[v1], analytic_vel,'o', label='analytical velocity (m/s)')
-pyplot.plot(p.x[v1],p.elev[v1],'o', label='bed elevation (m)')
+pyplot.plot(p.x[v1],p.elev[index,v1],'o', label='bed elevation (m)')
 pyplot.plot(p.x[v1],p.stage[index,v1],'o', label='computed stage (m)')
 pyplot.plot(p.x[v1],p.stage[index,v1]*0. + analytical_stage,'o', label='analytical stage (m)')