deletions | additions
diff --git a/figures/sketch/sketch.eps b/figures/sketch/sketch.eps
index 965ffd8..956b01e 100644
--- a/figures/sketch/sketch.eps
+++ b/figures/sketch/sketch.eps
...
%!PS-Adobe-3.0 EPSF-3.0
%%Title: ../figures/sketch/sketch.eps
%%Creator: matplotlib version 1.1.1rc, http://matplotlib.sourceforge.net/
%%CreationDate: Thu
Dec 26 10:41:22 2013 Feb 20 09:10:19 2014
%%Orientation: portrait
%%BoundingBox: 126 180 486 612
%%EndComments
%%BeginProlog
/mpldict
9 10 dict def
mpldict begin
/m { moveto } bind def
/l { lineto } bind def
...
1 index /BuildGlyph get exec
}_d
FontName currentdict end definefont pop
%!PS-Adobe-3.0 Resource-Font
%%Title: DejaVu Sans
%%Copyright: Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. DejaVu changes are in public domain
%%Creator: Converted from TrueType to type 3 by PPR
25 dict begin
/_d{bind def}bind def
/_m{moveto}_d
/_l{lineto}_d
/_cl{closepath eofill}_d
/_c{curveto}_d
/_sc{7 -1 roll{setcachedevice}{pop pop pop pop pop pop}ifelse}_d
/_e{exec}_d
/FontName /DejaVuSans def
/PaintType 0 def
/FontMatrix[.001 0 0 .001 0 0]def
/FontBBox[-1021 -415 1681 1167]def
/FontType 3 def
/Encoding [ /parenleft /parenright /hyphen /a /c /d /e /h /i /k /l /n /o /p /r /s /t /w ] def
/FontInfo 10 dict dup begin
/FamilyName (DejaVu Sans) def
/FullName (DejaVu Sans) def
/Notice (Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. DejaVu changes are in public domain ) def
/Weight (Book) def
/Version (Version 2.33) def
/ItalicAngle 0.0 def
/isFixedPitch false def
/UnderlinePosition -130 def
/UnderlineThickness 90 def
end readonly def
/CharStrings 18 dict dup begin
/parenleft{390 0 86 -131 310 759 _sc
310 759 _m
266 683 234 609 213 536 _c
191 463 181 389 181 314 _c
181 238 191 164 213 91 _c
234 17 266 -56 310 -131 _c
232 -131 _l
183 -54 146 20 122 94 _c
98 168 86 241 86 314 _c
86 386 98 459 122 533 _c
146 607 182 682 232 759 _c
310 759 _l
_cl}_d
/parenright{390 0 80 -131 304 759 _sc
80 759 _m
158 759 _l
206 682 243 607 267 533 _c
291 459 304 386 304 314 _c
304 241 291 168 267 94 _c
243 20 206 -54 158 -131 _c
80 -131 _l
123 -56 155 17 177 91 _c
198 164 209 238 209 314 _c
209 389 198 463 177 536 _c
155 609 123 683 80 759 _c
_cl}_d
/hyphen{361 0 49 234 312 314 _sc
49 314 _m
312 314 _l
312 234 _l
49 234 _l
49 314 _l
_cl}_d
/a{{613 0 60 -13 522 560 _sc
343 275 _m
270 275 220 266 192 250 _c
164 233 150 205 150 165 _c
150 133 160 107 181 89 _c
202 70 231 61 267 61 _c
317 61 357 78 387 114 _c
417 149 432 196 432 255 _c
432 275 _l
343 275 _l
522 312 _m
522 0 _l
432 0 _l
432 83 _l
411 49 385 25 355 10 _c
325 -5 287 -13 243 -13 _c
187 -13 142 2 109 33 _c
76 64 60 106 60 159 _c
60 220 80 266 122 298 _c
163 329 224 345 306 345 _c
432 345 _l
432 354 _l
432 395 418 427 391 450 _c
364 472 326 484 277 484 _c
245 484 215 480 185 472 _c
155 464 127 453 100 439 _c
100 522 _l
}_e{132 534 164 544 195 550 _c
226 556 256 560 286 560 _c
365 560 424 539 463 498 _c
502 457 522 395 522 312 _c
_cl}_e}_d
/c{{550 0 55 -13 488 560 _sc
488 526 _m
488 442 _l
462 456 437 466 411 473 _c
385 480 360 484 334 484 _c
276 484 230 465 198 428 _c
166 391 150 339 150 273 _c
150 206 166 154 198 117 _c
230 80 276 62 334 62 _c
360 62 385 65 411 72 _c
437 79 462 90 488 104 _c
488 21 _l
462 9 436 0 410 -5 _c
383 -10 354 -13 324 -13 _c
242 -13 176 12 128 64 _c
79 115 55 185 55 273 _c
55 362 79 432 128 483 _c
177 534 244 560 330 560 _c
358 560 385 557 411 551 _c
437 545 463 537 488 526 _c
_cl}_e}_d
/d{{635 0 55 -13 544 760 _sc
454 464 _m
454 760 _l
544 760 _l
544 0 _l
454 0 _l
454 82 _l
435 49 411 25 382 10 _c
353 -5 319 -13 279 -13 _c
213 -13 159 13 117 65 _c
75 117 55 187 55 273 _c
55 359 75 428 117 481 _c
159 533 213 560 279 560 _c
319 560 353 552 382 536 _c
411 520 435 496 454 464 _c
148 273 _m
148 207 161 155 188 117 _c
215 79 253 61 301 61 _c
348 61 385 79 413 117 _c
440 155 454 207 454 273 _c
454 339 440 390 413 428 _c
385 466 348 485 301 485 _c
253 485 215 466 188 428 _c
161 390 148 339 148 273 _c
_cl}_e}_d
/e{{615 0 55 -13 562 560 _sc
562 296 _m
562 252 _l
149 252 _l
153 190 171 142 205 110 _c
238 78 284 62 344 62 _c
378 62 412 66 444 74 _c
476 82 509 95 541 113 _c
541 28 _l
509 14 476 3 442 -3 _c
408 -9 373 -13 339 -13 _c
251 -13 182 12 131 62 _c
80 112 55 181 55 268 _c
55 357 79 428 127 481 _c
175 533 241 560 323 560 _c
397 560 455 536 498 489 _c
540 441 562 377 562 296 _c
472 322 _m
471 371 457 410 431 440 _c
404 469 368 484 324 484 _c
274 484 234 469 204 441 _c
174 413 156 373 152 322 _c
472 322 _l
_cl}_e}_d
/h{634 0 91 0 549 760 _sc
549 330 _m
549 0 _l
459 0 _l
459 327 _l
459 379 448 417 428 443 _c
408 469 378 482 338 482 _c
289 482 251 466 223 435 _c
195 404 181 362 181 309 _c
181 0 _l
91 0 _l
91 760 _l
181 760 _l
181 462 _l
202 494 227 519 257 535 _c
286 551 320 560 358 560 _c
420 560 468 540 500 501 _c
532 462 549 405 549 330 _c
_cl}_d
/i{278 0 94 0 184 760 _sc
94 547 _m
184 547 _l
184 0 _l
94 0 _l
94 547 _l
94 760 _m
184 760 _l
184 646 _l
94 646 _l
94 760 _l
_cl}_d
/k{579 0 91 0 576 760 _sc
91 760 _m
181 760 _l
181 311 _l
449 547 _l
564 547 _l
274 291 _l
576 0 _l
459 0 _l
181 267 _l
181 0 _l
91 0 _l
91 760 _l
_cl}_d
/l{278 0 94 0 184 760 _sc
94 760 _m
184 760 _l
184 0 _l
94 0 _l
94 760 _l
_cl}_d
/n{634 0 91 0 549 560 _sc
549 330 _m
549 0 _l
459 0 _l
459 327 _l
459 379 448 417 428 443 _c
408 469 378 482 338 482 _c
289 482 251 466 223 435 _c
195 404 181 362 181 309 _c
181 0 _l
91 0 _l
91 547 _l
181 547 _l
181 462 _l
202 494 227 519 257 535 _c
286 551 320 560 358 560 _c
420 560 468 540 500 501 _c
532 462 549 405 549 330 _c
_cl}_d
/o{612 0 55 -13 557 560 _sc
306 484 _m
258 484 220 465 192 427 _c
164 389 150 338 150 273 _c
150 207 163 156 191 118 _c
219 80 257 62 306 62 _c
354 62 392 80 420 118 _c
448 156 462 207 462 273 _c
462 337 448 389 420 427 _c
392 465 354 484 306 484 _c
306 560 _m
384 560 445 534 490 484 _c
534 433 557 363 557 273 _c
557 183 534 113 490 63 _c
445 12 384 -13 306 -13 _c
227 -13 165 12 121 63 _c
77 113 55 183 55 273 _c
55 363 77 433 121 484 _c
165 534 227 560 306 560 _c
_cl}_d
/p{{635 0 91 -207 580 560 _sc
181 82 _m
181 -207 _l
91 -207 _l
91 547 _l
181 547 _l
181 464 _l
199 496 223 520 252 536 _c
281 552 316 560 356 560 _c
422 560 476 533 518 481 _c
559 428 580 359 580 273 _c
580 187 559 117 518 65 _c
476 13 422 -13 356 -13 _c
316 -13 281 -5 252 10 _c
223 25 199 49 181 82 _c
487 273 _m
487 339 473 390 446 428 _c
418 466 381 485 334 485 _c
286 485 249 466 222 428 _c
194 390 181 339 181 273 _c
181 207 194 155 222 117 _c
249 79 286 61 334 61 _c
381 61 418 79 446 117 _c
473 155 487 207 487 273 _c
_cl}_e}_d
/r{411 0 91 0 411 560 _sc
411 463 _m
401 469 390 473 378 476 _c
366 478 353 480 339 480 _c
288 480 249 463 222 430 _c
194 397 181 350 181 288 _c
181 0 _l
91 0 _l
91 547 _l
181 547 _l
181 462 _l
199 495 224 520 254 536 _c
284 552 321 560 365 560 _c
371 560 378 559 386 559 _c
393 558 401 557 411 555 _c
411 463 _l
_cl}_d
/s{{521 0 54 -13 472 560 _sc
443 531 _m
443 446 _l
417 458 391 468 364 475 _c
336 481 308 485 279 485 _c
234 485 200 478 178 464 _c
156 450 145 430 145 403 _c
145 382 153 366 169 354 _c
185 342 217 330 265 320 _c
296 313 _l
360 299 405 279 432 255 _c
458 230 472 195 472 151 _c
472 100 452 60 412 31 _c
372 1 316 -13 246 -13 _c
216 -13 186 -10 154 -5 _c
122 0 89 8 54 20 _c
54 113 _l
87 95 120 82 152 74 _c
184 65 216 61 248 61 _c
290 61 323 68 346 82 _c
368 96 380 117 380 144 _c
380 168 371 187 355 200 _c
339 213 303 226 247 238 _c
216 245 _l
160 257 119 275 95 299 _c
70 323 58 356 58 399 _c
58 450 76 490 112 518 _c
148 546 200 560 268 560 _c
}_e{301 560 332 557 362 552 _c
391 547 418 540 443 531 _c
_cl}_e}_d
/t{392 0 27 0 368 702 _sc
183 702 _m
183 547 _l
368 547 _l
368 477 _l
183 477 _l
183 180 _l
183 135 189 106 201 94 _c
213 81 238 75 276 75 _c
368 75 _l
368 0 _l
276 0 _l
206 0 158 13 132 39 _c
106 65 93 112 93 180 _c
93 477 _l
27 477 _l
27 547 _l
93 547 _l
93 702 _l
183 702 _l
_cl}_d
/w{818 0 42 0 776 547 _sc
42 547 _m
132 547 _l
244 120 _l
356 547 _l
462 547 _l
574 120 _l
686 547 _l
776 547 _l
633 0 _l
527 0 _l
409 448 _l
291 0 _l
185 0 _l
42 547 _l
_cl}_d
end readonly def
/BuildGlyph
{exch begin
CharStrings exch
2 copy known not{pop /.notdef}if
true 3 1 roll get exec
end}_d
/BuildChar {
1 index /Encoding get exch get
1 index /BuildGlyph get exec
}_d
FontName currentdict end definefont pop
%!PS-Adobe-3.0 Resource-Font
%%Title: cmr10
...
/FontMatrix[.001 0 0 .001 0 0]def
/FontBBox[-44 -250 1009 750]def
/FontType 3 def
/Encoding [ /t /i /k /o /parenright /d /s /h /n /parenleft /c
/macron ] def
/FontInfo 10 dict dup begin
/FamilyName (cmr10) def
/FullName (cmr10) def
...
/UnderlinePosition -133 def
/UnderlineThickness 20 def
end readonly def
/CharStrings
12 11 dict dup begin
/t{{388 0 19 -10 332 615 _sc
102 120 _m
102 396 _l
...
405 77 385 46 355 24 _c
325 1 289 -10 249 -10 _c
_cl}_e}_d
/macron{500 0 69 555 430 590 _sc
69 555 _m
69 590 _l
430 590 _l
430 555 _l
69 555 _l
_cl}_d
end readonly def
/BuildGlyph
...
[] 0 setdash
gsave
360 432 0 0 clipbox
144 72 21.6 m
75.6 21.6518 l
79.2 21.8074 l
82.8 22.0666 l
86.4 22.4294 l
90 22.896 l
93.6 23.4662 l
97.2 24.1402 l
100.8 24.9178 l
104.4 25.799 l
108 26.784 l
111.6 27.8726 l
115.2 29.065 l
118.8 30.361 l
122.4 31.7606 l
126 33.264 l
129.6 34.871 l
133.2 36.5818 l
136.8 38.3962 l
140.4 40.3142 l
144 42.336 l
147.6
21.7296 44.4614 l
151.2
22.1184 46.6906 l
154.8
22.7664 49.0234 l
158.4
23.6736 51.4598 l
162
24.84 54 l
165.6
26.2656 56.6438 l
169.2
27.9504 59.3914 l
172.8
29.8944 62.2426 l
176.4
32.0976 65.1974 l
180
34.56 68.256 l
183.6
37.2816 71.4182 l
187.2
40.2624 74.6842 l
190.8
43.5024 78.0538 l
194.4
47.0016 81.527 l
198
50.76 85.104 l
201.6
54.7776 88.7846 l
205.2
59.0544 92.569 l
208.8
63.5904 96.457 l
212.4
68.3856 100.449 l
216
73.44 104.544 l
219.6
78.7536 108.743 l
223.2
84.3264 113.046 l
226.8
90.1584 117.452 l
230.4
96.2496 121.962 l
234
102.6 126.576 l
237.6
109.21 131.293 l
241.2
116.078 136.115 l
244.8
123.206 141.039 l
248.4
130.594 146.068 l
252
138.24 151.2 l
255.6
146.146 156.436 l
259.2
154.31 161.775 l
262.8
162.734 167.219 l
266.4
171.418 172.765 l
270
180.36 178.416 l
273.6
189.562 184.17 l
277.2
199.022 190.028 l
280.8
208.742 195.99 l
284.4
218.722 202.055 l
288
228.96 208.224 l
291.6
239.458 214.497 l
295.2
250.214 220.873 l
298.8
261.23 227.353 l
302.4
272.506 233.937 l
306 240.624 l
309.6 247.415 l
313.2 254.31 l
316.8 261.308 l
320.4 268.41 l
324 275.616 l
327.6 282.925 l
331.2 290.339 l
334.8 297.855 l
338.4 305.476 l
stroke
grestore
gsave
...
grestore
gsave
314.500000
11.600000 14.100000 translate
0.000000 rotate
/Cmr10 findfont
30.0 scalefont
setfont
1.937500 2.296875 moveto
/macron glyphshow
/Cmmi10 findfont
30.0 scalefont
setfont
0.000000
1.921875 1.718750 moveto
/omega glyphshow
...
grestore
gsave
261.000000 283.260000 268.200000 313.500000 translate
0.000000 rotate
/Cmmi10 findfont
20.0 scalefont
...
/parenright glyphshow
grestore
/DejaVuSans findfont
20.000 scalefont
setfont
gsave
59.453125 348.581250 translate
0.000000 rotate
0.000000 0.281250 m /s glyphshow
10.419922 0.281250 m /t glyphshow
18.261719 0.281250 m /e glyphshow
30.566406 0.281250 m /l glyphshow
36.123047 0.281250 m /l glyphshow
41.679688 0.281250 m /a glyphshow
53.935547 0.281250 m /r glyphshow
grestore
gsave
67.687500 325.350000 translate
0.000000 rotate
0.000000 0.281250 m /w glyphshow
16.357422 0.281250 m /i glyphshow
21.914062 0.281250 m /n glyphshow
34.589844 0.281250 m /d glyphshow
grestore
gsave
34.992188 298.243750 translate
0.000000 rotate
0.000000 4.156250 m /parenleft glyphshow
7.802734 4.156250 m /p glyphshow
20.498047 4.156250 m /r glyphshow
28.220703 4.156250 m /e glyphshow
40.525391 4.156250 m /hyphen glyphshow
47.742188 4.156250 m /s glyphshow
58.162109 4.156250 m /h glyphshow
70.837891 4.156250 m /o glyphshow
83.074219 4.156250 m /c glyphshow
94.070312 4.156250 m /k glyphshow
105.652344 4.156250 m /parenright glyphshow
grestore
/DejaVuSans findfont
16.000 scalefont
setfont
gsave
227.554687 271.509375 translate
0.000000 rotate
0.000000 0.234375 m /s glyphshow
8.335938 0.234375 m /t glyphshow
14.609375 0.234375 m /e glyphshow
24.453125 0.234375 m /l glyphshow
28.898438 0.234375 m /l glyphshow
33.343750 0.234375 m /a glyphshow
43.148438 0.234375 m /r glyphshow
grestore
gsave
234.140625 252.928125 translate
0.000000 rotate
0.000000 0.234375 m /w glyphshow
13.085938 0.234375 m /i glyphshow
17.531250 0.234375 m /n glyphshow
27.671875 0.234375 m /d glyphshow
grestore
gsave
229.773437 231.253125 translate
0.000000 rotate
0.000000 3.328125 m /parenleft glyphshow
6.242188 3.328125 m /p glyphshow
16.398438 3.328125 m /o glyphshow
26.187500 3.328125 m /s glyphshow
34.523438 3.328125 m /t glyphshow
40.796875 3.328125 m /hyphen glyphshow
grestore
gsave
226.828125 213.890625 translate
0.000000 rotate
0.000000 2.109375 m /s glyphshow
8.335938 2.109375 m /h glyphshow
18.476562 2.109375 m /o glyphshow
28.265625 2.109375 m /c glyphshow
37.062500 2.109375 m /k glyphshow
46.328125 2.109375 m /parenright glyphshow
grestore
/DejaVuSans findfont
20.000 scalefont
setfont
gsave
250.445312 87.750000 translate
0.000000 rotate
0.000000 0.281250 m /d glyphshow
12.695312 0.281250 m /i glyphshow
18.251953 0.281250 m /s glyphshow
28.671875 0.281250 m /k glyphshow
grestore
gsave
247.687500 64.518750 translate
0.000000 rotate
0.000000 0.281250 m /w glyphshow
16.357422 0.281250 m /i glyphshow
21.914062 0.281250 m /n glyphshow
34.589844 0.281250 m /d glyphshow
grestore
end
diff --git a/figures/sketch/sketch.png b/figures/sketch/sketch.png
index 5e25d54..614652b 100644
Binary files a/figures/sketch/sketch.png and b/figures/sketch/sketch.png differ
diff --git a/scripts/sketch.py b/scripts/sketch.py
index dcb40db..410a83d 100644
--- a/scripts/sketch.py
+++ b/scripts/sketch.py
...
patch = patches.PathPatch(path, facecolor='none', lw=2)
ax.add_patch(patch)
x =
np.arange(0,0.45,0.01)
ax.plot(0.05+0.35+x, 0.05+3*x**2, np.arange(0,0.75,0.01)
ax.plot(0.05+0.15+x, 0.05+1.2*x**2, lw=3, c='k')
ax.text(0.85, .68, ax.text(0.87, .75, r'$R_{\rm{contdisc}}(z)$', fontsize=20, horizontalalignment='center', verticalalignment='center')
ax.text(.25,.7, 'stellar\nwind\n(pre-shock)', fontsize=20, ha='center')
ax.text(.7,.5, 'stellar\nwind\n(post-\nshock)', fontsize=16, ha='center')
ax.text(.75,.15, 'disk\nwind', fontsize=20, ha='center')
ax.set_xlim([0,1])
ax.set_ylim([0,1])