@@ -41,10 +41,10 @@ def setplot(plotdata=None):
4141 abldata .read (plotdata .outdir + '/abl.data' , force = True )
4242 clawdata = ClawData ()
4343 clawdata .read (plotdata .outdir + '/claw.data' , force = True )
44- clawdata .lower [0 ] += abldata .depth_lower [0 ]
45- clawdata .upper [0 ] -= abldata .depth_upper [0 ]
46- clawdata .lower [1 ] += abldata .depth_lower [1 ]
47- clawdata .upper [1 ] -= abldata .depth_upper [1 ]
44+ x1 = clawdata .lower [0 ] + abldata .depth_lower [0 ]
45+ x2 = clawdata .upper [0 ] - abldata .depth_upper [0 ]
46+ y1 = clawdata .lower [1 ] + abldata .depth_lower [1 ]
47+ y2 = clawdata .upper [1 ] - abldata .depth_upper [1 ]
4848
4949 plotdata .clearfigures () # clear any old figures,axes,items data
5050
@@ -70,13 +70,12 @@ def setplot(plotdata=None):
7070 plotitem .add_colorbar = True
7171
7272 def plot_original_domain (current_data ):
73- from matplotlib .pyplot import gca
73+ from matplotlib .pyplot import gca , text
7474 ax = gca ()
75- x = [clawdata .lower [0 ], clawdata .upper [0 ], clawdata .upper [0 ], \
76- clawdata .lower [0 ], clawdata .lower [0 ]]
77- y = [clawdata .lower [1 ], clawdata .lower [1 ], clawdata .upper [1 ], \
78- clawdata .upper [1 ], clawdata .lower [1 ]]
75+ x = [x1 ,x2 ,x2 ,x1 ,x1 ]
76+ y = [y1 ,y1 ,y2 ,y2 ,y1 ]
7977 ax .plot (x , y , '--k' )
78+ text (- 0.6 ,1.05 ,'Absorbing Boundary Layer' )
8079
8180 plotaxes .afteraxes = plot_original_domain
8281
@@ -102,10 +101,10 @@ def p_vs_r(current_data):
102101 x = current_data .x
103102 y = current_data .y
104103 r = sqrt (x ** 2 + y ** 2 )
105- r = masked_where (x < clawdata . lower [ 0 ] , r )
106- r = masked_where (x > clawdata . upper [ 0 ] , r )
107- r = masked_where (y < clawdata . lower [ 1 ] , r )
108- r = masked_where (y > clawdata . upper [ 1 ] , r )
104+ r = masked_where (x < x1 , r )
105+ r = masked_where (x > x2 , r )
106+ r = masked_where (y < y1 , r )
107+ r = masked_where (y > y2 , r )
109108 q = current_data .q
110109 p = MaskedArray (q [0 ,:,:], mask = r .mask )
111110 return r ,p
@@ -127,7 +126,7 @@ def p_vs_r(current_data):
127126
128127 def make_legend (current_data ):
129128 import matplotlib .pyplot as plt
130- plt .legend (('2d data' , '1d reference solution' ))
129+ plt .legend (('2d data (interior only) ' , '1d reference solution' ))
131130
132131 plotaxes .afteraxes = make_legend
133132
0 commit comments