# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1445927338 0
# Node ID ced3d7831a75705cba5a8a184a5623a4a360d8ac
# Parent  6ff3ad934ae799395fa9607ee4a7c82a9f1db2a9
Minor edits to freqCalcCyl2. freqCalcCyl3 created which includes harmonics and looking at noise with f^(-2) roll off.

diff -r 6ff3ad934ae7 -r ced3d7831a75 .DS_Store
Binary file .DS_Store has changed
diff -r 6ff3ad934ae7 -r ced3d7831a75 scene demo/Gen3_D4.pd
--- a/scene demo/Gen3_D4.pd	Wed Aug 19 17:55:35 2015 +0100
+++ b/scene demo/Gen3_D4.pd	Tue Oct 27 06:28:58 2015 +0000
@@ -85,12 +85,12 @@
 #X obj 94 515 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 157 515 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 248 506 vsl 15 128 0.1 10000 1 0 empty empty empty 0 -9 0 10
--262144 -1 -1 0 1;
+-262144 -1 -1 765 1;
 #X text 277 534 Gain;
 #X obj 248 451 loadbang;
 #X obj 300 118 delwrite~ varwind 3000;
 #X obj 383 -74 hsl 128 15 0 120 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
+-1 -1 5292 1;
 #X obj 343 29 snapshot~;
 #X obj 343 4 metro 100;
 #X obj 343 -18 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
diff -r 6ff3ad934ae7 -r ced3d7831a75 scene demo/freqCalcCyl2_D7Mach.pd
--- a/scene demo/freqCalcCyl2_D7Mach.pd	Wed Aug 19 17:55:35 2015 +0100
+++ b/scene demo/freqCalcCyl2_D7Mach.pd	Tue Oct 27 06:28:58 2015 +0000
@@ -67,7 +67,7 @@
 1;
 #X floatatom 184 492 10 0 0 0 - - -;
 #X obj 184 393 loadbang;
-#N canvas 335 23 1006 797 noiseGain 1;
+#N canvas 335 23 1006 797 noiseGain 0;
 #X text -21029 166 Mass Density of Air \, squared;
 #X text -20589 179 Speed of Sound to power 2;
 #X obj -20894 66 *~;
@@ -168,7 +168,7 @@
 #X text -20992 36 Strouhal number;
 #X text -20798 35 Wind speed;
 #X text -20580 332 Mid Source;
-#X text -20813 430;
+#X text -20813 430 comment;
 #X connect 2 0 3 1;
 #X connect 3 0 4 0;
 #X connect 4 0 5 0;
@@ -484,6 +484,36 @@
 #X obj 1162 32 +~ 20;
 #X obj 1022 188 *~ 0.015;
 #X obj 1162 58 clip~ 1 20;
+#X obj 927 301 sig~;
+#X msg 927 276 0.27;
+#X text 990 413 Mass Density of Air;
+#X obj 1097 784 throw~ l;
+#X obj 1124 761 throw~ r;
+#X obj 1112 635 osc~;
+#X obj 1112 414 *~ 1.225;
+#X obj 1112 489 /~ 1.81e-05;
+#X obj 1112 444 *~ 1;
+#X obj 1112 607 /~ 1;
+#X obj 1112 583 *~;
+#X text 1145 533 Reynolds Number;
+#X text 1142 469 Viscosity;
+#X obj 1173 413 r \$0-diameter;
+#X obj 1180 588 r \$0-diameter;
+#X obj 1179 565 r~ \$0-windSpeed;
+#X obj 1112 386 r~ \$0-windSpeed;
+#X obj 1097 737 fcpan;
+#X text 921 498 Calculates the frequency;
+#X text 922 510 based on the physics of;
+#X text 922 523 the object and environment;
+#X obj 1112 554 newStrou;
+#X obj 1150 635 r~ \$0-liftDiGain;
+#X obj 1124 708 r \$0-thisPan;
+#X obj 1222 612 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 1266 639 5 0 0 0 - - -;
+#X obj 1112 665 *~;
+#X obj 1184 446 * 1.005;
+#X msg 1184 609 0.5;
 #X connect 4 0 15 0;
 #X connect 5 0 7 0;
 #X connect 6 0 42 0;
@@ -556,8 +586,8 @@
 #X connect 79 0 75 0;
 #X connect 89 0 90 0;
 #X connect 89 0 98 0;
+#X connect 92 0 116 0;
 #X connect 92 0 10 0;
-#X connect 92 0 116 0;
 #X connect 97 0 95 0;
 #X connect 97 1 96 0;
 #X connect 102 0 67 0;
@@ -589,3 +619,23 @@
 #X connect 141 0 143 0;
 #X connect 142 0 139 0;
 #X connect 143 0 43 0;
+#X connect 145 0 144 0;
+#X connect 149 0 170 0;
+#X connect 150 0 152 0;
+#X connect 151 0 165 0;
+#X connect 152 0 151 0;
+#X connect 153 0 149 0;
+#X connect 154 0 153 0;
+#X connect 157 0 171 0;
+#X connect 158 0 153 1;
+#X connect 159 0 154 1;
+#X connect 160 0 150 0;
+#X connect 161 0 147 0;
+#X connect 161 1 148 0;
+#X connect 165 0 154 0;
+#X connect 166 0 170 1;
+#X connect 167 0 161 1;
+#X connect 168 0 149 1;
+#X connect 168 0 169 0;
+#X connect 171 0 152 1;
+#X connect 172 0 149 1;
diff -r 6ff3ad934ae7 -r ced3d7831a75 scene demo/freqCalcCyl2_D9Mach.pd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scene demo/freqCalcCyl2_D9Mach.pd	Tue Oct 27 06:28:58 2015 +0000
@@ -0,0 +1,643 @@
+#N canvas 33 37 1269 776 10;
+#X text 585 250 Mass Density of Air;
+#X text 75 413 Frequency (Hz);
+#X obj 692 621 throw~ l;
+#X obj 719 598 throw~ r;
+#X obj 707 472 osc~;
+#X obj 707 251 *~ 1.225;
+#X obj 707 326 /~ 1.81e-05;
+#X obj 707 281 *~ 1;
+#X obj 707 444 /~ 1;
+#X floatatom 171 391 10 0 0 0 - - -;
+#X obj 707 420 *~;
+#X obj 182 38 inlet;
+#X text 740 370 Reynolds Number;
+#X text 587 437 Strouhal Number;
+#X obj 347 36 inlet;
+#X obj 707 502 *~;
+#X text 737 306 Viscosity;
+#X obj 486 441 *~ 2;
+#X obj 486 468 osc~;
+#X obj 486 490 *~;
+#X obj 692 531 +~;
+#X obj 189 61 s \$0-diameter;
+#X obj 768 250 r \$0-diameter;
+#X obj 775 425 r \$0-diameter;
+#X obj 99 100 s~ \$0-windSpeed;
+#X obj 271 139 r~ \$0-windSpeed;
+#X obj 774 402 r~ \$0-windSpeed;
+#X obj 707 223 r~ \$0-windSpeed;
+#X obj 628 471 s~ \$0-myFreq;
+#X obj 486 416 r~ \$0-myFreq;
+#X obj 99 58 sig~;
+#X obj 99 80 vd~ varwind;
+#X obj 99 34 inlet;
+#X obj 1020 214 r~ \$0-myFreq;
+#X obj 932 162 noise~;
+#X obj 980 323 *~;
+#X obj 93 213 snapshot~;
+#X obj 93 188 metro 100;
+#X obj 93 166 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 93 239 10 0 0 0 - - -;
+#X obj 93 140 loadbang;
+#X obj 7 188 r~ \$0-myRey;
+#X obj 720 350 s~ \$0-myRey;
+#X obj 1118 223 snapshot~;
+#X floatatom 1118 249 10 0 0 0 - - -;
+#X obj 1118 150 loadbang;
+#X obj 1118 175 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 1072 52 r~ \$0-myRey;
+#X text 78 261 Reynolds Number;
+#X obj 986 241 vcf~ 1000 10;
+#X obj 692 574 fcpan;
+#X obj 1118 198 metro 10;
+#X obj 595 32 inlet;
+#X floatatom 540 101 8 0 0 0 - - -;
+#X obj 595 56 max 0.1;
+#X obj 595 79 min 0.9;
+#X text 516 335 Calculates the frequency;
+#X text 517 347 based on the physics of;
+#X text 517 360 the object and environment;
+#X obj 275 421 r~ \$0-windSpeed;
+#X obj 94 535 snapshot~;
+#X obj 94 510 metro 100;
+#X obj 94 488 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 94 561 10 0 0 0 - - -;
+#X obj 94 462 loadbang;
+#N canvas 335 23 1006 797 noiseGain 0;
+#X text -21029 166 Mass Density of Air \, squared;
+#X text -20589 179 Speed of Sound to power 2;
+#X obj -20894 66 *~;
+#X obj -20846 107 *~;
+#X obj -20846 141 *~ 1;
+#X obj -20846 169 *~ 1.50063;
+#X obj -20591 133 *;
+#X obj -20591 156 * 118033;
+#X obj -20846 296 /~ 1;
+#X obj -20846 636 *~ 0.27;
+#X text -20591 86 Distance;
+#X text -21027 643 Calculates Lift Dipole gain;
+#N canvas 759 125 286 289 pow8 0;
+#X obj 47 67 *~;
+#X obj 76 67 *~;
+#X obj 76 35 inlet~;
+#X obj 47 170 outlet~;
+#X obj 136 173 snapshot~;
+#X obj 136 148 metro 100;
+#X obj 136 126 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 136 200 10 0 0 0 - - -;
+#X obj 136 100 loadbang;
+#X obj 106 67 *~;
+#X obj 47 93 *~;
+#X obj 47 118 *~;
+#X obj 136 67 *~;
+#X obj 47 144 *~;
+#X connect 0 0 10 0;
+#X connect 1 0 10 1;
+#X connect 2 0 0 0;
+#X connect 2 0 0 1;
+#X connect 2 0 1 1;
+#X connect 2 0 9 0;
+#X connect 2 0 9 1;
+#X connect 2 0 1 0;
+#X connect 2 0 12 0;
+#X connect 2 0 12 1;
+#X connect 4 0 7 0;
+#X connect 5 0 4 0;
+#X connect 6 0 5 0;
+#X connect 8 0 6 0;
+#X connect 9 0 11 1;
+#X connect 10 0 11 0;
+#X connect 11 0 13 0;
+#X connect 12 0 13 1;
+#X connect 13 0 3 0;
+#X connect 13 0 4 0;
+#X restore -20846 69 pd pow8;
+#X obj -20894 44 inlet~;
+#X obj -20846 44 inlet~;
+#X obj -20810 118 inlet;
+#X obj -20591 107 inlet;
+#X obj -20846 679 outlet~;
+#X text -20785 63 Gain proportional to windspeed to power 8 for spectrum
+;
+#X text -20805 102 Diameter;
+#X obj -20815 200 inlet;
+#X obj -20815 224 *;
+#X obj -20846 246 *~ 1;
+#X text -20774 199 Length;
+#X obj -20829 325 s~ \$0-nGain;
+#X text -20741 328 Azimuth;
+#X text -20680 290 Elevation;
+#X obj -20740 345 inlet;
+#X obj -20683 306 inlet;
+#X obj -20740 368 sig~;
+#X obj -20683 368 sig~;
+#X obj -20683 348 spigot;
+#X text -20581 312 End Source;
+#X obj -20831 456 +~ 90;
+#X obj -20831 477 /~ 360;
+#X obj -20831 499 cos~;
+#X obj -20846 611 *~;
+#X obj -20831 523 *~;
+#X obj -20631 395 loadbang;
+#X obj -20631 416 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -20631 434 metro 10;
+#X obj -20631 455 snapshot~;
+#X floatatom -20631 475 5 0 0 0 - - -;
+#X obj -20943 498 loadbang;
+#X obj -20943 519 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -20943 537 metro 10;
+#X obj -20943 558 snapshot~;
+#X floatatom -20943 578 8 0 0 0 - - -;
+#X msg -20649 372 0;
+#X obj -20612 353 t f b;
+#X msg -20612 333 0;
+#X msg -20612 313 1;
+#X obj -20787 455 +~ 90;
+#X obj -20787 476 /~ 360;
+#X obj -20787 498 sin~;
+#X text -20833 411 Quadrupole;
+#X obj -20740 391 angleCalcN~;
+#X obj -20846 658 *~ 0.005;
+#X text -20992 36 Strouhal number;
+#X text -20798 35 Wind speed;
+#X text -20580 332 Mid Source;
+#X text -20813 430 comment;
+#X connect 2 0 3 1;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 5 0 22 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 1;
+#X connect 8 0 24 0;
+#X connect 8 0 36 0;
+#X connect 9 0 57 0;
+#X connect 12 0 3 0;
+#X connect 13 0 2 0;
+#X connect 13 0 2 1;
+#X connect 14 0 12 0;
+#X connect 15 0 4 1;
+#X connect 16 0 6 0;
+#X connect 16 0 6 1;
+#X connect 20 0 21 0;
+#X connect 20 0 21 1;
+#X connect 21 0 22 1;
+#X connect 22 0 8 0;
+#X connect 27 0 29 0;
+#X connect 28 0 31 0;
+#X connect 29 0 56 0;
+#X connect 30 0 56 1;
+#X connect 31 0 30 0;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 35 0 37 0;
+#X connect 36 0 9 0;
+#X connect 37 0 36 1;
+#X connect 37 0 46 0;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 41 0 42 0;
+#X connect 43 0 44 0;
+#X connect 44 0 45 0;
+#X connect 45 0 46 0;
+#X connect 46 0 47 0;
+#X connect 48 0 30 0;
+#X connect 49 0 31 1;
+#X connect 49 1 48 0;
+#X connect 50 0 49 0;
+#X connect 51 0 31 1;
+#X connect 52 0 53 0;
+#X connect 53 0 54 0;
+#X connect 54 0 37 1;
+#X connect 56 0 33 0;
+#X connect 56 0 41 0;
+#X connect 56 0 52 0;
+#X connect 57 0 17 0;
+#X restore 264 556 pd noiseGain;
+#X obj 298 466 r \$0-diameter;
+#N canvas 299 77 1040 691 freqGain 0;
+#X text 36 127 Mass Density of Air \, squared;
+#X text 411 123 Speed of Sound to power 2;
+#N canvas 759 125 286 289 pow6 0;
+#X obj 47 67 *~;
+#X obj 76 67 *~;
+#X obj 76 35 inlet~;
+#X obj 47 163 outlet~;
+#X obj 136 184 snapshot~;
+#X obj 136 159 metro 100;
+#X obj 136 137 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 136 211 10 0 0 0 - - -;
+#X obj 216 210 outlet;
+#X obj 136 111 loadbang;
+#X obj 106 67 *~;
+#X obj 47 93 *~;
+#X obj 47 118 *~;
+#X connect 0 0 11 0;
+#X connect 1 0 11 1;
+#X connect 2 0 0 0;
+#X connect 2 0 0 1;
+#X connect 2 0 1 1;
+#X connect 2 0 10 0;
+#X connect 2 0 10 1;
+#X connect 2 0 1 0;
+#X connect 4 0 7 0;
+#X connect 4 0 8 0;
+#X connect 5 0 4 0;
+#X connect 6 0 5 0;
+#X connect 9 0 6 0;
+#X connect 10 0 12 1;
+#X connect 11 0 12 0;
+#X connect 12 0 4 0;
+#X connect 12 0 3 0;
+#X restore 219 30 pd pow6;
+#X obj 173 32 *~;
+#X obj 219 68 *~;
+#X obj 219 102 *~ 1;
+#X obj 219 130 *~ 1.50063;
+#X obj 404 71 *;
+#X obj 404 96 * 118033;
+#X obj 219 224 /~ 1;
+#X obj 219 497 *~ 0.27;
+#X text 424 30 Distance;
+#X obj 319 473 *~ 0.27;
+#X floatatom 369 72 5 0 0 0 - - -;
+#X text 304 556 Calculates Drag Dipole gain;
+#X text 48 504 Calculates Lift Dipole gain;
+#X obj 319 498 *~ 0.1;
+#X obj 173 8 inlet~;
+#X obj 219 7 inlet~;
+#X text 256 54 Diameter;
+#X obj 250 69 inlet;
+#X obj 404 46 inlet;
+#X obj 219 524 outlet~;
+#X obj 319 523 outlet~;
+#X obj 240 159 inlet;
+#X text 278 154 Length;
+#X obj 219 202 *~ 1;
+#X text 397 195 Add in MACH deflection;
+#X obj 236 253 s~ \$0-aGain;
+#X obj 347 424 r~ \$0-aGain;
+#X text 257 278 Azimuth;
+#X text 318 240 Elevation;
+#X obj 258 295 inlet;
+#X obj 315 256 inlet;
+#X obj 258 318 sig~;
+#X obj 315 318 sig~;
+#X obj 315 298 spigot;
+#X text 414 265 End Source;
+#X text 415 284 Mid Source;
+#X obj 432 343 loadbang;
+#X obj 432 364 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 432 382 metro 10;
+#X msg 349 322 0;
+#X obj 386 303 t f b;
+#X msg 386 283 0;
+#X msg 386 263 1;
+#X obj 234 382 +~ 90;
+#X obj 234 403 /~ 360;
+#X obj 234 425 cos~;
+#X obj 234 449 *~;
+#X obj 219 472 *~;
+#X obj 319 377 /~ 360;
+#X obj 319 400 cos~;
+#X obj 319 424 *~;
+#X obj 319 449 *~;
+#X obj 432 403 snapshot~;
+#X floatatom 432 423 5 0 0 0 - - -;
+#X obj 466 450 loadbang;
+#X obj 466 471 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 466 489 metro 10;
+#X obj 466 510 snapshot~;
+#X floatatom 466 530 5 0 0 0 - - -;
+#X obj 149 366 loadbang;
+#X obj 149 387 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 149 405 metro 10;
+#X obj 149 426 snapshot~;
+#X floatatom 149 446 5 0 0 0 - - -;
+#X obj 651 38 inlet;
+#X obj 750 40 inlet;
+#X obj 846 43 inlet;
+#X floatatom 651 85 5 0 0 0 - - -;
+#X floatatom 750 86 5 0 0 0 - - -;
+#X floatatom 847 87 5 0 0 0 - - -;
+#X text 647 19 X Rotation;
+#X text 744 21 Y Rotation;
+#X text 841 24 Z Rotation;
+#X obj 656 61 s \$0-this_rotaX;
+#X obj 757 62 s \$0-thisrotaY;
+#X obj 854 66 s \$0-thisrotaZ;
+#X obj 258 337 angleCalc~;
+#X text 74 8 Strouhal number;
+#X text 269 7 Wind speed;
+#X connect 2 0 4 0;
+#X connect 3 0 4 1;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 6 0 26 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 1;
+#X connect 9 0 28 0;
+#X connect 9 0 50 0;
+#X connect 10 0 22 0;
+#X connect 12 0 16 0;
+#X connect 16 0 23 0;
+#X connect 17 0 3 0;
+#X connect 17 0 3 1;
+#X connect 18 0 2 0;
+#X connect 20 0 5 1;
+#X connect 21 0 7 1;
+#X connect 21 0 7 0;
+#X connect 21 0 13 0;
+#X connect 24 0 26 1;
+#X connect 26 0 9 0;
+#X connect 29 0 54 1;
+#X connect 32 0 34 0;
+#X connect 33 0 36 0;
+#X connect 34 0 79 0;
+#X connect 35 0 79 1;
+#X connect 36 0 35 0;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 41 0 55 0;
+#X connect 42 0 35 0;
+#X connect 43 0 36 1;
+#X connect 43 1 42 0;
+#X connect 44 0 43 0;
+#X connect 45 0 36 1;
+#X connect 46 0 47 0;
+#X connect 47 0 48 0;
+#X connect 48 0 49 0;
+#X connect 48 0 49 1;
+#X connect 49 0 50 1;
+#X connect 49 0 65 0;
+#X connect 50 0 10 0;
+#X connect 51 0 52 0;
+#X connect 52 0 53 0;
+#X connect 52 0 53 1;
+#X connect 53 0 54 0;
+#X connect 53 0 60 0;
+#X connect 54 0 12 0;
+#X connect 55 0 56 0;
+#X connect 57 0 58 0;
+#X connect 58 0 59 0;
+#X connect 59 0 60 0;
+#X connect 60 0 61 0;
+#X connect 62 0 63 0;
+#X connect 63 0 64 0;
+#X connect 64 0 65 0;
+#X connect 65 0 66 0;
+#X connect 67 0 70 0;
+#X connect 67 0 76 0;
+#X connect 68 0 71 0;
+#X connect 68 0 77 0;
+#X connect 69 0 72 0;
+#X connect 69 0 78 0;
+#X connect 79 0 46 0;
+#X connect 79 0 51 0;
+#X connect 79 0 55 0;
+#X restore 262 283 pd freqGain;
+#X obj 419 35 inlet;
+#X obj 292 178 r \$0-diameter;
+#X obj 493 34 inlet;
+#X floatatom 347 83 5 0 0 0 - - -;
+#X floatatom 419 81 5 0 0 0 - - -;
+#X floatatom 494 78 5 0 0 0 - - -;
+#X obj 42 391 outlet;
+#X obj 86 364 snapshot~;
+#X obj 86 317 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 86 291 loadbang;
+#X obj 86 339 metro 10;
+#X obj 7 341 r~ \$0-myFreq;
+#X text 93 590 Strouhal Number;
+#X text 252 342 Calculates the gain of the dipole source;
+#X text 255 620 Calculates the gain of the source;
+#X text 485 15 Azimuth;
+#X text 600 14 Pan;
+#X text 413 16 Elevation;
+#X text 343 17 Distance;
+#X text 177 17 Diameter;
+#X text 92 16 Wind Speed;
+#X obj 274 35 inlet;
+#X floatatom 274 79 5 0 0 0 - - -;
+#X text 270 16 Length;
+#X obj 707 391 newStrou;
+#X floatatom 42 74 5 0 0 0 - - -;
+#X floatatom 182 82 5 0 0 0 - - -;
+#X obj 980 411 throw~ l;
+#X obj 1007 389 throw~ r;
+#X obj 980 367 fcpan;
+#X obj 284 58 s \$0-leng;
+#X obj 352 59 s \$0-dist;
+#X obj 426 57 s \$0-elev;
+#X obj 501 57 s \$0-azim;
+#X obj 261 118 r~ \$0-str;
+#X obj 282 158 r \$0-leng;
+#X obj 303 198 r \$0-azim;
+#X obj 313 219 r \$0-elev;
+#X obj 324 240 r \$0-dist;
+#X obj 325 307 s~ \$0-dragDiGain;
+#X obj 262 327 s~ \$0-liftDiGain;
+#X obj 264 398 r~ \$0-str;
+#X obj 287 442 r \$0-leng;
+#X obj 321 509 r \$0-elev;
+#X obj 310 486 r \$0-azim;
+#X obj 333 532 r \$0-dist;
+#X obj 264 601 s~ \$0-liftNoiseGain;
+#X obj 519 470 r~ \$0-dragDiGain;
+#X obj 601 421 s~ \$0-str;
+#X obj 745 472 r~ \$0-liftDiGain;
+#X obj 719 545 r \$0-thisPan;
+#X obj 595 101 s \$0-thisPan;
+#X obj 953 184 r \$0-contFreq;
+#X obj 86 391 s \$0-contFreq;
+#X obj 9 510 r~ \$0-str;
+#X obj 995 294 r~ \$0-liftNoiseGain;
+#X obj 1007 348 r \$0-thisPan;
+#X obj 690 41 inlet;
+#X obj 762 40 inlet;
+#X obj 836 39 inlet;
+#X floatatom 690 88 5 0 0 0 - - -;
+#X floatatom 762 86 5 0 0 0 - - -;
+#X floatatom 837 83 5 0 0 0 - - -;
+#X obj 695 64 s \$0-rotaX;
+#X obj 769 62 s \$0-rotaY;
+#X obj 844 62 s \$0-rotaZ;
+#X text 686 22 X Rotation;
+#X text 756 21 Y Rotation;
+#X text 831 20 Z Rotation;
+#X text 1034 313 Noise spectrum calculation;
+#X obj 932 208 hip~;
+#X obj 971 302 +~;
+#X obj 1072 76 *~ -0.001;
+#X obj 1072 101 +~ 20;
+#X obj 1072 127 clip~ 1 20;
+#X obj 837 370 sig~;
+#X msg 837 345 0.27;
+#X text 900 482 Mass Density of Air;
+#X obj 1007 853 throw~ l;
+#X obj 1034 830 throw~ r;
+#X obj 1022 704 osc~;
+#X obj 1022 483 *~ 1.225;
+#X obj 1022 558 /~ 1.81e-05;
+#X obj 1022 513 *~ 1;
+#X obj 1022 676 /~ 1;
+#X obj 1022 652 *~;
+#X text 1055 602 Reynolds Number;
+#X text 1052 538 Viscosity;
+#X obj 1083 482 r \$0-diameter;
+#X obj 1090 657 r \$0-diameter;
+#X obj 1089 634 r~ \$0-windSpeed;
+#X obj 1022 455 r~ \$0-windSpeed;
+#X obj 1007 806 fcpan;
+#X text 831 567 Calculates the frequency;
+#X text 832 579 based on the physics of;
+#X text 832 592 the object and environment;
+#X obj 1022 623 newStrou;
+#X obj 1060 704 r~ \$0-liftDiGain;
+#X obj 1034 777 r \$0-thisPan;
+#X obj 1132 681 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 1176 708 5 0 0 0 - - -;
+#X obj 1022 734 *~;
+#X obj 1094 515 * 1.005;
+#X msg 1094 678 0.5;
+#X obj 932 257 *~ 0.2;
+#X obj 986 263 *~ 0.5;
+#X connect 4 0 15 0;
+#X connect 5 0 7 0;
+#X connect 6 0 42 0;
+#X connect 6 0 92 0;
+#X connect 7 0 6 0;
+#X connect 8 0 4 0;
+#X connect 8 0 28 0;
+#X connect 10 0 8 0;
+#X connect 11 0 21 0;
+#X connect 11 0 94 0;
+#X connect 14 0 71 0;
+#X connect 14 0 99 0;
+#X connect 15 0 20 1;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 50 0;
+#X connect 22 0 7 1;
+#X connect 23 0 8 1;
+#X connect 25 0 67 1;
+#X connect 26 0 10 1;
+#X connect 27 0 5 0;
+#X connect 29 0 17 0;
+#X connect 30 0 31 0;
+#X connect 31 0 24 0;
+#X connect 32 0 30 0;
+#X connect 32 0 93 0;
+#X connect 33 0 49 1;
+#X connect 34 0 138 0;
+#X connect 34 0 49 0;
+#X connect 35 0 97 0;
+#X connect 36 0 39 0;
+#X connect 37 0 36 0;
+#X connect 38 0 37 0;
+#X connect 40 0 38 0;
+#X connect 41 0 36 0;
+#X connect 43 0 44 0;
+#X connect 43 0 49 2;
+#X connect 45 0 46 0;
+#X connect 46 0 51 0;
+#X connect 47 0 140 0;
+#X connect 49 0 173 0;
+#X connect 50 0 2 0;
+#X connect 50 1 3 0;
+#X connect 51 0 43 0;
+#X connect 52 0 54 0;
+#X connect 54 0 55 0;
+#X connect 55 0 53 0;
+#X connect 55 0 119 0;
+#X connect 59 0 65 1;
+#X connect 60 0 63 0;
+#X connect 61 0 60 0;
+#X connect 62 0 61 0;
+#X connect 64 0 62 0;
+#X connect 65 0 114 0;
+#X connect 66 0 65 3;
+#X connect 67 0 108 0;
+#X connect 67 1 107 0;
+#X connect 68 0 72 0;
+#X connect 68 0 100 0;
+#X connect 69 0 67 3;
+#X connect 70 0 73 0;
+#X connect 70 0 101 0;
+#X connect 75 0 74 0;
+#X connect 75 0 9 0;
+#X connect 75 0 121 0;
+#X connect 76 0 78 0;
+#X connect 77 0 76 0;
+#X connect 78 0 75 0;
+#X connect 79 0 75 0;
+#X connect 89 0 90 0;
+#X connect 89 0 98 0;
+#X connect 92 0 116 0;
+#X connect 92 0 10 0;
+#X connect 97 0 95 0;
+#X connect 97 1 96 0;
+#X connect 102 0 67 0;
+#X connect 103 0 67 2;
+#X connect 104 0 67 4;
+#X connect 105 0 67 5;
+#X connect 106 0 67 6;
+#X connect 109 0 65 0;
+#X connect 110 0 65 2;
+#X connect 111 0 65 5;
+#X connect 112 0 65 4;
+#X connect 113 0 65 6;
+#X connect 115 0 19 1;
+#X connect 117 0 15 1;
+#X connect 118 0 50 1;
+#X connect 120 0 138 1;
+#X connect 122 0 60 0;
+#X connect 123 0 35 1;
+#X connect 124 0 97 1;
+#X connect 125 0 128 0;
+#X connect 125 0 131 0;
+#X connect 126 0 129 0;
+#X connect 126 0 132 0;
+#X connect 127 0 130 0;
+#X connect 127 0 133 0;
+#X connect 138 0 172 0;
+#X connect 139 0 35 0;
+#X connect 140 0 141 0;
+#X connect 141 0 142 0;
+#X connect 142 0 43 0;
+#X connect 144 0 143 0;
+#X connect 148 0 169 0;
+#X connect 149 0 151 0;
+#X connect 150 0 164 0;
+#X connect 151 0 150 0;
+#X connect 152 0 148 0;
+#X connect 153 0 152 0;
+#X connect 156 0 170 0;
+#X connect 157 0 152 1;
+#X connect 158 0 153 1;
+#X connect 159 0 149 0;
+#X connect 160 0 146 0;
+#X connect 160 1 147 0;
+#X connect 164 0 153 0;
+#X connect 165 0 169 1;
+#X connect 166 0 160 1;
+#X connect 167 0 148 1;
+#X connect 167 0 168 0;
+#X connect 170 0 151 1;
+#X connect 171 0 148 1;
+#X connect 172 0 139 0;
+#X connect 173 0 139 1;
diff -r 6ff3ad934ae7 -r ced3d7831a75 scene demo/freqCalcCyl3_D1Mach.pd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scene demo/freqCalcCyl3_D1Mach.pd	Tue Oct 27 06:28:58 2015 +0000
@@ -0,0 +1,665 @@
+#N canvas 0 23 1359 827 10;
+#X text 595 260 Mass Density of Air;
+#X text 85 423 Frequency (Hz);
+#X obj 717 586 throw~ l;
+#X obj 744 563 throw~ r;
+#X obj 717 482 osc~;
+#X obj 717 261 *~ 1.225;
+#X obj 717 336 /~ 1.81e-05;
+#X obj 717 291 *~ 1;
+#X obj 717 454 /~ 1;
+#X floatatom 181 401 10 0 0 0 - - -;
+#X obj 717 430 *~;
+#X obj 192 48 inlet;
+#X text 750 380 Reynolds Number;
+#X text 597 447 Strouhal Number;
+#X obj 357 46 inlet;
+#X obj 717 512 *~;
+#X text 747 316 Viscosity;
+#X obj 496 451 *~ 2;
+#X obj 496 478 osc~;
+#X obj 496 500 *~;
+#X obj 199 71 s \$0-diameter;
+#X obj 778 260 r \$0-diameter;
+#X obj 785 435 r \$0-diameter;
+#X obj 109 110 s~ \$0-windSpeed;
+#X obj 281 149 r~ \$0-windSpeed;
+#X obj 784 412 r~ \$0-windSpeed;
+#X obj 717 233 r~ \$0-windSpeed;
+#X obj 638 481 s~ \$0-myFreq;
+#X obj 496 426 r~ \$0-myFreq;
+#X obj 109 68 sig~;
+#X obj 109 90 vd~ varwind;
+#X obj 109 44 inlet;
+#X obj 1217 58 r~ \$0-myFreq;
+#X obj 957 184 noise~;
+#X obj 942 404 *~;
+#X obj 103 223 snapshot~;
+#X obj 103 198 metro 100;
+#X obj 103 176 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 103 249 10 0 0 0 - - -;
+#X obj 103 150 loadbang;
+#X obj 17 198 r~ \$0-myRey;
+#X obj 730 360 s~ \$0-myRey;
+#X obj 1253 232 snapshot~;
+#X floatatom 1253 258 10 0 0 0 - - -;
+#X obj 1253 159 loadbang;
+#X obj 1253 184 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 1162 15 r~ \$0-myRey;
+#X text 88 271 Reynolds Number;
+#X obj 1183 85 vcf~ 1000 10;
+#X obj 717 539 fcpan;
+#X obj 1253 207 metro 10;
+#X obj 605 42 inlet;
+#X floatatom 550 111 8 0 0 0 - - -;
+#X obj 605 66 max 0.1;
+#X obj 605 89 min 0.9;
+#X text 526 345 Calculates the frequency;
+#X text 527 357 based on the physics of;
+#X text 527 370 the object and environment;
+#X obj 285 431 r~ \$0-windSpeed;
+#X obj 104 545 snapshot~;
+#X obj 104 520 metro 100;
+#X obj 104 498 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 104 571 10 0 0 0 - - -;
+#X obj 104 472 loadbang;
+#N canvas 335 23 1006 797 noiseGain 0;
+#X text -21029 166 Mass Density of Air \, squared;
+#X text -20589 179 Speed of Sound to power 2;
+#X obj -20894 66 *~;
+#X obj -20846 107 *~;
+#X obj -20846 141 *~ 1;
+#X obj -20846 169 *~ 1.50063;
+#X obj -20591 133 *;
+#X obj -20591 156 * 118033;
+#X obj -20846 296 /~ 1;
+#X obj -20846 636 *~ 0.27;
+#X text -20591 86 Distance;
+#X text -21027 643 Calculates Lift Dipole gain;
+#N canvas 759 125 286 289 pow8 0;
+#X obj 47 67 *~;
+#X obj 76 67 *~;
+#X obj 76 35 inlet~;
+#X obj 47 170 outlet~;
+#X obj 136 173 snapshot~;
+#X obj 136 148 metro 100;
+#X obj 136 126 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 136 200 10 0 0 0 - - -;
+#X obj 136 100 loadbang;
+#X obj 106 67 *~;
+#X obj 47 93 *~;
+#X obj 47 118 *~;
+#X obj 136 67 *~;
+#X obj 47 144 *~;
+#X connect 0 0 10 0;
+#X connect 1 0 10 1;
+#X connect 2 0 0 0;
+#X connect 2 0 0 1;
+#X connect 2 0 1 1;
+#X connect 2 0 9 0;
+#X connect 2 0 9 1;
+#X connect 2 0 1 0;
+#X connect 2 0 12 0;
+#X connect 2 0 12 1;
+#X connect 4 0 7 0;
+#X connect 5 0 4 0;
+#X connect 6 0 5 0;
+#X connect 8 0 6 0;
+#X connect 9 0 11 1;
+#X connect 10 0 11 0;
+#X connect 11 0 13 0;
+#X connect 12 0 13 1;
+#X connect 13 0 3 0;
+#X connect 13 0 4 0;
+#X restore -20846 69 pd pow8;
+#X obj -20894 44 inlet~;
+#X obj -20846 44 inlet~;
+#X obj -20810 118 inlet;
+#X obj -20591 107 inlet;
+#X obj -20846 679 outlet~;
+#X text -20785 63 Gain proportional to windspeed to power 8 for spectrum
+;
+#X text -20805 102 Diameter;
+#X obj -20815 200 inlet;
+#X obj -20815 224 *;
+#X obj -20846 246 *~ 1;
+#X text -20774 199 Length;
+#X obj -20829 325 s~ \$0-nGain;
+#X text -20741 328 Azimuth;
+#X text -20680 290 Elevation;
+#X obj -20740 345 inlet;
+#X obj -20683 306 inlet;
+#X obj -20740 368 sig~;
+#X obj -20683 368 sig~;
+#X obj -20683 348 spigot;
+#X text -20581 312 End Source;
+#X obj -20831 456 +~ 90;
+#X obj -20831 477 /~ 360;
+#X obj -20831 499 cos~;
+#X obj -20846 611 *~;
+#X obj -20831 523 *~;
+#X obj -20631 395 loadbang;
+#X obj -20631 416 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -20631 434 metro 10;
+#X obj -20631 455 snapshot~;
+#X floatatom -20631 475 5 0 0 0 - - -;
+#X obj -20943 498 loadbang;
+#X obj -20943 519 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -20943 537 metro 10;
+#X obj -20943 558 snapshot~;
+#X floatatom -20943 578 8 0 0 0 - - -;
+#X msg -20649 372 0;
+#X obj -20612 353 t f b;
+#X msg -20612 333 0;
+#X msg -20612 313 1;
+#X obj -20787 455 +~ 90;
+#X obj -20787 476 /~ 360;
+#X obj -20787 498 sin~;
+#X text -20833 411 Quadrupole;
+#X obj -20740 391 angleCalcN~;
+#X text -20992 36 Strouhal number;
+#X text -20798 35 Wind speed;
+#X text -20580 332 Mid Source;
+#X text -20813 430 comment;
+#X obj -20846 658 *~ 1;
+#X connect 2 0 3 1;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 5 0 22 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 1;
+#X connect 8 0 24 0;
+#X connect 8 0 36 0;
+#X connect 9 0 61 0;
+#X connect 12 0 3 0;
+#X connect 13 0 2 0;
+#X connect 13 0 2 1;
+#X connect 14 0 12 0;
+#X connect 15 0 4 1;
+#X connect 16 0 6 0;
+#X connect 16 0 6 1;
+#X connect 20 0 21 0;
+#X connect 20 0 21 1;
+#X connect 21 0 22 1;
+#X connect 22 0 8 0;
+#X connect 27 0 29 0;
+#X connect 28 0 31 0;
+#X connect 29 0 56 0;
+#X connect 30 0 56 1;
+#X connect 31 0 30 0;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 35 0 37 0;
+#X connect 36 0 9 0;
+#X connect 37 0 36 1;
+#X connect 37 0 46 0;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 41 0 42 0;
+#X connect 43 0 44 0;
+#X connect 44 0 45 0;
+#X connect 45 0 46 0;
+#X connect 46 0 47 0;
+#X connect 48 0 30 0;
+#X connect 49 0 31 1;
+#X connect 49 1 48 0;
+#X connect 50 0 49 0;
+#X connect 51 0 31 1;
+#X connect 52 0 53 0;
+#X connect 53 0 54 0;
+#X connect 54 0 37 1;
+#X connect 56 0 33 0;
+#X connect 56 0 41 0;
+#X connect 56 0 52 0;
+#X connect 61 0 17 0;
+#X restore 274 566 pd noiseGain;
+#X obj 308 476 r \$0-diameter;
+#N canvas 299 77 1040 691 freqGain 0;
+#X text 36 127 Mass Density of Air \, squared;
+#X text 411 123 Speed of Sound to power 2;
+#N canvas 759 125 286 289 pow6 0;
+#X obj 47 67 *~;
+#X obj 76 67 *~;
+#X obj 76 35 inlet~;
+#X obj 47 163 outlet~;
+#X obj 136 184 snapshot~;
+#X obj 136 159 metro 100;
+#X obj 136 137 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 136 211 10 0 0 0 - - -;
+#X obj 216 210 outlet;
+#X obj 136 111 loadbang;
+#X obj 106 67 *~;
+#X obj 47 93 *~;
+#X obj 47 118 *~;
+#X connect 0 0 11 0;
+#X connect 1 0 11 1;
+#X connect 2 0 0 0;
+#X connect 2 0 0 1;
+#X connect 2 0 1 1;
+#X connect 2 0 10 0;
+#X connect 2 0 10 1;
+#X connect 2 0 1 0;
+#X connect 4 0 7 0;
+#X connect 4 0 8 0;
+#X connect 5 0 4 0;
+#X connect 6 0 5 0;
+#X connect 9 0 6 0;
+#X connect 10 0 12 1;
+#X connect 11 0 12 0;
+#X connect 12 0 4 0;
+#X connect 12 0 3 0;
+#X restore 219 30 pd pow6;
+#X obj 173 32 *~;
+#X obj 219 68 *~;
+#X obj 219 102 *~ 1;
+#X obj 219 130 *~ 1.50063;
+#X obj 404 71 *;
+#X obj 404 96 * 118033;
+#X obj 219 224 /~ 1;
+#X obj 219 497 *~ 0.27;
+#X text 424 30 Distance;
+#X obj 319 473 *~ 0.27;
+#X floatatom 369 72 5 0 0 0 - - -;
+#X text 304 556 Calculates Drag Dipole gain;
+#X text 48 504 Calculates Lift Dipole gain;
+#X obj 319 498 *~ 0.1;
+#X obj 173 8 inlet~;
+#X obj 219 7 inlet~;
+#X text 256 54 Diameter;
+#X obj 250 69 inlet;
+#X obj 404 46 inlet;
+#X obj 219 524 outlet~;
+#X obj 319 523 outlet~;
+#X obj 240 159 inlet;
+#X text 278 154 Length;
+#X obj 219 202 *~ 1;
+#X text 397 195 Add in MACH deflection;
+#X obj 236 253 s~ \$0-aGain;
+#X obj 347 424 r~ \$0-aGain;
+#X text 257 278 Azimuth;
+#X text 318 240 Elevation;
+#X obj 258 295 inlet;
+#X obj 315 256 inlet;
+#X obj 258 318 sig~;
+#X obj 315 318 sig~;
+#X obj 315 298 spigot;
+#X text 414 265 End Source;
+#X text 415 284 Mid Source;
+#X obj 432 343 loadbang;
+#X obj 432 364 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 432 382 metro 10;
+#X msg 349 322 0;
+#X obj 386 303 t f b;
+#X msg 386 283 0;
+#X msg 386 263 1;
+#X obj 234 382 +~ 90;
+#X obj 234 403 /~ 360;
+#X obj 234 425 cos~;
+#X obj 234 449 *~;
+#X obj 219 472 *~;
+#X obj 319 377 /~ 360;
+#X obj 319 400 cos~;
+#X obj 319 424 *~;
+#X obj 319 449 *~;
+#X obj 432 403 snapshot~;
+#X floatatom 432 423 5 0 0 0 - - -;
+#X obj 466 450 loadbang;
+#X obj 466 471 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 466 489 metro 10;
+#X obj 466 510 snapshot~;
+#X floatatom 466 530 5 0 0 0 - - -;
+#X obj 149 366 loadbang;
+#X obj 149 387 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 149 405 metro 10;
+#X obj 149 426 snapshot~;
+#X floatatom 149 446 5 0 0 0 - - -;
+#X obj 651 38 inlet;
+#X obj 750 40 inlet;
+#X obj 846 43 inlet;
+#X floatatom 651 85 5 0 0 0 - - -;
+#X floatatom 750 86 5 0 0 0 - - -;
+#X floatatom 847 87 5 0 0 0 - - -;
+#X text 647 19 X Rotation;
+#X text 744 21 Y Rotation;
+#X text 841 24 Z Rotation;
+#X obj 656 61 s \$0-this_rotaX;
+#X obj 757 62 s \$0-thisrotaY;
+#X obj 854 66 s \$0-thisrotaZ;
+#X obj 258 337 angleCalc~;
+#X text 74 8 Strouhal number;
+#X text 269 7 Wind speed;
+#X connect 2 0 4 0;
+#X connect 3 0 4 1;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 6 0 26 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 1;
+#X connect 9 0 28 0;
+#X connect 9 0 50 0;
+#X connect 10 0 22 0;
+#X connect 12 0 16 0;
+#X connect 16 0 23 0;
+#X connect 17 0 3 0;
+#X connect 17 0 3 1;
+#X connect 18 0 2 0;
+#X connect 20 0 5 1;
+#X connect 21 0 7 1;
+#X connect 21 0 7 0;
+#X connect 21 0 13 0;
+#X connect 24 0 26 1;
+#X connect 26 0 9 0;
+#X connect 29 0 54 1;
+#X connect 32 0 34 0;
+#X connect 33 0 36 0;
+#X connect 34 0 79 0;
+#X connect 35 0 79 1;
+#X connect 36 0 35 0;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 41 0 55 0;
+#X connect 42 0 35 0;
+#X connect 43 0 36 1;
+#X connect 43 1 42 0;
+#X connect 44 0 43 0;
+#X connect 45 0 36 1;
+#X connect 46 0 47 0;
+#X connect 47 0 48 0;
+#X connect 48 0 49 0;
+#X connect 48 0 49 1;
+#X connect 49 0 50 1;
+#X connect 49 0 65 0;
+#X connect 50 0 10 0;
+#X connect 51 0 52 0;
+#X connect 52 0 53 0;
+#X connect 52 0 53 1;
+#X connect 53 0 54 0;
+#X connect 53 0 60 0;
+#X connect 54 0 12 0;
+#X connect 55 0 56 0;
+#X connect 57 0 58 0;
+#X connect 58 0 59 0;
+#X connect 59 0 60 0;
+#X connect 60 0 61 0;
+#X connect 62 0 63 0;
+#X connect 63 0 64 0;
+#X connect 64 0 65 0;
+#X connect 65 0 66 0;
+#X connect 67 0 70 0;
+#X connect 67 0 76 0;
+#X connect 68 0 71 0;
+#X connect 68 0 77 0;
+#X connect 69 0 72 0;
+#X connect 69 0 78 0;
+#X connect 79 0 46 0;
+#X connect 79 0 51 0;
+#X connect 79 0 55 0;
+#X restore 272 293 pd freqGain;
+#X obj 429 45 inlet;
+#X obj 302 188 r \$0-diameter;
+#X obj 503 44 inlet;
+#X floatatom 357 93 5 0 0 0 - - -;
+#X floatatom 429 91 5 0 0 0 - - -;
+#X floatatom 504 88 5 0 0 0 - - -;
+#X obj 52 401 outlet;
+#X obj 96 374 snapshot~;
+#X obj 96 327 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 96 301 loadbang;
+#X obj 96 349 metro 10;
+#X obj 17 351 r~ \$0-myFreq;
+#X text 103 600 Strouhal Number;
+#X text 262 352 Calculates the gain of the dipole source;
+#X text 265 630 Calculates the gain of the source;
+#X text 495 25 Azimuth;
+#X text 610 24 Pan;
+#X text 423 26 Elevation;
+#X text 353 27 Distance;
+#X text 187 27 Diameter;
+#X text 102 26 Wind Speed;
+#X obj 284 45 inlet;
+#X floatatom 284 89 5 0 0 0 - - -;
+#X text 280 26 Length;
+#X obj 717 401 newStrou;
+#X floatatom 52 84 5 0 0 0 - - -;
+#X floatatom 192 92 5 0 0 0 - - -;
+#X obj 942 492 throw~ l;
+#X obj 969 470 throw~ r;
+#X obj 942 448 fcpan;
+#X obj 294 68 s \$0-leng;
+#X obj 362 69 s \$0-dist;
+#X obj 436 67 s \$0-elev;
+#X obj 511 67 s \$0-azim;
+#X obj 271 128 r~ \$0-str;
+#X obj 292 168 r \$0-leng;
+#X obj 313 208 r \$0-azim;
+#X obj 323 229 r \$0-elev;
+#X obj 334 250 r \$0-dist;
+#X obj 335 317 s~ \$0-dragDiGain;
+#X obj 272 337 s~ \$0-liftDiGain;
+#X obj 274 408 r~ \$0-str;
+#X obj 297 452 r \$0-leng;
+#X obj 331 519 r \$0-elev;
+#X obj 320 496 r \$0-azim;
+#X obj 343 542 r \$0-dist;
+#X obj 274 611 s~ \$0-liftNoiseGain;
+#X obj 529 480 r~ \$0-dragDiGain;
+#X obj 611 431 s~ \$0-str;
+#X obj 755 482 r~ \$0-liftDiGain;
+#X obj 744 510 r \$0-thisPan;
+#X obj 605 111 s \$0-thisPan;
+#X obj 978 206 r \$0-contFreq;
+#X obj 96 401 s \$0-contFreq;
+#X obj 19 520 r~ \$0-str;
+#X obj 942 162 r~ \$0-liftNoiseGain;
+#X obj 969 429 r \$0-thisPan;
+#X obj 700 51 inlet;
+#X obj 772 50 inlet;
+#X obj 846 49 inlet;
+#X floatatom 700 98 5 0 0 0 - - -;
+#X floatatom 772 96 5 0 0 0 - - -;
+#X floatatom 847 93 5 0 0 0 - - -;
+#X obj 705 74 s \$0-rotaX;
+#X obj 779 72 s \$0-rotaY;
+#X obj 854 72 s \$0-rotaZ;
+#X text 696 32 X Rotation;
+#X text 766 31 Y Rotation;
+#X text 841 30 Z Rotation;
+#X text 923 136 Noise spectrum calculation;
+#X obj 957 230 hip~;
+#X obj 1162 39 *~ -0.001;
+#X obj 1162 64 +~ 20;
+#X obj 1207 136 clip~ 1 20;
+#X obj 847 380 sig~;
+#X msg 847 355 0.27;
+#X obj 774 789 throw~ l;
+#X obj 801 766 throw~ r;
+#X obj 774 742 fcpan;
+#X obj 801 713 r \$0-thisPan;
+#X obj 1183 107 *~ 0.5;
+#X obj 612 674 osc~;
+#X obj 612 696 *~;
+#X obj 612 622 r~ \$0-myFreq;
+#X obj 496 580 throw~ l;
+#X obj 523 557 throw~ r;
+#X obj 496 533 fcpan;
+#X obj 523 504 r \$0-thisPan;
+#X obj 611 775 throw~ l;
+#X obj 638 752 throw~ r;
+#X obj 611 728 fcpan;
+#X obj 638 699 r \$0-thisPan;
+#X obj 649 646 r~ \$0-liftDiGain;
+#X floatatom 1057 430 20 0 0 0 - - -;
+#X obj 1057 406 snapshot~;
+#X obj 1057 359 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 1057 333 loadbang;
+#X obj 1057 381 metro 10;
+#X obj 957 359 *~;
+#X obj 612 647 *~ 3;
+#X obj 774 674 osc~;
+#X obj 774 696 *~;
+#X obj 774 622 r~ \$0-myFreq;
+#X obj 811 646 r~ \$0-liftDiGain;
+#X obj 774 647 *~ 5;
+#X text 987 276 1/f^(-2) Roll off filter required;
+#X obj 475 666 osc~;
+#X obj 475 688 *~;
+#X obj 475 614 r~ \$0-myFreq;
+#X obj 509 639 r~ \$0-dragDiGain;
+#X obj 475 768 throw~ l;
+#X obj 502 745 throw~ r;
+#X obj 475 721 fcpan;
+#X obj 502 692 r \$0-thisPan;
+#X obj 475 639 *~ 4;
+#X obj 649 676 *~ 0.4;
+#X obj 811 676 *~ 0.3;
+#X obj 509 665 *~ 0.4;
+#X connect 4 0 15 0;
+#X connect 5 0 7 0;
+#X connect 6 0 41 0;
+#X connect 6 0 91 0;
+#X connect 7 0 6 0;
+#X connect 8 0 4 0;
+#X connect 8 0 27 0;
+#X connect 10 0 8 0;
+#X connect 11 0 20 0;
+#X connect 11 0 93 0;
+#X connect 14 0 70 0;
+#X connect 14 0 98 0;
+#X connect 15 0 49 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 153 0;
+#X connect 21 0 7 1;
+#X connect 22 0 8 1;
+#X connect 24 0 66 1;
+#X connect 25 0 10 1;
+#X connect 26 0 5 0;
+#X connect 28 0 17 0;
+#X connect 29 0 30 0;
+#X connect 30 0 23 0;
+#X connect 31 0 29 0;
+#X connect 31 0 92 0;
+#X connect 32 0 48 1;
+#X connect 33 0 137 0;
+#X connect 34 0 96 0;
+#X connect 35 0 38 0;
+#X connect 36 0 35 0;
+#X connect 37 0 36 0;
+#X connect 39 0 37 0;
+#X connect 40 0 35 0;
+#X connect 42 0 43 0;
+#X connect 42 0 48 2;
+#X connect 44 0 45 0;
+#X connect 45 0 50 0;
+#X connect 46 0 138 0;
+#X connect 48 0 147 0;
+#X connect 49 0 2 0;
+#X connect 49 1 3 0;
+#X connect 50 0 42 0;
+#X connect 51 0 53 0;
+#X connect 53 0 54 0;
+#X connect 54 0 52 0;
+#X connect 54 0 118 0;
+#X connect 58 0 64 1;
+#X connect 59 0 62 0;
+#X connect 60 0 59 0;
+#X connect 61 0 60 0;
+#X connect 63 0 61 0;
+#X connect 64 0 113 0;
+#X connect 65 0 64 3;
+#X connect 66 0 107 0;
+#X connect 66 1 106 0;
+#X connect 67 0 71 0;
+#X connect 67 0 99 0;
+#X connect 68 0 66 3;
+#X connect 69 0 72 0;
+#X connect 69 0 100 0;
+#X connect 74 0 73 0;
+#X connect 74 0 9 0;
+#X connect 74 0 120 0;
+#X connect 75 0 77 0;
+#X connect 76 0 75 0;
+#X connect 77 0 74 0;
+#X connect 78 0 74 0;
+#X connect 88 0 89 0;
+#X connect 88 0 97 0;
+#X connect 91 0 115 0;
+#X connect 91 0 10 0;
+#X connect 96 0 94 0;
+#X connect 96 1 95 0;
+#X connect 101 0 66 0;
+#X connect 102 0 66 2;
+#X connect 103 0 66 4;
+#X connect 104 0 66 5;
+#X connect 105 0 66 6;
+#X connect 108 0 64 0;
+#X connect 109 0 64 2;
+#X connect 110 0 64 5;
+#X connect 111 0 64 4;
+#X connect 112 0 64 6;
+#X connect 114 0 19 1;
+#X connect 116 0 15 1;
+#X connect 117 0 49 1;
+#X connect 119 0 137 1;
+#X connect 121 0 59 0;
+#X connect 122 0 34 0;
+#X connect 123 0 96 1;
+#X connect 124 0 127 0;
+#X connect 124 0 130 0;
+#X connect 125 0 128 0;
+#X connect 125 0 131 0;
+#X connect 126 0 129 0;
+#X connect 126 0 132 0;
+#X connect 137 0 165 0;
+#X connect 138 0 139 0;
+#X connect 139 0 140 0;
+#X connect 140 0 42 0;
+#X connect 142 0 141 0;
+#X connect 145 0 143 0;
+#X connect 145 1 144 0;
+#X connect 146 0 145 1;
+#X connect 148 0 149 0;
+#X connect 149 0 157 0;
+#X connect 150 0 166 0;
+#X connect 153 0 151 0;
+#X connect 153 1 152 0;
+#X connect 154 0 153 1;
+#X connect 157 0 155 0;
+#X connect 157 1 156 0;
+#X connect 158 0 157 1;
+#X connect 159 0 182 0;
+#X connect 161 0 160 0;
+#X connect 162 0 164 0;
+#X connect 163 0 162 0;
+#X connect 164 0 161 0;
+#X connect 165 0 34 1;
+#X connect 166 0 148 0;
+#X connect 167 0 168 0;
+#X connect 168 0 145 0;
+#X connect 169 0 171 0;
+#X connect 170 0 183 0;
+#X connect 171 0 167 0;
+#X connect 173 0 174 0;
+#X connect 174 0 179 0;
+#X connect 175 0 181 0;
+#X connect 176 0 184 0;
+#X connect 179 0 177 0;
+#X connect 179 1 178 0;
+#X connect 180 0 179 1;
+#X connect 181 0 173 0;
+#X connect 182 0 149 1;
+#X connect 183 0 168 1;
+#X connect 184 0 174 1;
diff -r 6ff3ad934ae7 -r ced3d7831a75 scene demo/gaussianoise.pd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scene demo/gaussianoise.pd	Tue Oct 27 06:28:58 2015 +0000
@@ -0,0 +1,48 @@
+#N canvas 767 150 370 529 10;
+#X obj 0 -98 noise~;
+#X obj 99 76 noise~;
+#X obj 35 138 *~;
+#X obj 35 58 ln~;
+#X obj 35 79 *~ -2;
+#X obj 35 158 outlet~;
+#X obj 98 -46 sig~ 1;
+#X obj 98 -21 -~;
+#X obj 35 12 *~;
+#X obj 35 36 +~;
+#X obj 0 -67 max~ 0;
+#X obj 51 -67 min~ 0;
+#X obj 51 -45 *~ -1;
+#X obj 35 -14 +~;
+#X obj 114 -73 sig~ \$1;
+#X obj 99 99 cos~;
+#X obj 35 100 q8_sqrt~;
+#X obj 232 32 snapshot~;
+#X obj 232 7 metro 100;
+#X floatatom 232 59 10 0 0 0 - - -;
+#X obj 232 -40 loadbang;
+#X obj 232 -17 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 114 -93 inlet;
+#X connect 0 0 10 0;
+#X connect 0 0 11 0;
+#X connect 1 0 15 0;
+#X connect 2 0 5 0;
+#X connect 3 0 4 0;
+#X connect 4 0 16 0;
+#X connect 6 0 7 0;
+#X connect 7 0 9 1;
+#X connect 8 0 9 0;
+#X connect 9 0 3 0;
+#X connect 10 0 13 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 1;
+#X connect 13 0 8 0;
+#X connect 14 0 8 1;
+#X connect 14 0 7 1;
+#X connect 15 0 2 1;
+#X connect 16 0 2 0;
+#X connect 17 0 19 0;
+#X connect 18 0 17 0;
+#X connect 20 0 21 0;
+#X connect 21 0 18 0;
+#X connect 22 0 14 0;
diff -r 6ff3ad934ae7 -r ced3d7831a75 scene demo/testBed.pd
--- a/scene demo/testBed.pd	Wed Aug 19 17:55:35 2015 +0100
+++ b/scene demo/testBed.pd	Tue Oct 27 06:28:58 2015 +0000
@@ -1,4 +1,4 @@
-#N canvas 269 70 1281 766 10;
+#N canvas 162 77 1281 766 10;
 #X obj 167 -82 loadbang;
 #N canvas 236 158 426 423 windspeed 0;
 #X obj 3 -19 +~ 1;
@@ -84,7 +84,7 @@
 #X obj -49 -126 loadbang;
 #X msg -49 -98 5;
 #X obj 211 10 hsl 128 15 0.001 0.1 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 1118 1;
+-262144 -1 -1 4021 1;
 #X floatatom 223 34 8 0 0 0 - - -;
 #X obj 274 284 hsl 128 15 0.009 0.9 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 6999 1;
@@ -94,10 +94,10 @@
 -1 -1 6350 1;
 #X floatatom 270 195 5 0 0 0 - - -;
 #X obj 261 221 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 6526 1;
+-262144 -1 -1 2000 1;
 #X floatatom 285 250 5 0 0 0 - - -;
 #X obj 236 109 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 12700 1;
+-1 -1 5847 1;
 #X floatatom 247 138 5 0 0 0 - - -;
 #X text 415 285 Pan Value;
 #X obj -276 231 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -144,7 +144,7 @@
 #X restore -277 188 pd opLevels;
 #X msg -253 109 5;
 #X obj -274 159 hsl 100 25 0.1 5000 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 96 1;
+-262144 -1 -1 2996 1;
 #X obj -7 -21 snapshot~;
 #X obj -7 -46 metro 100;
 #X floatatom -7 6 10 0 0 0 - - -;
@@ -163,14 +163,13 @@
 #X obj 340 -139 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1
 -1;
 #X floatatom 235 509 8 0 0 0 - - -;
-#X msg 154 -7 0.003;
 #X msg 117 92 12;
 #X msg 97 149 0;
 #X msg 54 267 0.5;
 #X obj 167 -58 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 224 66 hsl 128 15 1 10 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 12700 1;
+-1 -1 4233 1;
 #X floatatom 245 85 8 0 0 0 - - -;
 #X msg 133 49 4;
 #X obj -157 162 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144
@@ -206,7 +205,6 @@
 #X msg 33 325 0;
 #X msg 13 379 0;
 #X msg -10 432 0;
-#X obj 199 481 freqCalcCyl2_D7Mach;
 #X text 457 397 Source Rotation Y;
 #X text 435 343 Source Rotation X;
 #X text 463 450 Source Rotation Z;
@@ -429,116 +427,118 @@
 #X msg -156 138 1;
 #X floatatom -314 190 5 0 0 0 - - -;
 #X msg -444 232 13 0.005 10 1 85 150;
-#X msg -403 -11 8;
-#X obj -444 -44 hsl 128 15 0 30 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3600 1;
+#X obj -444 -44 hsl 128 15 0 55 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
 #X floatatom -456 -5 5 0 0 0 - - -;
-#X connect 0 0 46 0;
+#X msg 154 -7 0.0254;
+#X msg -378 -17 32.3;
+#X obj 199 481 freqCalcCyl3_D1Mach;
+#X connect 0 0 45 0;
 #X connect 1 0 8 0;
 #X connect 3 0 8 1;
 #X connect 3 0 9 1;
-#X connect 3 0 91 0;
+#X connect 3 0 89 0;
 #X connect 4 0 7 0;
-#X connect 4 0 54 0;
+#X connect 4 0 53 0;
 #X connect 5 0 4 0;
 #X connect 6 0 5 0;
 #X connect 8 0 9 0;
 #X connect 9 0 4 0;
+#X connect 9 0 2 0;
 #X connect 10 0 6 0;
 #X connect 12 0 13 0;
 #X connect 13 0 3 0;
 #X connect 14 0 15 0;
-#X connect 14 0 79 1;
+#X connect 14 0 121 1;
 #X connect 16 0 17 0;
-#X connect 16 0 79 6;
+#X connect 16 0 121 6;
 #X connect 19 0 20 0;
-#X connect 19 0 79 4;
+#X connect 19 0 121 4;
 #X connect 21 0 22 0;
-#X connect 21 0 79 5;
-#X connect 21 0 84 0;
+#X connect 21 0 82 0;
+#X connect 21 0 121 5;
 #X connect 23 0 24 0;
-#X connect 23 0 79 3;
+#X connect 23 0 121 3;
 #X connect 29 0 31 0;
 #X connect 30 0 26 0;
 #X connect 30 1 27 0;
 #X connect 31 0 32 0;
 #X connect 32 0 30 0;
-#X connect 32 0 117 0;
+#X connect 32 0 115 0;
 #X connect 33 0 35 0;
-#X connect 33 0 56 0;
+#X connect 33 0 55 0;
 #X connect 34 0 33 0;
 #X connect 36 0 37 0;
 #X connect 37 0 34 0;
-#X connect 40 0 57 0;
-#X connect 42 0 14 0;
-#X connect 43 0 23 0;
-#X connect 44 0 19 0;
-#X connect 45 0 16 0;
-#X connect 46 0 93 0;
-#X connect 46 0 42 0;
-#X connect 46 0 43 0;
-#X connect 46 0 44 0;
-#X connect 46 0 85 0;
-#X connect 46 0 45 0;
-#X connect 46 0 49 0;
-#X connect 46 0 76 0;
-#X connect 46 0 77 0;
-#X connect 46 0 78 0;
-#X connect 47 0 48 0;
-#X connect 47 0 79 2;
-#X connect 49 0 47 0;
-#X connect 50 0 30 1;
-#X connect 51 0 116 0;
-#X connect 55 0 33 0;
-#X connect 58 0 14 0;
-#X connect 59 0 47 0;
-#X connect 60 0 23 0;
-#X connect 61 0 19 0;
-#X connect 62 0 21 0;
-#X connect 63 0 16 0;
-#X connect 67 0 68 0;
-#X connect 67 0 79 7;
-#X connect 69 0 67 0;
-#X connect 70 0 71 0;
-#X connect 70 0 79 8;
-#X connect 72 0 70 0;
-#X connect 73 0 74 0;
-#X connect 73 0 79 9;
-#X connect 75 0 73 0;
-#X connect 76 0 67 0;
-#X connect 77 0 70 0;
-#X connect 78 0 73 0;
-#X connect 79 0 41 0;
+#X connect 40 0 56 0;
+#X connect 42 0 23 0;
+#X connect 43 0 19 0;
+#X connect 44 0 16 0;
+#X connect 45 0 91 0;
+#X connect 45 0 119 0;
+#X connect 45 0 42 0;
+#X connect 45 0 43 0;
+#X connect 45 0 83 0;
+#X connect 45 0 44 0;
+#X connect 45 0 48 0;
+#X connect 45 0 75 0;
+#X connect 45 0 76 0;
+#X connect 45 0 77 0;
+#X connect 46 0 47 0;
+#X connect 46 0 121 2;
+#X connect 48 0 46 0;
+#X connect 49 0 30 1;
+#X connect 50 0 114 0;
+#X connect 54 0 33 0;
+#X connect 57 0 14 0;
+#X connect 58 0 46 0;
+#X connect 59 0 23 0;
+#X connect 60 0 19 0;
+#X connect 61 0 21 0;
+#X connect 62 0 16 0;
+#X connect 66 0 67 0;
+#X connect 66 0 121 7;
+#X connect 68 0 66 0;
+#X connect 69 0 70 0;
+#X connect 69 0 121 8;
+#X connect 71 0 69 0;
+#X connect 72 0 73 0;
+#X connect 72 0 121 9;
+#X connect 74 0 72 0;
+#X connect 75 0 66 0;
+#X connect 76 0 69 0;
+#X connect 77 0 72 0;
+#X connect 83 0 21 0;
+#X connect 84 0 21 0;
 #X connect 85 0 21 0;
-#X connect 86 0 21 0;
 #X connect 87 0 21 0;
-#X connect 88 0 2 0;
-#X connect 89 0 21 0;
+#X connect 88 0 14 0;
 #X connect 90 0 14 0;
-#X connect 92 0 14 0;
-#X connect 93 0 79 0;
-#X connect 94 0 96 0;
-#X connect 95 0 96 0;
-#X connect 97 0 108 0;
-#X connect 97 1 106 0;
-#X connect 97 2 104 0;
-#X connect 97 3 102 0;
-#X connect 97 4 100 0;
-#X connect 97 5 98 0;
-#X connect 99 0 32 0;
-#X connect 101 0 21 0;
-#X connect 103 0 23 0;
-#X connect 105 0 47 0;
-#X connect 107 0 14 0;
-#X connect 109 0 3 0;
-#X connect 110 0 32 0;
-#X connect 111 0 97 0;
-#X connect 112 0 97 0;
-#X connect 113 0 97 0;
-#X connect 114 0 97 0;
-#X connect 115 0 111 0;
-#X connect 116 0 50 0;
-#X connect 118 0 97 0;
-#X connect 119 0 88 0;
-#X connect 120 0 88 0;
-#X connect 120 0 121 0;
+#X connect 91 0 121 0;
+#X connect 92 0 94 0;
+#X connect 93 0 94 0;
+#X connect 95 0 106 0;
+#X connect 95 1 104 0;
+#X connect 95 2 102 0;
+#X connect 95 3 100 0;
+#X connect 95 4 98 0;
+#X connect 95 5 96 0;
+#X connect 97 0 32 0;
+#X connect 99 0 21 0;
+#X connect 101 0 23 0;
+#X connect 103 0 46 0;
+#X connect 105 0 14 0;
+#X connect 107 0 3 0;
+#X connect 108 0 32 0;
+#X connect 109 0 95 0;
+#X connect 110 0 95 0;
+#X connect 111 0 95 0;
+#X connect 112 0 95 0;
+#X connect 113 0 109 0;
+#X connect 114 0 49 0;
+#X connect 116 0 95 0;
+#X connect 117 0 86 0;
+#X connect 117 0 118 0;
+#X connect 119 0 14 0;
+#X connect 120 0 86 0;
+#X connect 121 0 41 0;