changeset 219:74fb30d566c1

Comments added to blog patches
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Mon, 16 May 2016 17:50:11 +0100
parents 2ae93fab838a
children 688d7a5bd346
files Blog Patches/ATT.pd Blog Patches/TUCalc2.pd Blog Patches/freqCalcCyl4No_D4Mach.pd
diffstat 3 files changed, 352 insertions(+), 385 deletions(-) [+]
line wrap: on
line diff
--- a/Blog Patches/ATT.pd	Mon May 16 17:30:09 2016 +0100
+++ b/Blog Patches/ATT.pd	Mon May 16 17:50:11 2016 +0100
@@ -1,6 +1,6 @@
-#N canvas 91 102 1333 826 10;
+#N canvas 83 38 1333 826 10;
 #X obj 26 65 hsl 80 25 0.0005 0.5 1 0 empty empty Diameter 2 15 0 10
--261682 -1 -1 3171 1;
+-261682 -1 -1 2842 1;
 #X floatatom 24 95 0 0 0 0 - - -;
 #X obj 24 322 hsl 80 25 0.01 0.99 0 0 empty empty Panning 2 15 0 10
 -261682 -1 -1 3950 1;
@@ -9,10 +9,10 @@
 -261682 -1 -1 3950 1;
 #X floatatom 22 251 0 0 0 0 - - -;
 #X obj 25 272 hsl 80 25 -180 180 0 0 empty empty Obs_Elevation 2 15
-0 10 -261682 -1 -1 5925 1;
+0 10 -261682 -1 -1 5815 1;
 #X floatatom 22 301 0 0 0 0 - - -;
 #X obj 26 171 hsl 80 25 100 1 1 0 empty empty Obs_Distance 2 15 0 10
--261682 -1 -1 4826 1;
+-261682 -1 -1 5522 1;
 #X floatatom 24 200 0 0 0 0 - - -;
 #X obj 157 291 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 220 291 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -41,64 +41,53 @@
 #X connect 10 0 4 1;
 #X restore 316 239 pd opLevels;
 #X obj 24 371 hsl 100 25 0.1 1e+11 1 0 empty empty Gain 2 15 0 10 -203904
--1 -1 0 1;
-#X obj 422 -121 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1
--1;
+-1 -1 8122 1;
 #X obj 27 117 hsl 80 25 1 20 0 0 empty empty Length 2 15 0 10 -261682
--1 -1 2495 1;
+-1 -1 1663 1;
 #X floatatom 24 149 0 0 0 0 - - -;
-#X obj 422 -80 s SET_UP;
-#X obj 378 360 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+#X obj -352 309 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 0 1;
-#X floatatom 415 389 5 0 0 0 - - -;
-#X obj 460 334 r SET_UP;
-#X obj 391 420 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+#X floatatom -315 338 5 0 0 0 - - -;
+#X obj -270 283 r SET_UP;
+#X obj -339 369 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 0 1;
-#X floatatom 410 447 5 0 0 0 - - -;
-#X obj 484 388 r SET_UP;
-#X obj 405 472 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+#X floatatom -320 396 5 0 0 0 - - -;
+#X obj -246 337 r SET_UP;
+#X obj -325 421 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 0 1;
-#X floatatom 416 494 5 0 0 0 - - -;
-#X obj 500 441 r SET_UP;
-#X text 541 415 Source Rotation Y;
-#X text 557 468 Source Rotation Z;
-#X obj -310 392 s GAIN;
+#X floatatom -314 443 5 0 0 0 - - -;
+#X obj -230 390 r SET_UP;
+#X text -189 364 Source Rotation Y;
+#X text -173 417 Source Rotation Z;
+#X obj 508 363 s GAIN;
 #X obj -59 344 r GAIN;
-#X obj -352 478 s DIST;
+#X obj 466 449 s DIST;
 #X obj -45 140 r DIST;
-#X obj -373 520 s LEN;
+#X obj 445 491 s LEN;
 #X obj -41 92 r LEN;
-#X obj -394 559 s DIA;
+#X obj 424 530 s DIA;
 #X obj -36 32 r DIA;
-#X obj -415 597 s SPEED;
+#X obj 403 568 s SPEED;
 #X floatatom 21 400 0 0 0 0 - - -;
 #X obj -54 236 r ELEV;
-#X obj -363 -65 snapshot~;
-#X floatatom -363 -38 10 0 0 0 - - -;
-#X text -366 -20 Wind Speed;
-#X text 526 361 Source Rotation X;
-#X obj -282 -65 snapshot~;
-#X floatatom -282 -38 10 0 0 0 - - -;
-#X text -285 -20 Wind Direction;
-#X obj 618 -69 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
-1;
-#X obj 618 -94 loadbang;
-#X obj 618 -23 s myMet;
-#X obj -282 -88 r myMet;
-#X obj -363 -88 r myMet;
-#X obj -331 436 s ELEV;
-#X obj -310 373 line \$1 50;
-#X obj -331 414 line \$1 50;
-#X obj -352 456 line \$1 50;
-#X obj -373 499 line \$1 50;
-#X obj -394 540 line \$1 50;
-#X obj -415 578 line \$1 50;
-#X obj 618 -47 metro 100;
-#X obj 416 526 r blust;
-#X obj 416 549 * 100;
-#X floatatom 417 570 0 0 0 0 - - -;
-#X text 464 548 Free Stream Turbulence Intensity (%);
-#X obj 474 506 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144
+#X text -204 310 Source Rotation X;
+#X obj -267 -67 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -267 -87 loadbang;
+#X obj -267 -27 s myMet;
+#X obj 487 407 s ELEV;
+#X obj 508 344 line \$1 50;
+#X obj 487 385 line \$1 50;
+#X obj 466 427 line \$1 50;
+#X obj 445 470 line \$1 50;
+#X obj 424 511 line \$1 50;
+#X obj 403 549 line \$1 50;
+#X obj -267 -48 metro 100;
+#X obj -314 475 r blust;
+#X obj -314 498 * 100;
+#X floatatom -313 519 0 0 0 0 - - -;
+#X text -266 497 Free Stream Turbulence Intensity (%);
+#X obj -256 455 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 0 1;
 #X obj 59 540 freqCalcCyl4No_D4Mach;
 #X obj -156 162 delwrite~ varwind 3000;
@@ -107,7 +96,7 @@
 #X msg -156 65 \$1 50;
 #X obj -156 85 line~;
 #X obj 26 14 hsl 80 25 0.1 50 0 0 empty empty Air_Speed 2 15 0 10 -204800
--1 -1 0 1;
+-1 -1 3625 1;
 #X floatatom 23 43 0 0 0 0 - - -;
 #X text 154 155 Frequency;
 #X floatatom 156 172 0 0 0 0 - - -;
@@ -115,12 +104,12 @@
 #X text 153 194 Reynolds number;
 #X floatatom 155 249 0 0 0 0 - - -;
 #X text 153 232 Strouhal number;
-#X obj -43 560 snapshot~;
-#X obj -43 537 r myMet;
-#X obj 121 588 snapshot~;
-#X obj 121 565 r myMet;
-#X obj 230 584 snapshot~;
-#X obj 230 561 r myMet;
+#X obj -31 497 snapshot~;
+#X obj -31 474 r myMet;
+#X obj 160 506 snapshot~;
+#X obj 160 483 r myMet;
+#X obj 250 523 snapshot~;
+#X obj 250 500 r myMet;
 #X obj 154 37 bng 15 250 50 0 empty empty empty 17 7 0 10 -4032 -1
 -1;
 #X text 150 18 Preset 1;
@@ -137,99 +126,101 @@
 #X obj -47 198 r AZIM;
 #X obj 147 -35 loadbang;
 #X obj -64 280 r PAN;
-#X obj -289 333 line \$1 50;
-#X obj -289 352 s PAN;
-#X obj -399 268 unpack f f f f f f f f;
-#X obj -270 292 line \$1 50;
-#X obj -270 311 s AZIM;
-#X msg -400 130 23 0.006 5 4 85 7e+08 0.5 0;
-#X msg -372 215 28 0.033 7 6 35 7e+08 0.45 -5;
-#X msg -379 182 17 0.003 10 3 -100 7e+08 0.8 55;
-#X msg -391 154 24 0.01 15 6 20 7e+08 0.4 -20;
+#X obj 529 304 line \$1 50;
+#X obj 529 323 s PAN;
+#X obj 419 239 unpack f f f f f f f f;
+#X obj 548 263 line \$1 50;
+#X obj 548 282 s AZIM;
+#X msg 418 101 23 0.006 5 4 85 7e+08 0.5 0;
+#X msg 446 186 28 0.033 7 6 35 7e+08 0.45 -5;
+#X msg 439 153 17 0.003 10 3 -100 7e+08 0.8 55;
+#X msg 427 125 24 0.01 15 6 20 7e+08 0.4 -20;
 #X obj 183 113 bng 15 250 50 0 empty empty empty 17 7 0 10 -258113
 -1 -1;
 #X text 178 95 Stop;
-#X msg -358 237 0.1 0.008 7 6 90 0 0.5 0;
+#X msg 460 208 0.1 0.008 7 6 90 0 0.5 0;
+#X text 364 -94 Holding patch for all the elements required to generate
+the Aeolian tone sound.;
+#X text 637 118 Presets;
+#X text 7 566 Patch that performs the calculations \, holds the noise
+sources and filters.;
+#X text -398 240 Additional objects should 3D rotation of the source
+be required;
 #X connect 0 0 1 0;
-#X connect 0 0 65 0;
+#X connect 0 0 55 0;
 #X connect 2 0 3 0;
-#X connect 2 0 65 5;
+#X connect 2 0 55 5;
 #X connect 4 0 5 0;
-#X connect 4 0 65 3;
+#X connect 4 0 55 3;
 #X connect 6 0 7 0;
-#X connect 6 0 65 4;
+#X connect 6 0 55 4;
 #X connect 8 0 9 0;
-#X connect 8 0 65 2;
+#X connect 8 0 55 2;
 #X connect 12 0 10 0;
 #X connect 12 1 11 0;
 #X connect 13 0 12 0;
-#X connect 13 0 38 0;
-#X connect 14 0 17 0;
-#X connect 15 0 16 0;
-#X connect 15 0 65 1;
-#X connect 18 0 19 0;
-#X connect 20 0 18 0;
-#X connect 21 0 22 0;
-#X connect 23 0 21 0;
-#X connect 24 0 25 0;
-#X connect 26 0 24 0;
-#X connect 30 0 13 0;
-#X connect 32 0 8 0;
-#X connect 34 0 15 0;
-#X connect 36 0 0 0;
-#X connect 39 0 6 0;
-#X connect 40 0 41 0;
-#X connect 44 0 45 0;
-#X connect 47 0 59 0;
-#X connect 48 0 47 0;
-#X connect 50 0 44 0;
-#X connect 51 0 40 0;
-#X connect 53 0 29 0;
-#X connect 54 0 52 0;
-#X connect 55 0 31 0;
-#X connect 56 0 33 0;
-#X connect 57 0 35 0;
-#X connect 58 0 37 0;
-#X connect 59 0 49 0;
-#X connect 60 0 61 0;
+#X connect 13 0 36 0;
+#X connect 14 0 15 0;
+#X connect 14 0 55 1;
+#X connect 16 0 17 0;
+#X connect 18 0 16 0;
+#X connect 19 0 20 0;
+#X connect 21 0 19 0;
+#X connect 22 0 23 0;
+#X connect 24 0 22 0;
+#X connect 28 0 13 0;
+#X connect 30 0 8 0;
+#X connect 32 0 14 0;
+#X connect 34 0 0 0;
+#X connect 37 0 6 0;
+#X connect 39 0 49 0;
+#X connect 40 0 39 0;
+#X connect 43 0 27 0;
+#X connect 44 0 42 0;
+#X connect 45 0 29 0;
+#X connect 46 0 31 0;
+#X connect 47 0 33 0;
+#X connect 48 0 35 0;
+#X connect 49 0 41 0;
+#X connect 50 0 51 0;
+#X connect 51 0 52 0;
+#X connect 55 0 69 0;
+#X connect 55 1 71 0;
+#X connect 55 2 73 0;
+#X connect 57 0 58 0;
+#X connect 59 0 60 0;
+#X connect 60 0 56 0;
+#X connect 60 0 57 0;
+#X connect 61 0 59 0;
 #X connect 61 0 62 0;
-#X connect 65 0 79 0;
-#X connect 65 1 81 0;
-#X connect 65 2 83 0;
-#X connect 67 0 68 0;
-#X connect 69 0 70 0;
-#X connect 70 0 66 0;
-#X connect 70 0 67 0;
-#X connect 71 0 69 0;
-#X connect 71 0 72 0;
-#X connect 79 0 74 0;
-#X connect 80 0 79 0;
-#X connect 81 0 75 0;
-#X connect 82 0 81 0;
-#X connect 83 0 77 0;
-#X connect 84 0 83 0;
-#X connect 85 0 102 0;
-#X connect 87 0 105 0;
-#X connect 89 0 104 0;
-#X connect 90 0 103 0;
-#X connect 93 0 71 0;
-#X connect 94 0 4 0;
-#X connect 95 0 85 0;
-#X connect 96 0 2 0;
-#X connect 97 0 98 0;
-#X connect 99 0 58 0;
-#X connect 99 1 57 0;
-#X connect 99 2 56 0;
-#X connect 99 3 55 0;
-#X connect 99 4 54 0;
-#X connect 99 5 53 0;
-#X connect 99 6 97 0;
-#X connect 99 7 100 0;
-#X connect 100 0 101 0;
-#X connect 102 0 99 0;
-#X connect 103 0 99 0;
-#X connect 104 0 99 0;
-#X connect 105 0 99 0;
-#X connect 106 0 108 0;
-#X connect 108 0 99 0;
+#X connect 69 0 64 0;
+#X connect 70 0 69 0;
+#X connect 71 0 65 0;
+#X connect 72 0 71 0;
+#X connect 73 0 67 0;
+#X connect 74 0 73 0;
+#X connect 75 0 92 0;
+#X connect 77 0 95 0;
+#X connect 79 0 94 0;
+#X connect 80 0 93 0;
+#X connect 83 0 61 0;
+#X connect 84 0 4 0;
+#X connect 85 0 75 0;
+#X connect 86 0 2 0;
+#X connect 87 0 88 0;
+#X connect 89 0 48 0;
+#X connect 89 1 47 0;
+#X connect 89 2 46 0;
+#X connect 89 3 45 0;
+#X connect 89 4 44 0;
+#X connect 89 5 43 0;
+#X connect 89 6 87 0;
+#X connect 89 7 90 0;
+#X connect 90 0 91 0;
+#X connect 92 0 89 0;
+#X connect 93 0 89 0;
+#X connect 94 0 89 0;
+#X connect 95 0 89 0;
+#X connect 96 0 98 0;
+#X connect 98 0 89 0;
 #X coords 0 -1 1 1 270 430 2 0 0;
--- a/Blog Patches/TUCalc2.pd	Mon May 16 17:30:09 2016 +0100
+++ b/Blog Patches/TUCalc2.pd	Mon May 16 17:50:11 2016 +0100
@@ -145,7 +145,7 @@
 #X connect 50 0 51 0;
 #X connect 51 0 38 0;
 #X restore 46 153 pd partAve;
-#N canvas 626 183 879 679 partAveMain 0;
+#N canvas 534 83 879 679 partAveMain 0;
 #X obj 129 86 r myMet;
 #X obj 129 164 -;
 #X obj 114 213 +;
@@ -1662,6 +1662,8 @@
 #X obj 314 610 / 100;
 #X floatatom 181 591 5 0 0 0 - - -;
 #X floatatom 181 439 5 0 0 0 - - -;
+#X text 442 181 This patch calculates the turbulence intensity based
+on the average over a set time period;
 #X connect 0 0 14 0;
 #X connect 0 0 24 0;
 #X connect 3 0 4 0;
--- a/Blog Patches/freqCalcCyl4No_D4Mach.pd	Mon May 16 17:30:09 2016 +0100
+++ b/Blog Patches/freqCalcCyl4No_D4Mach.pd	Mon May 16 17:50:11 2016 +0100
@@ -1,29 +1,29 @@
 #N canvas 159 62 1370 784 10;
-#X text 587 178 Mass Density of Air;
-#X obj 709 179 *~ 1.225;
-#X obj 709 254 /~ 1.81e-05;
-#X obj 709 209 *~ 1;
-#X obj 709 372 /~ 1;
-#X obj 709 348 *~;
+#X text 582 246 Mass Density of Air;
+#X obj 704 247 *~ 1.225;
+#X obj 704 322 /~ 1.81e-05;
+#X obj 704 277 *~ 1;
+#X obj 704 440 /~ 1;
+#X obj 704 416 *~;
 #X obj 223 63 inlet;
-#X text 742 298 Reynolds Number;
-#X text 589 365 Strouhal Number;
+#X text 737 366 Reynolds Number;
+#X text 584 433 Strouhal Number;
 #X obj 388 61 inlet;
-#X text 739 234 Viscosity;
+#X text 734 302 Viscosity;
 #X obj 223 84 s \$0-diameter;
-#X obj 770 178 r \$0-diameter;
-#X obj 777 353 r \$0-diameter;
+#X obj 765 246 r \$0-diameter;
+#X obj 772 421 r \$0-diameter;
 #X obj 120 85 s~ \$0-windSpeed;
-#X obj 776 330 r~ \$0-windSpeed;
-#X obj 709 151 r~ \$0-windSpeed;
-#X obj 709 396 s~ \$0-myFreq;
+#X obj 771 398 r~ \$0-windSpeed;
+#X obj 704 219 r~ \$0-windSpeed;
+#X obj 704 464 s~ \$0-myFreq;
 #X obj 1052 375 *~;
-#X obj 722 278 s~ \$0-myRey;
+#X obj 717 346 s~ \$0-myRey;
 #X obj 636 57 inlet;
-#X text 673 415 Calculates the frequency;
-#X text 674 427 based on the physics of;
-#X obj 307 404 r~ \$0-windSpeed;
-#X obj 347 466 r \$0-diameter;
+#X text 668 502 Calculates the frequency;
+#X text 669 515 based on the physics of;
+#X obj 317 425 r~ \$0-windSpeed;
+#X obj 357 487 r \$0-diameter;
 #X obj 460 60 inlet;
 #X obj 534 59 inlet;
 #X text 293 367 Calculates the gain of the dipole source;
@@ -35,7 +35,7 @@
 #X text 133 41 Wind Speed;
 #X obj 315 60 inlet;
 #X text 311 41 Length;
-#X obj 709 319 newStrou;
+#X obj 704 387 newStrou;
 #X obj 1052 444 throw~ l;
 #X obj 1079 422 throw~ r;
 #X obj 1052 400 fcpan;
@@ -43,11 +43,11 @@
 #X obj 388 82 s \$0-dist;
 #X obj 400 331 s~ \$0-dragDiGain;
 #X obj 313 352 s~ \$0-liftDiGain;
-#X obj 294 385 r~ \$0-str;
-#X obj 333 444 r \$0-leng;
-#X obj 360 487 r \$0-dist;
-#X obj 294 580 s~ \$0-liftNoiseGain;
-#X obj 609 350 s~ \$0-str;
+#X obj 304 406 r~ \$0-str;
+#X obj 343 465 r \$0-leng;
+#X obj 370 508 r \$0-dist;
+#X obj 304 601 s~ \$0-liftNoiseGain;
+#X obj 604 418 s~ \$0-str;
 #X obj 636 126 s \$0-thisPan;
 #X obj 1052 178 r~ \$0-liftNoiseGain;
 #X obj 1079 375 r \$0-thisPan;
@@ -68,7 +68,7 @@
 #X obj 313 142 r~ \$0-str;
 #X obj 331 183 r \$0-leng;
 #X obj 356 241 r \$0-dist;
-#N canvas 205 88 1238 721 GoldfreqGain 1;
+#N canvas 83 79 1238 721 GoldfreqGain 0;
 #N canvas 759 125 286 294 pow6 0;
 #X obj 47 67 *~;
 #X obj 76 67 *~;
@@ -172,9 +172,9 @@
 #X obj 219 238 *~ 1.225;
 #X text 93 234 Mass Density of Air;
 #X text 145 343 Sqrt(2xpi);
-#X obj 359 498 /~ 360;
-#X obj 359 544 *~;
-#X obj 359 520 cos~;
+#X obj 306 495 /~ 360;
+#X obj 306 541 *~;
+#X obj 306 517 cos~;
 #X obj 219 567 *~;
 #X obj 411 191 * 4.05513e+07;
 #X text 362 210 Speed of Sound to power 3;
@@ -244,7 +244,6 @@
 #X obj 887 398 sig~;
 #X obj 872 423 /~;
 #X text 595 191 Remember - Goldstein moves cylinder;
-#X floatatom 366 193 5 0 0 0 - - -;
 #X obj 525 194 /~ 360;
 #X obj 758 475 *~;
 #X obj 478 51 s~ \$0-thisColL;
@@ -252,10 +251,10 @@
 #X obj 270 190 *~ 1;
 #X obj 219 210 *~;
 #X obj 478 28 inlet~;
-#X floatatom 265 121 5 0 0 0 - - -;
+#X floatatom 268 86 5 0 0 0 - - -;
 #X obj 234 495 sin~;
-#X floatatom 277 41 5 0 0 0 - - -;
-#N canvas 921 315 426 401 aveTimeCal 1;
+#X floatatom 278 34 5 0 0 0 - - -;
+#N canvas 921 315 426 401 aveTimeCal 0;
 #X text 224 38 Elevation;
 #X obj 226 56 r \$0-elev;
 #X floatatom 240 81 5 0 0 0 - - -;
@@ -305,41 +304,30 @@
 #X msg 525 151 \$1 5;
 #X obj 773 338 line~;
 #X msg 773 316 \$1 5;
-#X obj 359 430 r \$0-this_azim;
+#X obj 306 427 r \$0-this_azim;
 #X obj 234 401 r \$0-this_elev;
 #X obj 234 445 line~;
 #X msg 234 423 \$1 5;
-#X obj 359 474 line~;
-#X msg 359 452 \$1 5;
+#X obj 306 471 line~;
+#X msg 306 449 \$1 5;
 #X obj 219 317 /~ 400;
 #X text -53 316 Scale factor to bring in line with CFD calcs;
 #X obj 685 572 s~ plotOPD;
-#X obj 529 379 snapshot~;
-#X floatatom 529 406 10 0 0 0 - - -;
-#X obj 529 350 r myMet;
-#X obj 564 217 /~ 343.56;
 #X msg 219 100 \$1 15;
-#X obj 984 488 r myMet;
-#X obj 984 510 snapshot~;
-#X floatatom 984 532 0 0 0 0 - - -;
-#X obj 545 553 r myMet;
-#X obj 545 575 snapshot~;
-#X floatatom 545 597 0 0 0 0 - - -;
+#X obj 565 217 r~ MY_MACH;
 #X connect 0 0 2 0;
 #X connect 1 0 2 1;
-#X connect 2 0 92 0;
+#X connect 2 0 91 0;
 #X connect 3 0 44 0;
-#X connect 3 0 86 0;
 #X connect 8 0 1 0;
 #X connect 8 0 1 1;
-#X connect 9 0 98 0;
-#X connect 9 0 119 0;
-#X connect 11 0 91 1;
+#X connect 9 0 97 0;
+#X connect 11 0 90 1;
 #X connect 12 0 5 0;
 #X connect 12 0 76 0;
 #X connect 15 0 17 1;
-#X connect 17 0 113 0;
-#X connect 18 0 95 0;
+#X connect 17 0 112 0;
+#X connect 18 0 94 0;
 #X connect 19 0 20 1;
 #X connect 20 0 43 0;
 #X connect 21 0 24 0;
@@ -356,7 +344,6 @@
 #X connect 42 0 41 0;
 #X connect 42 0 41 1;
 #X connect 43 0 13 0;
-#X connect 43 0 125 0;
 #X connect 44 0 46 0;
 #X connect 46 0 52 0;
 #X connect 47 0 48 0;
@@ -369,8 +356,7 @@
 #X connect 54 0 20 0;
 #X connect 56 0 84 0;
 #X connect 57 0 14 0;
-#X connect 57 0 115 0;
-#X connect 57 0 122 0;
+#X connect 57 0 114 0;
 #X connect 58 0 59 0;
 #X connect 59 0 61 0;
 #X connect 60 0 65 0;
@@ -380,13 +366,13 @@
 #X connect 63 0 65 1;
 #X connect 64 0 63 0;
 #X connect 64 0 63 1;
-#X connect 65 0 88 0;
+#X connect 65 0 87 0;
 #X connect 68 0 70 0;
 #X connect 68 0 73 0;
 #X connect 69 0 71 0;
 #X connect 69 0 74 0;
-#X connect 72 0 106 0;
-#X connect 75 0 104 0;
+#X connect 72 0 105 0;
+#X connect 75 0 103 0;
 #X connect 77 0 79 0;
 #X connect 77 0 79 1;
 #X connect 78 0 3 0;
@@ -395,43 +381,36 @@
 #X connect 80 0 82 0;
 #X connect 82 0 83 0;
 #X connect 83 0 84 1;
-#X connect 84 0 88 1;
-#X connect 87 0 47 0;
-#X connect 88 0 57 0;
-#X connect 90 0 91 0;
-#X connect 91 0 92 1;
-#X connect 92 0 37 0;
-#X connect 93 0 89 0;
-#X connect 95 0 19 0;
-#X connect 95 0 19 1;
-#X connect 97 0 96 0;
-#X connect 97 0 98 0;
-#X connect 98 0 94 0;
-#X connect 98 0 120 0;
-#X connect 99 0 0 0;
-#X connect 100 0 87 0;
-#X connect 101 0 103 0;
-#X connect 102 0 58 0;
-#X connect 103 0 102 0;
-#X connect 104 0 100 0;
-#X connect 105 0 62 0;
-#X connect 106 0 105 0;
-#X connect 107 0 112 0;
-#X connect 108 0 110 0;
-#X connect 109 0 18 0;
-#X connect 110 0 109 0;
-#X connect 111 0 40 0;
-#X connect 112 0 111 0;
-#X connect 113 0 36 0;
-#X connect 116 0 117 0;
-#X connect 118 0 116 0;
-#X connect 119 0 48 1;
-#X connect 119 0 116 0;
-#X connect 120 0 99 0;
-#X connect 121 0 122 0;
-#X connect 122 0 123 0;
-#X connect 124 0 125 0;
-#X connect 125 0 126 0;
+#X connect 84 0 87 1;
+#X connect 86 0 47 0;
+#X connect 87 0 57 0;
+#X connect 89 0 90 0;
+#X connect 90 0 91 1;
+#X connect 91 0 37 0;
+#X connect 92 0 88 0;
+#X connect 94 0 19 0;
+#X connect 94 0 19 1;
+#X connect 96 0 95 0;
+#X connect 96 0 97 0;
+#X connect 97 0 93 0;
+#X connect 97 0 115 0;
+#X connect 98 0 0 0;
+#X connect 99 0 86 0;
+#X connect 100 0 102 0;
+#X connect 101 0 58 0;
+#X connect 102 0 101 0;
+#X connect 103 0 99 0;
+#X connect 104 0 62 0;
+#X connect 105 0 104 0;
+#X connect 106 0 111 0;
+#X connect 107 0 109 0;
+#X connect 108 0 18 0;
+#X connect 109 0 108 0;
+#X connect 110 0 40 0;
+#X connect 111 0 110 0;
+#X connect 112 0 36 0;
+#X connect 115 0 98 0;
+#X connect 116 0 48 1;
 #X restore 313 307 pd GoldfreqGain;
 #N canvas 300 30 1006 797 GoldnoiseGain 0;
 #X text -21037 364 Mass Density of Air \, squared;
@@ -549,7 +528,7 @@
 #X obj -20777 530 *~;
 #X obj -20861 574 /~;
 #X obj -20624 194 -~;
-#X text -20533 187 Angle goes with the flow in Goldstein hence 90 -
+#X text -20543 190 Angle goes with the flow in Goldstein hence 90 -
 theta so that theta is same angle as dipole angles.;
 #X obj -20624 149 sig~ 180;
 #X obj -20609 172 r~ \$0-this_elev;
@@ -614,10 +593,10 @@
 #X obj -20861 595 *~ 1;
 #X obj -20587 262 /~ 360;
 #X obj -20624 306 *~;
-#X obj -20609 326 /~ 343.56;
 #X text -21131 486 Scale factor to bring in line with CFD calcs;
 #X text -20929 530 Sqrt(2*pi);
 #X obj -20861 488 /~ 10000;
+#X obj -20609 326 r~ MY_MACH;
 #X connect 1 0 61 0;
 #X connect 3 0 46 1;
 #X connect 4 0 53 0;
@@ -658,13 +637,12 @@
 #X connect 46 0 47 0;
 #X connect 47 0 20 0;
 #X connect 48 0 49 1;
-#X connect 49 0 71 0;
+#X connect 49 0 70 0;
 #X connect 50 0 37 0;
 #X connect 53 0 57 0;
 #X connect 55 0 54 0;
 #X connect 55 0 53 0;
 #X connect 56 0 3 0;
-#X connect 56 0 68 0;
 #X connect 57 0 56 0;
 #X connect 58 0 19 0;
 #X connect 59 0 58 0;
@@ -676,17 +654,17 @@
 #X connect 65 0 7 0;
 #X connect 66 0 64 0;
 #X connect 67 0 27 0;
-#X connect 68 0 27 1;
-#X connect 71 0 50 0;
-#X restore 294 552 pd GoldnoiseGain;
-#X text 285 599 Calculates the gain of the wake;
+#X connect 70 0 50 0;
+#X connect 71 0 27 1;
+#X restore 304 573 pd GoldnoiseGain;
+#X text 295 620 Calculates the gain of the wake;
 #X obj 460 80 s \$0-azim;
 #X obj 534 80 s \$0-elev;
 #X obj 365 262 r \$0-elev;
 #X obj 373 283 r \$0-azim;
-#X obj 387 531 r \$0-elev;
-#X obj 373 508 r \$0-azim;
-#N canvas 1021 287 444 428 corrLen 0;
+#X obj 397 552 r \$0-elev;
+#X obj 383 529 r \$0-azim;
+#N canvas 743 232 444 428 corrLen 0;
 #X obj 103 71 inlet~;
 #X obj 88 200 outlet~;
 #X obj 88 143 *~;
@@ -695,53 +673,51 @@
 #X text 234 22 Y = 10^b . X^m;
 #X text 235 40 b = 1.536;
 #X text 235 56 m = -0.245;
-#X text 80 297 Equation of line derived from Norberg 2001;
 #X obj 88 169 max~ 1;
 #X obj 88 46 sig~ 44.67;
 #X obj 229 190 r myMet;
 #X obj 229 211 snapshot~;
 #X floatatom 230 236 5 0 0 0 - - -;
+#X text 56 298 This patch calculates the correlation length associated
+with the dipole source. Equation of line derived from Norberg 2001
+;
 #X connect 0 0 4 0;
-#X connect 2 0 9 0;
+#X connect 2 0 8 0;
 #X connect 3 0 4 1;
 #X connect 4 0 2 1;
-#X connect 9 0 1 0;
-#X connect 9 0 12 0;
-#X connect 10 0 2 0;
+#X connect 8 0 1 0;
+#X connect 8 0 11 0;
+#X connect 9 0 2 0;
+#X connect 10 0 11 0;
 #X connect 11 0 12 0;
-#X connect 12 0 13 0;
 #X restore 956 85 pd corrLen Calc;
 #X obj 956 62 r~ \$0-myRey;
 #X obj 956 109 s~ \$0-myCor;
 #X obj 347 222 r~ \$0-myCor;
 #X obj 1067 350 hip~;
-#X obj 320 424 r~ \$0-myCor;
+#X obj 330 445 r~ \$0-myCor;
 #X obj 636 81 max 0.01;
 #X obj 636 104 min 0.99;
 #N canvas 93 119 976 679 Dipoles 0;
 #X obj 118 66 r~ \$0-myFreq;
-#X obj 353 69 r~ \$0-myFreq;
-#X obj 621 62 r~ \$0-myFreq;
+#X obj 397 51 r~ \$0-myFreq;
+#X obj 668 44 r~ \$0-myFreq;
 #X obj 816 126 r~ \$0-liftDiGain;
-#X obj 621 280 throw~ l;
-#X obj 648 257 throw~ r;
-#X obj 621 235 fcpan;
-#X obj 648 214 r \$0-thisPan;
-#X obj 621 86 *~ 5;
-#X obj 353 93 *~ 3;
-#X obj 138 346 r~ \$0-myFreq;
-#X obj 252 431 r~ \$0-dragDiGain;
-#X obj 138 374 *~ 2;
-#X obj 408 345 r~ \$0-myFreq;
-#X obj 549 403 r~ \$0-dragDiGain;
-#X obj 408 373 *~ 4;
-#X obj 549 426 *~ 0.125;
-#X obj 210 199 *~;
-#X obj 210 264 throw~ l;
-#X obj 237 241 throw~ r;
-#X obj 210 220 fcpan;
+#X obj 668 68 *~ 5;
+#X obj 397 75 *~ 3;
+#X obj 139 407 r~ \$0-myFreq;
+#X obj 253 492 r~ \$0-dragDiGain;
+#X obj 139 435 *~ 2;
+#X obj 409 406 r~ \$0-myFreq;
+#X obj 550 464 r~ \$0-dragDiGain;
+#X obj 409 434 *~ 4;
+#X obj 550 487 *~ 0.125;
+#X obj 210 183 *~;
+#X obj 210 248 throw~ l;
+#X obj 237 225 throw~ r;
+#X obj 210 204 fcpan;
 #X obj 210 108 vcf~ 3;
-#X obj 237 198 r \$0-thisPan;
+#X obj 237 182 r \$0-thisPan;
 #X obj 210 67 r~ \$0-thisNoise;
 #X obj 480 192 *~;
 #X obj 480 257 throw~ l;
@@ -749,137 +725,131 @@
 #X obj 480 213 fcpan;
 #X obj 480 116 vcf~ 3;
 #X obj 507 191 r \$0-thisPan;
-#X obj 480 44 r~ \$0-thisNoise;
+#X obj 480 48 r~ \$0-thisNoise;
 #X obj 750 183 *~;
 #X obj 750 248 throw~ l;
 #X obj 777 225 throw~ r;
 #X obj 750 204 fcpan;
 #X obj 750 107 vcf~ 3;
 #X obj 777 182 r \$0-thisPan;
-#X obj 750 24 r~ \$0-thisNoise;
-#X obj 217 464 *~;
-#X obj 217 529 throw~ l;
-#X obj 244 506 throw~ r;
-#X obj 217 485 fcpan;
-#X obj 217 388 vcf~ 3;
-#X obj 244 463 r \$0-thisPan;
-#X obj 217 344 r~ \$0-thisNoise;
-#X obj 491 462 *~;
-#X obj 491 527 throw~ l;
-#X obj 518 504 throw~ r;
-#X obj 491 483 fcpan;
-#X obj 491 386 vcf~ 3;
-#X obj 518 461 r \$0-thisPan;
-#X obj 491 312 r~ \$0-thisNoise;
+#X obj 750 38 r~ \$0-thisNoise;
+#X obj 218 525 *~;
+#X obj 218 590 throw~ l;
+#X obj 245 567 throw~ r;
+#X obj 218 546 fcpan;
+#X obj 218 449 vcf~ 3;
+#X obj 245 524 r \$0-thisPan;
+#X obj 218 405 r~ \$0-thisNoise;
+#X obj 492 523 *~;
+#X obj 492 588 throw~ l;
+#X obj 519 565 throw~ r;
+#X obj 492 544 fcpan;
+#X obj 492 447 vcf~ 3;
+#X obj 519 522 r \$0-thisPan;
+#X obj 492 373 r~ \$0-thisNoise;
 #X text 273 27 Generates the sound associated with the lift dipole.
 ;
-#X text 175 312 Generates the sound associated with the drag dipole.
+#X text 176 373 Generates the sound associated with the drag dipole.
 ;
 #X obj 270 87 r \$0-Qval;
-#X obj 530 68 r \$0-Qval;
-#X obj 800 46 r \$0-Qval;
-#X obj 537 333 r \$0-Qval;
-#X obj 262 366 r \$0-Qval;
-#X obj 750 154 *~ 1;
-#X obj 491 428 *~ 1;
-#X obj 217 431 *~ 1;
+#X obj 523 72 r \$0-Qval;
+#X obj 792 62 r \$0-Qval;
+#X obj 538 394 r \$0-Qval;
+#X obj 263 427 r \$0-Qval;
 #X floatatom 277 122 5 0 0 0 - - -;
 #X obj 210 134 vcf~ 3;
 #X obj 480 138 vcf~ 3;
 #X obj 750 131 vcf~ 3;
-#X obj 491 407 vcf~ 3;
-#X obj 217 409 vcf~ 3;
-#X obj 531 136 r~ \$0-liftDiGain;
-#X obj 245 161 r~ \$0-liftDiGain;
-#X floatatom 539 90 5 0 0 0 - - -;
+#X obj 492 468 vcf~ 3;
+#X obj 218 470 vcf~ 3;
+#X obj 527 143 r~ \$0-liftDiGain;
+#X obj 225 156 r~ \$0-liftDiGain;
 #X obj 816 148 *~ 0.1;
 #X obj 523 95 * 2;
 #X obj 792 84 * 4;
-#X obj 532 360 * 2;
-#X obj 531 158 *~ 0.6;
-#X connect 0 0 21 1;
-#X connect 0 0 63 1;
-#X connect 1 0 9 0;
-#X connect 2 0 8 0;
-#X connect 3 0 71 0;
-#X connect 6 0 4 0;
-#X connect 6 1 5 0;
-#X connect 7 0 6 1;
-#X connect 8 0 35 1;
-#X connect 8 0 65 1;
-#X connect 9 0 28 1;
-#X connect 9 0 64 1;
+#X obj 533 421 * 2;
+#X obj 527 165 *~ 0.6;
+#X text 179 282 Fundamental;
+#X text 444 288 3rd Harmonic;
+#X text 729 288 5th Harmonic;
+#X text 151 618 Fundamental Drag tone = 2nd Harmonic;
+#X text 420 616 2 Harmonic Drag tone = 4th Harmonic;
+#X connect 0 0 17 1;
+#X connect 0 0 56 1;
+#X connect 1 0 5 0;
+#X connect 2 0 4 0;
+#X connect 3 0 63 0;
+#X connect 4 0 31 1;
+#X connect 4 0 58 1;
+#X connect 5 0 24 1;
+#X connect 5 0 57 1;
+#X connect 6 0 8 0;
+#X connect 7 0 34 1;
+#X connect 8 0 38 1;
+#X connect 8 0 60 1;
+#X connect 9 0 11 0;
 #X connect 10 0 12 0;
-#X connect 11 0 38 1;
-#X connect 12 0 42 1;
-#X connect 12 0 67 1;
-#X connect 13 0 15 0;
-#X connect 14 0 16 0;
-#X connect 15 0 49 1;
-#X connect 15 0 66 1;
-#X connect 16 0 45 1;
-#X connect 17 0 20 0;
-#X connect 20 0 18 0;
-#X connect 20 1 19 0;
-#X connect 21 0 63 0;
-#X connect 22 0 20 1;
+#X connect 11 0 45 1;
+#X connect 11 0 59 1;
+#X connect 12 0 41 1;
+#X connect 13 0 16 0;
+#X connect 16 0 14 0;
+#X connect 16 1 15 0;
+#X connect 17 0 56 0;
+#X connect 18 0 16 1;
+#X connect 19 0 17 0;
+#X connect 20 0 23 0;
 #X connect 23 0 21 0;
-#X connect 24 0 27 0;
-#X connect 27 0 25 0;
-#X connect 27 1 26 0;
-#X connect 28 0 64 0;
-#X connect 29 0 27 1;
+#X connect 23 1 22 0;
+#X connect 24 0 57 0;
+#X connect 25 0 23 1;
+#X connect 26 0 24 0;
+#X connect 27 0 30 0;
 #X connect 30 0 28 0;
-#X connect 31 0 34 0;
-#X connect 34 0 32 0;
-#X connect 34 1 33 0;
-#X connect 35 0 65 0;
-#X connect 36 0 34 1;
+#X connect 30 1 29 0;
+#X connect 31 0 58 0;
+#X connect 32 0 30 1;
+#X connect 33 0 31 0;
+#X connect 34 0 37 0;
 #X connect 37 0 35 0;
-#X connect 38 0 41 0;
-#X connect 41 0 39 0;
-#X connect 41 1 40 0;
-#X connect 42 0 67 0;
-#X connect 43 0 41 1;
+#X connect 37 1 36 0;
+#X connect 38 0 60 0;
+#X connect 39 0 37 1;
+#X connect 40 0 38 0;
+#X connect 41 0 44 0;
 #X connect 44 0 42 0;
-#X connect 45 0 48 0;
-#X connect 48 0 46 0;
-#X connect 48 1 47 0;
-#X connect 49 0 66 0;
-#X connect 50 0 48 1;
-#X connect 51 0 49 0;
-#X connect 54 0 21 2;
-#X connect 54 0 62 0;
-#X connect 54 0 63 2;
-#X connect 55 0 70 0;
-#X connect 55 0 72 0;
-#X connect 56 0 73 0;
-#X connect 57 0 74 0;
-#X connect 58 0 42 2;
-#X connect 58 0 67 2;
-#X connect 59 0 31 0;
-#X connect 60 0 45 0;
-#X connect 61 0 38 0;
-#X connect 63 0 17 0;
-#X connect 64 0 24 0;
-#X connect 65 0 59 0;
-#X connect 66 0 60 0;
-#X connect 67 0 61 0;
-#X connect 68 0 75 0;
-#X connect 69 0 17 1;
-#X connect 71 0 31 1;
-#X connect 72 0 28 2;
-#X connect 72 0 64 2;
-#X connect 73 0 35 2;
-#X connect 73 0 65 2;
-#X connect 74 0 49 2;
-#X connect 74 0 66 2;
-#X connect 75 0 24 1;
-#X restore 649 504 pd Dipoles;
+#X connect 44 1 43 0;
+#X connect 45 0 59 0;
+#X connect 46 0 44 1;
+#X connect 47 0 45 0;
+#X connect 50 0 17 2;
+#X connect 50 0 55 0;
+#X connect 50 0 56 2;
+#X connect 51 0 64 0;
+#X connect 52 0 65 0;
+#X connect 53 0 66 0;
+#X connect 54 0 38 2;
+#X connect 54 0 60 2;
+#X connect 56 0 13 0;
+#X connect 57 0 20 0;
+#X connect 58 0 27 0;
+#X connect 59 0 41 0;
+#X connect 60 0 34 0;
+#X connect 61 0 67 0;
+#X connect 62 0 13 1;
+#X connect 63 0 27 1;
+#X connect 64 0 24 2;
+#X connect 64 0 57 2;
+#X connect 65 0 31 2;
+#X connect 65 0 58 2;
+#X connect 66 0 45 2;
+#X connect 66 0 59 2;
+#X connect 67 0 20 1;
+#X restore 660 614 pd Dipoles;
 #X obj 1088 69 noise~;
 #X obj 1088 92 s~ \$0-thisNoise;
 #X obj 1067 214 r~ \$0-thisNoise;
-#X text 674 440 the object and environment;
+#X text 669 528 the object and environment;
 #X obj 1107 280 r myMet;
 #X obj 1098 302 snapshot~;
 #N canvas 308 58 1027 635 StBandwidth 0;
@@ -1036,6 +1006,10 @@
 #X obj 712 97 > 145021;
 #X obj 635 126 > 193260;
 #X obj 252 163 < 193260;
+#X text 184 511 This patch calculates the Q values to be applied to
+the bandpass filters. Future development may link this to the Turbulence
+Intensity but not enough data available at time of writing to do this.
+;
 #X connect 0 0 16 0;
 #X connect 1 0 2 0;
 #X connect 1 1 2 1;
@@ -1084,9 +1058,9 @@
 #X obj 1098 260 r~ \$0-myFreq;
 #X obj 120 65 vd~ varwind;
 #X obj 60 106 s~ MY_MACH;
-#X obj 747 513 outlet~;
-#X obj 802 512 outlet~;
-#X obj 861 514 outlet~;
+#X obj 817 469 outlet~;
+#X obj 872 468 outlet~;
+#X obj 931 470 outlet~;
 #X obj 60 84 /~ 343.56;
 #X connect 1 0 3 0;
 #X connect 2 0 19 0;