changeset 201:451337700704

Shallow Cavity added TestBedD6 added which has 12 sources, calculating delay between sources with windspeed, distance and pan value.
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Sun, 13 Mar 2016 20:53:12 +0000
parents 04808797b49e
children f8092cf32f67
files .DS_Store Shallow Cavity/CavD1.pd Shallow Cavity/WindGenD1.pd scene demo/Draft2Aeolian/.DS_Store scene demo/Draft2Aeolian/freqCalcCyl3No_D3Mach.pd scene demo/Draft2Aeolian/testBedD5.pd scene demo/Draft2Aeolian/testBedD6.pd scene demo/freqCalcCyl3No_D3Mach.pd scene demo/oneTone.pd scene demo/testBedD6.pd
diffstat 10 files changed, 1291 insertions(+), 164 deletions(-) [+]
line wrap: on
line diff
Binary file .DS_Store has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Shallow Cavity/CavD1.pd	Sun Mar 13 20:53:12 2016 +0000
@@ -0,0 +1,257 @@
+#N canvas 130 23 1193 815 10;
+#X obj -127 -66 loadbang;
+#X obj -127 -29 metro 10;
+#X obj -127 -46 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -127 -7 s myMet;
+#X obj -48 235 delwrite~ varwind 3000;
+#X obj 62 -16 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj -47 28 *~ 1;
+#X obj -47 54 +~ 1;
+#X obj 151 -60 loadbang;
+#X msg 151 -40 5;
+#N canvas 20 383 344 123 machCalc 0;
+#X text 107 15 Speed of Sound (dry air 20 Degs C);
+#X obj 26 -14 vd~ varwind;
+#X obj 26 33 s~ MY_MACH;
+#X obj 26 9 /~ 343.56;
+#X connect 1 0 3 0;
+#X connect 3 0 2 0;
+#X restore 209 -3 pd machCalc;
+#X floatatom 100 7 5 0 0 0 - - -;
+#X obj 59 -40 r SPEED;
+#N canvas 634 290 596 443 windDirection 0;
+#X obj 183 0 inlet~;
+#X obj 280 52 inlet;
+#X obj 280 86 sig~;
+#X obj 185 251 *~;
+#X obj 185 279 outlet~;
+#X obj 246 254 outlet~;
+#X obj 200 195 cos~;
+#X obj 200 135 +~;
+#X obj 200 71 lop~ 1;
+#X obj 246 194 *~ 360;
+#X obj 200 91 lop~ 1;
+#X obj 200 30 noise~;
+#X obj 200 51 lop~ 1;
+#X obj 200 157 /~ 360;
+#X obj 200 113 *~ 800;
+#X obj 200 221 abs~;
+#X connect 0 0 3 0;
+#X connect 1 0 2 0;
+#X connect 2 0 7 1;
+#X connect 3 0 4 0;
+#X connect 6 0 15 0;
+#X connect 7 0 13 0;
+#X connect 8 0 10 0;
+#X connect 9 0 5 0;
+#X connect 10 0 14 0;
+#X connect 11 0 12 0;
+#X connect 12 0 8 0;
+#X connect 13 0 6 0;
+#X connect 13 0 9 0;
+#X connect 14 0 7 0;
+#X connect 15 0 3 1;
+#X restore -48 133 pd windDirection;
+#X obj 105 178 snapshot~;
+#X floatatom 105 205 10 0 0 0 - - -;
+#X text 102 223 Wind Speed;
+#X obj 48 108 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj 186 178 snapshot~;
+#X floatatom 186 205 10 0 0 0 - - -;
+#X text 183 223 Wind Direction;
+#X obj -47 -2 WindGenD1;
+#X msg 114 -39 20;
+#X obj 186 155 r myMet;
+#X obj 105 155 r myMet;
+#X obj 22 7 * 0.5;
+#X obj 59 7 * 0.88;
+#X obj 41 314 sig~;
+#X obj -162 467 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj -99 467 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X text -102 376 Gain;
+#X obj -154 347 loadbang;
+#N canvas 555 179 313 396 opLevels 0;
+#X obj 79 184 dac~;
+#X obj 30 70 catch~ l;
+#X obj 128 70 catch~ r;
+#X obj 129 104 *~ 0.45;
+#X obj 30 104 *~ 0.45;
+#X obj 30 210 prvu~;
+#X obj 129 211 prvu~;
+#X obj 93 33 inlet;
+#X obj 30 239 outlet;
+#X obj 129 239 outlet;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 6 0;
+#X connect 3 0 0 1;
+#X connect 4 0 5 0;
+#X connect 4 0 0 0;
+#X connect 5 0 8 0;
+#X connect 6 0 9 0;
+#X connect 7 0 4 1;
+#X connect 7 0 3 1;
+#X restore -163 424 pd opLevels;
+#X msg -154 370 5;
+#X obj -160 395 hsl 100 25 0.1 1e+09 1 0 empty empty empty -2 -8 0
+10 -262144 -1 -1 0 1;
+#X obj -163 324 r GAIN;
+#X floatatom -220 425 8 0 0 0 - - -;
+#N canvas 146 64 1247 740 cavFreqD1 0;
+#X obj 53 -260 s~ \$0-windSpeed;
+#X obj 53 -280 vd~ varwind;
+#X text 66 -304 Wind Speed;
+#X obj 197 -279 inlet;
+#X obj 415 -281 inlet;
+#X obj 469 -278 inlet;
+#X obj 197 -258 s $-thisLen;
+#X obj 194 -164 sig~ 1;
+#X obj 194 -142 -~ 0.25;
+#X obj 239 -76 r~ MY_MACH;
+#X obj 224 -97 sig~ 1;
+#X obj 239 -51 *~;
+#X obj 239 -29 *~ 0.2;
+#X obj 224 -6 +~;
+#X obj 224 17 sqrt~;
+#X obj 209 -119 r~ MY_MACH;
+#X obj 209 38 /~;
+#X obj 209 60 +~ 1.7544;
+#X obj 194 82 /~;
+#X obj 114 75 r myMet;
+#X obj 114 97 snapshot~;
+#X floatatom 114 121 0 0 0 0 - - -;
+#X obj 194 124 *~;
+#X obj 209 103 r~ \$0-windSpeed;
+#X obj 194 164 /~ 1;
+#X obj 215 144 r $-thisLen;
+#X obj 122 279 r myMet;
+#X obj 122 300 snapshot~;
+#X floatatom 122 324 0 0 0 0 - - -;
+#X obj 297 283 r myMet;
+#X obj 297 305 snapshot~;
+#X floatatom 297 329 0 0 0 0 - - -;
+#X obj 202 279 r myMet;
+#X obj 202 301 snapshot~;
+#X floatatom 202 325 0 0 0 0 - - -;
+#X text 290 -34 (y-1)/2 -> y = 1.4;
+#X text 254 -144 alpha = 0.25;
+#X text 250 -164 m = 1;
+#X text 277 58 (1/k) -> k = 0.57;
+#X obj 395 284 r myMet;
+#X obj 395 306 snapshot~;
+#X floatatom 395 330 0 0 0 0 - - -;
+#X obj 288 263 *~ 3.6667;
+#X obj 387 265 *~ 5;
+#X obj 473 281 r myMet;
+#X obj 473 303 snapshot~;
+#X floatatom 473 327 0 0 0 0 - - -;
+#X obj 563 280 r myMet;
+#X obj 563 302 snapshot~;
+#X floatatom 563 326 0 0 0 0 - - -;
+#X obj 194 260 *~ 2.3333;
+#X obj 464 261 *~ 6.3333;
+#X obj 553 260 *~ 7.6667;
+#X text 130 347 m = 1;
+#X text 207 351 m = 2;
+#X text 296 351 m = 3;
+#X text 399 352 m = 4;
+#X text 476 352 m = 5;
+#X text 568 349 m = 6;
+#X connect 1 0 0 0;
+#X connect 3 0 6 0;
+#X connect 7 0 8 0;
+#X connect 8 0 18 0;
+#X connect 9 0 11 0;
+#X connect 9 0 11 1;
+#X connect 10 0 13 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 1;
+#X connect 13 0 14 0;
+#X connect 14 0 16 1;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 18 1;
+#X connect 18 0 20 0;
+#X connect 18 0 22 0;
+#X connect 19 0 20 0;
+#X connect 20 0 21 0;
+#X connect 22 0 24 0;
+#X connect 23 0 22 1;
+#X connect 24 0 27 0;
+#X connect 24 0 42 0;
+#X connect 24 0 43 0;
+#X connect 24 0 50 0;
+#X connect 24 0 51 0;
+#X connect 24 0 52 0;
+#X connect 25 0 24 1;
+#X connect 26 0 27 0;
+#X connect 27 0 28 0;
+#X connect 29 0 30 0;
+#X connect 30 0 31 0;
+#X connect 32 0 33 0;
+#X connect 33 0 34 0;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 42 0 30 0;
+#X connect 43 0 40 0;
+#X connect 44 0 45 0;
+#X connect 45 0 46 0;
+#X connect 47 0 48 0;
+#X connect 48 0 49 0;
+#X connect 50 0 33 0;
+#X connect 51 0 45 0;
+#X connect 52 0 48 0;
+#X restore 484 385 pd cavFreqD1;
+#X obj 487 165 hsl 100 25 0.001 10 1 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 1138 1;
+#X floatatom 520 202 0 0 0 0 - - -;
+#X obj 521 229 hsl 100 25 0.1 10 1 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 554 266 0 0 0 0 - - -;
+#X obj 556 293 hsl 100 25 0.1 10 1 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 589 330 0 0 0 0 - - -;
+#X text 599 168 Length;
+#X msg 526 122 3.6576;
+#X msg 41 290 510.54;
+#X connect 0 0 2 0;
+#X connect 1 0 3 0;
+#X connect 2 0 1 0;
+#X connect 5 0 11 0;
+#X connect 5 0 25 0;
+#X connect 5 0 26 0;
+#X connect 6 0 7 0;
+#X connect 7 0 13 0;
+#X connect 8 0 9 0;
+#X connect 9 0 5 0;
+#X connect 12 0 5 0;
+#X connect 13 0 14 0;
+#X connect 13 0 4 0;
+#X connect 13 1 18 0;
+#X connect 14 0 15 0;
+#X connect 17 0 13 1;
+#X connect 18 0 19 0;
+#X connect 21 0 6 0;
+#X connect 22 0 5 0;
+#X connect 23 0 18 0;
+#X connect 24 0 14 0;
+#X connect 25 0 6 1;
+#X connect 26 0 7 1;
+#X connect 31 0 33 0;
+#X connect 32 0 28 0;
+#X connect 32 1 29 0;
+#X connect 33 0 34 0;
+#X connect 34 0 32 0;
+#X connect 34 0 36 0;
+#X connect 35 0 34 0;
+#X connect 38 0 39 0;
+#X connect 38 0 37 0;
+#X connect 40 0 41 0;
+#X connect 40 0 37 1;
+#X connect 42 0 43 0;
+#X connect 42 0 37 2;
+#X connect 45 0 38 0;
+#X connect 46 0 27 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Shallow Cavity/WindGenD1.pd	Sun Mar 13 20:53:12 2016 +0000
@@ -0,0 +1,132 @@
+#N canvas 371 89 460 675 10;
+#X obj 172 219 +~ 1;
+#X obj 172 314 +~;
+#X obj 172 241 *~ 0.25;
+#X obj 188 291 +~;
+#N canvas 939 160 373 400 squall 0;
+#X obj 113 208 noise~;
+#X obj 113 271 hip~ 0;
+#X obj 113 229 lop~ 3;
+#X obj 113 250 lop~ 3;
+#X obj 50 274 *~;
+#X obj 72 318 *~;
+#X obj 50 252 *~ 8;
+#X obj 113 292 *~ 20;
+#X obj 50 188 inlet~;
+#X obj 72 342 outlet~;
+#X obj 50 208 max~ 0.42;
+#X obj 50 230 -~ 0.42;
+#X obj 39 107 noise~;
+#X obj 101 182 Snapshot~;
+#X obj 101 133 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 166 206 5 0 0 0 - - -;
+#X obj 39 128 lop~ 100;
+#X obj 100 106 loadbang;
+#X obj 101 156 metro 1000;
+#X obj 39 150 +~ 0.4;
+#X connect 0 0 2 0;
+#X connect 1 0 7 0;
+#X connect 2 0 3 0;
+#X connect 3 0 1 0;
+#X connect 4 0 5 0;
+#X connect 5 0 9 0;
+#X connect 6 0 4 0;
+#X connect 6 0 4 1;
+#X connect 7 0 5 1;
+#X connect 8 0 10 0;
+#X connect 10 0 11 0;
+#X connect 11 0 6 0;
+#X connect 12 0 16 0;
+#X connect 13 0 15 0;
+#X connect 14 0 18 0;
+#X connect 16 0 19 0;
+#X connect 17 0 14 0;
+#X connect 18 0 13 0;
+#X connect 19 0 13 0;
+#X restore 246 266 pd squall;
+#N canvas 706 412 202 229 gust 0;
+#X obj 0 0 noise~;
+#X obj 0 63 hip~ 0;
+#X obj 0 106 *~;
+#X obj 67 44 *~;
+#X obj 67 21 +~ 0.5;
+#X obj 67 67 -~ 0.125;
+#X obj 0 84 *~ 50;
+#X obj 67 0 inlet~;
+#X obj 0 131 outlet~;
+#X obj 0 42 lop~ 1;
+#X obj 0 21 lop~ 1;
+#X connect 0 0 10 0;
+#X connect 1 0 6 0;
+#X connect 2 0 8 0;
+#X connect 3 0 5 0;
+#X connect 4 0 3 0;
+#X connect 4 0 3 1;
+#X connect 5 0 2 1;
+#X connect 6 0 2 0;
+#X connect 7 0 4 0;
+#X connect 9 0 1 0;
+#X connect 10 0 9 0;
+#X restore 187 267 pd gust;
+#X obj 172 381 outlet~;
+#X obj 172 197 osc~ 0.01;
+#X obj 90 -7 noise~;
+#X obj 172 172 line;
+#X floatatom 119 197 8 0 0 0 - - -;
+#X obj 173 93 snapshot~;
+#X obj 172 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 225 118 8 0 0 0 - - -;
+#X obj 90 19 lop~ 2000;
+#X obj 90 43 +~ 0.6;
+#X obj 145 172 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 172 20 loadbang;
+#X obj 173 118 * 0.2;
+#X msg 173 145 \$1 10;
+#X obj 172 69 metro 2000;
+#X obj 305 -57 noise~;
+#X obj 305 -31 lop~ 2000;
+#X obj 305 -7 +~ 0.6;
+#X obj 229 35 snapshot~;
+#X obj 229 -13 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 229 -38 loadbang;
+#X floatatom 279 66 5 0 0 0 - - -;
+#X obj 229 11 metro 4000;
+#X obj 305 18 *~ 3000;
+#X obj 255 71 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X connect 0 0 2 0;
+#X connect 1 0 6 0;
+#X connect 2 0 4 0;
+#X connect 2 0 5 0;
+#X connect 2 0 1 0;
+#X connect 3 0 1 1;
+#X connect 4 0 3 1;
+#X connect 5 0 3 0;
+#X connect 7 0 0 0;
+#X connect 8 0 14 0;
+#X connect 9 0 7 0;
+#X connect 9 0 10 0;
+#X connect 11 0 13 0;
+#X connect 11 0 18 0;
+#X connect 12 0 20 0;
+#X connect 14 0 15 0;
+#X connect 15 0 11 0;
+#X connect 17 0 12 0;
+#X connect 18 0 19 0;
+#X connect 19 0 9 0;
+#X connect 19 0 16 0;
+#X connect 20 0 11 0;
+#X connect 21 0 22 0;
+#X connect 22 0 23 0;
+#X connect 23 0 29 0;
+#X connect 24 0 20 1;
+#X connect 24 0 27 0;
+#X connect 24 0 30 0;
+#X connect 25 0 28 0;
+#X connect 26 0 25 0;
+#X connect 28 0 24 0;
+#X connect 29 0 24 0;
Binary file scene demo/Draft2Aeolian/.DS_Store has changed
--- a/scene demo/Draft2Aeolian/freqCalcCyl3No_D3Mach.pd	Sat Mar 12 20:34:27 2016 +0000
+++ b/scene demo/Draft2Aeolian/freqCalcCyl3No_D3Mach.pd	Sun Mar 13 20:53:12 2016 +0000
@@ -17,7 +17,6 @@
 #X obj 776 330 r~ \$0-windSpeed;
 #X obj 709 151 r~ \$0-windSpeed;
 #X obj 709 396 s~ \$0-myFreq;
-#X obj 120 65 vd~ varwind;
 #X obj 1052 334 *~;
 #X obj 722 278 s~ \$0-myRey;
 #X obj 636 57 inlet;
@@ -408,7 +407,7 @@
 #X connect 111 0 36 0;
 #X connect 113 0 48 1;
 #X restore 313 307 pd GoldfreqGain;
-#N canvas 540 43 1006 797 GoldnoiseGain 1;
+#N canvas 540 43 1006 797 GoldnoiseGain 0;
 #X text -21037 364 Mass Density of Air \, squared;
 #X obj -20777 459 *;
 #X text -20777 412 Distance;
@@ -912,72 +911,73 @@
 #X obj 1153 257 r myMet;
 #X obj 1143 278 snapshot~;
 #X obj 1143 237 r~ \$0-myFreq;
+#X obj 120 65 inlet~;
 #X connect 1 0 3 0;
-#X connect 2 0 20 0;
-#X connect 2 0 42 0;
+#X connect 2 0 19 0;
+#X connect 2 0 41 0;
 #X connect 3 0 2 0;
 #X connect 4 0 17 0;
 #X connect 5 0 4 0;
 #X connect 6 0 11 0;
-#X connect 6 0 43 0;
-#X connect 9 0 29 0;
-#X connect 9 0 48 0;
+#X connect 6 0 42 0;
+#X connect 9 0 28 0;
+#X connect 9 0 47 0;
 #X connect 12 0 3 1;
 #X connect 13 0 4 1;
 #X connect 15 0 5 1;
 #X connect 16 0 1 0;
-#X connect 18 0 14 0;
-#X connect 19 0 46 0;
-#X connect 21 0 94 0;
-#X connect 25 0 80 1;
-#X connect 26 0 80 4;
+#X connect 18 0 45 0;
+#X connect 20 0 93 0;
+#X connect 24 0 79 1;
+#X connect 25 0 79 4;
+#X connect 26 0 29 0;
+#X connect 26 0 81 0;
 #X connect 27 0 30 0;
 #X connect 27 0 82 0;
-#X connect 28 0 31 0;
-#X connect 28 0 83 0;
-#X connect 39 0 40 0;
-#X connect 39 0 47 0;
-#X connect 42 0 55 0;
-#X connect 42 0 5 0;
-#X connect 46 0 44 0;
-#X connect 46 1 45 0;
-#X connect 51 0 80 0;
-#X connect 52 0 80 3;
-#X connect 53 0 80 5;
-#X connect 57 0 19 0;
-#X connect 58 0 46 1;
+#X connect 38 0 39 0;
+#X connect 38 0 46 0;
+#X connect 41 0 54 0;
+#X connect 41 0 5 0;
+#X connect 45 0 43 0;
+#X connect 45 1 44 0;
+#X connect 50 0 79 0;
+#X connect 51 0 79 3;
+#X connect 52 0 79 5;
+#X connect 56 0 18 0;
+#X connect 57 0 45 1;
+#X connect 58 0 61 0;
+#X connect 58 0 64 0;
 #X connect 59 0 62 0;
 #X connect 59 0 65 0;
 #X connect 60 0 63 0;
 #X connect 60 0 66 0;
-#X connect 61 0 64 0;
-#X connect 61 0 67 0;
-#X connect 72 0 92 0;
-#X connect 73 0 72 0;
-#X connect 74 0 79 1;
-#X connect 75 0 79 3;
-#X connect 76 0 79 0;
-#X connect 77 0 79 2;
-#X connect 78 0 79 5;
-#X connect 79 0 50 0;
-#X connect 79 1 49 0;
-#X connect 80 0 54 0;
-#X connect 84 0 79 6;
+#X connect 71 0 91 0;
+#X connect 72 0 71 0;
+#X connect 73 0 78 1;
+#X connect 74 0 78 3;
+#X connect 75 0 78 0;
+#X connect 76 0 78 2;
+#X connect 77 0 78 5;
+#X connect 78 0 49 0;
+#X connect 78 1 48 0;
+#X connect 79 0 53 0;
+#X connect 83 0 78 6;
+#X connect 84 0 78 7;
 #X connect 85 0 79 7;
-#X connect 86 0 80 7;
-#X connect 87 0 80 6;
-#X connect 88 0 90 0;
-#X connect 89 0 88 0;
-#X connect 91 0 79 4;
-#X connect 92 0 19 1;
-#X connect 93 0 80 2;
-#X connect 94 0 95 0;
-#X connect 95 0 22 0;
-#X connect 95 0 56 0;
-#X connect 97 0 98 0;
-#X connect 99 0 73 0;
-#X connect 101 0 103 0;
-#X connect 104 0 105 0;
-#X connect 105 0 72 1;
-#X connect 105 0 92 1;
-#X connect 106 0 105 0;
+#X connect 86 0 79 6;
+#X connect 87 0 89 0;
+#X connect 88 0 87 0;
+#X connect 90 0 78 4;
+#X connect 91 0 18 1;
+#X connect 92 0 79 2;
+#X connect 93 0 94 0;
+#X connect 94 0 21 0;
+#X connect 94 0 55 0;
+#X connect 96 0 97 0;
+#X connect 98 0 72 0;
+#X connect 100 0 102 0;
+#X connect 103 0 104 0;
+#X connect 104 0 71 1;
+#X connect 104 0 91 1;
+#X connect 105 0 104 0;
+#X connect 106 0 14 0;
--- a/scene demo/Draft2Aeolian/testBedD5.pd	Sat Mar 12 20:34:27 2016 +0000
+++ b/scene demo/Draft2Aeolian/testBedD5.pd	Sun Mar 13 20:53:12 2016 +0000
@@ -1,14 +1,14 @@
-#N canvas 90 31 1333 826 10;
+#N canvas 248 74 1148 792 10;
 #X obj 249 -64 loadbang;
 #X obj -164 205 delwrite~ varwind 3000;
 #X obj -54 -46 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2371 1;
+-1 -1 423 1;
 #X obj -163 -2 *~ 1;
 #X obj -163 24 +~ 1;
 #X obj 35 -90 loadbang;
 #X msg 35 -70 5;
 #X obj 296 26 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 8214 1;
+-262144 -1 -1 3584 1;
 #X floatatom 303 52 8 0 0 0 - - -;
 #X obj 364 302 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 6350 1;
@@ -18,10 +18,10 @@
 -1 -1 6350 1;
 #X floatatom 365 213 5 0 0 0 - - -;
 #X obj 350 239 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 7585 1;
+-262144 -1 -1 7937 1;
 #X floatatom 380 268 5 0 0 0 - - -;
 #X obj 323 127 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 7759 1;
+-1 -1 8877 1;
 #X floatatom 339 156 5 0 0 0 - - -;
 #X text 512 303 Pan Value;
 #X obj -189 443 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -52,7 +52,7 @@
 #X restore -190 400 pd opLevels;
 #X msg -181 346 5;
 #X obj -187 371 hsl 100 25 0.1 1e+09 1 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 7920 1;
+10 -262144 -1 -1 1682 1;
 #N canvas 20 383 344 123 machCalc 0;
 #X text 107 15 Speed of Sound (dry air 20 Degs C);
 #X obj 26 -14 vd~ varwind;
@@ -60,7 +60,7 @@
 #X obj 26 9 /~ 343.56;
 #X connect 1 0 3 0;
 #X connect 3 0 2 0;
-#X restore 93 -33 pd machCalc;
+#X restore -274 -89 pd machCalc;
 #X obj 422 -121 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1
 -1;
 #X msg 178 167 0;
@@ -68,7 +68,7 @@
 #X obj 249 -40 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 309 84 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4011 1;
+-1 -1 2005 1;
 #X floatatom 331 103 8 0 0 0 - - -;
 #X msg 215 67 4;
 #X text -8 353 No Of Sources;
@@ -150,24 +150,24 @@
 #X connect 14 0 7 0;
 #X connect 15 0 3 1;
 #X restore -164 103 pd windDirection;
-#X obj -11 148 snapshot~;
-#X floatatom -11 175 10 0 0 0 - - -;
-#X text -14 193 Wind Speed;
+#X obj -345 -23 snapshot~;
+#X floatatom -345 4 10 0 0 0 - - -;
+#X text -348 22 Wind Speed;
 #X obj -68 78 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 0 1;
-#X text 526 361 Source Rotation X;
+#X text 519 351 Source Rotation X;
 #X msg 199 110 4;
-#X obj 70 148 snapshot~;
-#X floatatom 70 175 10 0 0 0 - - -;
-#X text 67 193 Wind Direction;
+#X obj -264 -23 snapshot~;
+#X floatatom -264 4 10 0 0 0 - - -;
+#X text -267 22 Wind Direction;
 #X obj -163 -32 WindGenD1;
 #X msg -2 -69 20;
-#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 70 125 r myMet;
-#X obj -11 125 r myMet;
+#X obj -145 -135 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -145 -160 loadbang;
+#X obj -145 -89 s myMet;
+#X obj -264 -46 r myMet;
+#X obj -345 -46 r myMet;
 #X msg 158 222 45;
 #X msg 236 11 0.005;
 #X obj -316 338 s ELEV;
@@ -184,8 +184,7 @@
 #X obj -358 401 line \$1 50;
 #X obj -379 442 line \$1 50;
 #X obj -400 480 line \$1 50;
-#X obj 293 577 freqCalcCyl3No_D3Mach;
-#X obj 618 -47 metro 100;
+#X obj -145 -113 metro 100;
 #X msg 253 183 0;
 #X obj -150 158 s blust;
 #X obj 416 526 r blust;
@@ -197,13 +196,16 @@
 -1 -1 0 1;
 #X msg 251 101 12;
 #X msg 411 -27 0.001;
+#X msg 348 -16 0.006;
+#X obj -150 263 sig~;
+#X msg -114 247 16.6;
 #X msg -400 130 23 0.006 5 4 85 1e+07;
 #X msg -391 154 24 0.01 15 6 77 1e+07;
-#X msg -379 182 17 0.0015 10 3 -100 1e+07;
+#X msg -379 182 17 0.0015 10 2 -15 1e+07;
 #X msg -372 215 28 0.04 7 6 35 1e+07;
-#X msg 348 -16 0.006;
-#X obj -75 284 sig~;
-#X msg -39 268 16.6;
+#X obj 293 577 freqCalcCyl3No_D3Mach;
+#X msg 199 497 200;
+#X obj 199 531 vd~ varwind;
 #X connect 0 0 30 0;
 #X connect 2 0 58 0;
 #X connect 2 0 102 0;
@@ -213,16 +215,16 @@
 #X connect 5 0 6 0;
 #X connect 6 0 2 0;
 #X connect 7 0 8 0;
-#X connect 7 0 110 0;
+#X connect 7 0 128 1;
 #X connect 9 0 10 0;
-#X connect 9 0 110 5;
+#X connect 9 0 128 6;
 #X connect 12 0 13 0;
-#X connect 12 0 110 3;
+#X connect 12 0 128 4;
 #X connect 14 0 15 0;
 #X connect 14 0 76 0;
-#X connect 14 0 110 4;
+#X connect 14 0 128 5;
 #X connect 16 0 17 0;
-#X connect 16 0 110 2;
+#X connect 16 0 128 3;
 #X connect 22 0 24 0;
 #X connect 23 0 19 0;
 #X connect 23 1 20 0;
@@ -242,8 +244,9 @@
 #X connect 30 0 53 0;
 #X connect 30 0 54 0;
 #X connect 30 0 55 0;
+#X connect 30 0 129 0;
 #X connect 31 0 32 0;
-#X connect 31 0 110 1;
+#X connect 31 0 128 2;
 #X connect 33 0 31 0;
 #X connect 37 0 7 0;
 #X connect 38 0 31 0;
@@ -252,13 +255,13 @@
 #X connect 41 0 14 0;
 #X connect 42 0 9 0;
 #X connect 44 0 45 0;
-#X connect 44 0 110 6;
+#X connect 44 0 128 7;
 #X connect 46 0 44 0;
 #X connect 47 0 48 0;
-#X connect 47 0 110 7;
+#X connect 47 0 128 8;
 #X connect 49 0 47 0;
 #X connect 50 0 51 0;
-#X connect 50 0 110 8;
+#X connect 50 0 128 9;
 #X connect 52 0 50 0;
 #X connect 53 0 44 0;
 #X connect 54 0 47 0;
@@ -286,14 +289,14 @@
 #X connect 84 0 85 0;
 #X connect 87 0 3 0;
 #X connect 88 0 2 0;
-#X connect 89 0 111 0;
+#X connect 89 0 110 0;
 #X connect 90 0 89 0;
 #X connect 92 0 84 0;
 #X connect 93 0 78 0;
 #X connect 94 0 14 0;
 #X connect 95 0 7 0;
-#X connect 97 0 113 0;
-#X connect 97 0 115 0;
+#X connect 97 0 112 0;
+#X connect 97 0 114 0;
 #X connect 98 0 14 0;
 #X connect 99 0 7 0;
 #X connect 100 0 7 0;
@@ -306,16 +309,18 @@
 #X connect 107 0 65 0;
 #X connect 108 0 67 0;
 #X connect 109 0 69 0;
-#X connect 111 0 91 0;
-#X connect 112 0 14 0;
-#X connect 114 0 116 0;
-#X connect 116 0 117 0;
-#X connect 116 0 110 9;
-#X connect 120 0 16 0;
+#X connect 110 0 91 0;
+#X connect 111 0 14 0;
+#X connect 113 0 115 0;
+#X connect 115 0 116 0;
+#X connect 115 0 128 10;
+#X connect 119 0 16 0;
+#X connect 120 0 7 0;
 #X connect 121 0 7 0;
-#X connect 122 0 60 0;
-#X connect 123 0 60 0;
+#X connect 123 0 122 0;
 #X connect 124 0 60 0;
 #X connect 125 0 60 0;
-#X connect 126 0 7 0;
-#X connect 128 0 127 0;
+#X connect 126 0 60 0;
+#X connect 127 0 60 0;
+#X connect 129 0 130 0;
+#X connect 130 0 128 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scene demo/Draft2Aeolian/testBedD6.pd	Sun Mar 13 20:53:12 2016 +0000
@@ -0,0 +1,372 @@
+#N canvas 169 58 1119 756 10;
+#X obj -154 215 delwrite~ varwind 3000;
+#X obj -44 -36 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 1693 1;
+#X obj -153 8 *~ 1;
+#X obj -153 34 +~ 1;
+#X obj 45 -80 loadbang;
+#X msg 45 -60 5;
+#X obj -179 453 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj -116 453 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X text -119 362 Gain;
+#X obj -171 333 loadbang;
+#N canvas 555 179 313 396 opLevels 0;
+#X obj 79 184 dac~;
+#X obj 30 70 catch~ l;
+#X obj 128 70 catch~ r;
+#X obj 129 104 *~ 0.45;
+#X obj 30 104 *~ 0.45;
+#X obj 30 210 prvu~;
+#X obj 129 211 prvu~;
+#X obj 93 33 inlet;
+#X obj 30 239 outlet;
+#X obj 129 239 outlet;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 6 0;
+#X connect 3 0 0 1;
+#X connect 4 0 5 0;
+#X connect 4 0 0 0;
+#X connect 5 0 8 0;
+#X connect 6 0 9 0;
+#X connect 7 0 4 1;
+#X connect 7 0 3 1;
+#X restore -180 410 pd opLevels;
+#X msg -171 356 5;
+#X obj -177 381 hsl 100 25 0.1 1e+09 1 0 empty empty empty -2 -8 0
+10 -262144 -1 -1 7900 1;
+#N canvas 20 383 344 123 machCalc 0;
+#X text 107 15 Speed of Sound (dry air 20 Degs C);
+#X obj 26 -14 vd~ varwind;
+#X obj 26 33 s~ MY_MACH;
+#X obj 26 9 /~ 343.56;
+#X connect 1 0 3 0;
+#X connect 3 0 2 0;
+#X restore -264 -79 pd machCalc;
+#X obj 140 -114 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1
+-1;
+#X obj 140 -47 s SET_UP;
+#X floatatom -6 -13 5 0 0 0 - - -;
+#X obj -390 258 unpack f f f f f f;
+#X obj -285 304 s GAIN;
+#X obj -180 310 r GAIN;
+#X obj -327 390 s DIST;
+#X obj -348 432 s LEN;
+#X obj -369 471 s DIA;
+#X obj -390 509 s SPEED;
+#X obj -47 -60 r SPEED;
+#X floatatom -237 411 8 0 0 0 - - -;
+#N canvas 634 290 596 443 windDirection 0;
+#X obj 183 0 inlet~;
+#X obj 280 52 inlet;
+#X obj 280 86 sig~;
+#X obj 185 251 *~;
+#X obj 185 279 outlet~;
+#X obj 246 254 outlet~;
+#X obj 200 195 cos~;
+#X obj 200 135 +~;
+#X obj 200 71 lop~ 1;
+#X obj 246 194 *~ 360;
+#X obj 200 91 lop~ 1;
+#X obj 200 30 noise~;
+#X obj 200 51 lop~ 1;
+#X obj 200 157 /~ 360;
+#X obj 200 113 *~ 800;
+#X obj 200 221 abs~;
+#X connect 0 0 3 0;
+#X connect 1 0 2 0;
+#X connect 2 0 7 1;
+#X connect 3 0 4 0;
+#X connect 6 0 15 0;
+#X connect 7 0 13 0;
+#X connect 8 0 10 0;
+#X connect 9 0 5 0;
+#X connect 10 0 14 0;
+#X connect 11 0 12 0;
+#X connect 12 0 8 0;
+#X connect 13 0 6 0;
+#X connect 13 0 9 0;
+#X connect 14 0 7 0;
+#X connect 15 0 3 1;
+#X restore -154 113 pd windDirection;
+#X obj -335 -13 snapshot~;
+#X floatatom -335 14 10 0 0 0 - - -;
+#X text -338 32 Wind Speed;
+#X obj -58 88 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj -254 -13 snapshot~;
+#X floatatom -254 14 10 0 0 0 - - -;
+#X text -257 32 Wind Direction;
+#X obj -153 -22 WindGenD1;
+#X msg 8 -59 20;
+#X obj -135 -125 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -135 -150 loadbang;
+#X obj -135 -79 s myMet;
+#X obj -254 -36 r myMet;
+#X obj -335 -36 r myMet;
+#X obj -306 348 s ELEV;
+#X obj -140 144 TUCalc2;
+#X obj -84 -13 * 0.5;
+#X obj -47 -13 * 0.88;
+#X obj -285 285 line \$1 50;
+#X obj -306 326 line \$1 50;
+#X obj -327 368 line \$1 50;
+#X obj -348 411 line \$1 50;
+#X obj -369 452 line \$1 50;
+#X obj -390 490 line \$1 50;
+#X obj -135 -103 metro 100;
+#X obj -140 168 s blust;
+#X floatatom -89 166 0 0 0 0 - - -;
+#X obj -140 273 sig~;
+#X msg -104 257 16.6;
+#X msg -390 140 23 0.006 5 4 85 1e+07;
+#X msg -381 164 24 0.01 15 6 77 1e+07;
+#X msg -369 192 17 0.0015 10 2 -15 1e+07;
+#X msg -362 225 28 0.04 7 6 35 1e+07;
+#X obj 60 291 unpack f f f f f f;
+#X obj 165 337 s GAIN;
+#X obj 59 545 s SPEED;
+#X obj 165 318 line \$1 50;
+#X obj 144 359 line \$1 50;
+#X obj 122 404 line \$1 50;
+#X obj 101 447 line \$1 50;
+#X obj 80 488 line \$1 50;
+#X obj 59 526 line \$1 50;
+#X msg 60 173 23 0.006 5 4 85 1e+07;
+#X msg 69 197 24 0.01 15 6 77 1e+07;
+#X msg 81 225 17 0.0015 10 2 -15 1e+07;
+#X msg 88 258 28 0.04 7 6 35 1e+07;
+#X obj 144 381 s ELEV2;
+#X obj 122 426 s DIST2;
+#X obj 101 468 s LEN2;
+#X obj 80 507 s DIA2;
+#X obj 140 -72 uzi 20;
+#X msg 250 -110 0.009 2 4 45 0 0.2 200;
+#N canvas 437 135 988 799 oneTone 0;
+#X obj 266 -14 loadbang;
+#X obj 313 76 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 8214 1;
+#X floatatom 320 102 8 0 0 0 - - -;
+#X obj 381 352 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 10238 1;
+#X floatatom 411 381 5 0 0 0 - - -;
+#X text 451 79 Diameter;
+#X obj 354 234 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 7408 1;
+#X floatatom 382 263 5 0 0 0 - - -;
+#X obj 367 289 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 7937 1;
+#X floatatom 397 318 5 0 0 0 - - -;
+#X obj 340 177 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 7759 1;
+#X floatatom 356 206 5 0 0 0 - - -;
+#X text 529 353 Pan Value;
+#X msg 195 217 0;
+#X msg 152 335 0.5;
+#X obj 266 10 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 326 134 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 4011 1;
+#X floatatom 348 153 8 0 0 0 - - -;
+#X msg 232 117 4;
+#X text 458 118 Length;
+#X obj 311 57 r SET_UP;
+#X obj 381 112 r SET_UP;
+#X obj 415 154 r SET_UP;
+#X obj 439 203 r SET_UP;
+#X obj 449 263 r SET_UP;
+#X obj 455 321 r SET_UP;
+#X text 478 178 Obs Distance;
+#X obj 395 410 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6350 1;
+#X floatatom 432 439 5 0 0 0 - - -;
+#X obj 477 384 r SET_UP;
+#X obj 408 470 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6350 1;
+#X floatatom 427 497 5 0 0 0 - - -;
+#X obj 501 438 r SET_UP;
+#X obj 422 522 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6350 1;
+#X floatatom 433 544 5 0 0 0 - - -;
+#X obj 517 491 r SET_UP;
+#X msg 130 393 0;
+#X msg 110 447 0;
+#X msg 91 500 0;
+#X text 558 465 Source Rotation Y;
+#X text 574 518 Source Rotation Z;
+#X msg 298 29 0;
+#X text 506 290 Obs Elevation;
+#X text 493 234 Obs Azimuth;
+#X text 536 401 Source Rotation X;
+#X msg 216 160 4;
+#X msg 175 272 45;
+#X msg 253 61 0.005;
+#X obj 433 576 r blust;
+#X obj 433 599 * 100;
+#X floatatom 451 628 0 0 0 0 - - -;
+#X text 481 598 Free Stream Turbulence Intensity (%);
+#X obj 491 556 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj 310 627 freqCalcCyl3No_D3Mach;
+#X msg 216 547 200;
+#X obj 216 581 vd~ varwind;
+#X obj 742 -5 inlet;
+#X obj 407 42 r \$0-sourceDia;
+#X obj 742 169 s \$0-sourceDia;
+#X obj 761 146 s \$0-sourceLen;
+#X obj 453 99 r \$0-sourceLen;
+#X obj 513 259 r \$0-sourecElev;
+#X obj 527 323 r \$0-sourecPan;
+#X obj 470 154 r \$0-sourceDis;
+#X obj 781 124 s \$0-sourceDis;
+#X obj 800 103 s \$0-sourceElev;
+#X obj 839 62 s \$0-sourecPan;
+#X obj 506 210 r \$0-sourecAzim;
+#X obj 820 82 s \$0-sourecAzim;
+#X obj 119 547 r \$0-soureceDel;
+#X obj 742 17 unpack f f f f f f f;
+#X obj 859 40 s \$0-soureceDel;
+#X floatatom 119 581 0 0 0 0 - - -;
+#X connect 0 0 15 0;
+#X connect 1 0 2 0;
+#X connect 1 0 53 1;
+#X connect 3 0 4 0;
+#X connect 3 0 53 6;
+#X connect 6 0 7 0;
+#X connect 6 0 53 4;
+#X connect 8 0 9 0;
+#X connect 8 0 53 5;
+#X connect 10 0 11 0;
+#X connect 10 0 53 3;
+#X connect 13 0 6 0;
+#X connect 14 0 3 0;
+#X connect 15 0 41 0;
+#X connect 15 0 47 0;
+#X connect 15 0 45 0;
+#X connect 15 0 13 0;
+#X connect 15 0 46 0;
+#X connect 15 0 14 0;
+#X connect 15 0 18 0;
+#X connect 15 0 36 0;
+#X connect 15 0 37 0;
+#X connect 15 0 38 0;
+#X connect 15 0 54 0;
+#X connect 16 0 17 0;
+#X connect 16 0 53 2;
+#X connect 18 0 16 0;
+#X connect 20 0 1 0;
+#X connect 21 0 16 0;
+#X connect 22 0 10 0;
+#X connect 23 0 6 0;
+#X connect 24 0 8 0;
+#X connect 25 0 3 0;
+#X connect 27 0 28 0;
+#X connect 27 0 53 7;
+#X connect 29 0 27 0;
+#X connect 30 0 31 0;
+#X connect 30 0 53 8;
+#X connect 32 0 30 0;
+#X connect 33 0 34 0;
+#X connect 33 0 53 9;
+#X connect 35 0 33 0;
+#X connect 36 0 27 0;
+#X connect 37 0 30 0;
+#X connect 38 0 33 0;
+#X connect 45 0 10 0;
+#X connect 46 0 8 0;
+#X connect 47 0 1 0;
+#X connect 48 0 49 0;
+#X connect 49 0 50 0;
+#X connect 49 0 53 10;
+#X connect 54 0 55 0;
+#X connect 55 0 53 0;
+#X connect 56 0 70 0;
+#X connect 57 0 1 0;
+#X connect 60 0 16 0;
+#X connect 61 0 8 0;
+#X connect 62 0 3 0;
+#X connect 63 0 10 0;
+#X connect 67 0 6 0;
+#X connect 69 0 55 0;
+#X connect 69 0 72 0;
+#X connect 70 0 58 0;
+#X connect 70 1 59 0;
+#X connect 70 2 64 0;
+#X connect 70 3 65 0;
+#X connect 70 4 68 0;
+#X connect 70 5 66 0;
+#X connect 70 6 71 0;
+#X restore 423 -50 pd oneTone;
+#X msg 423 -75 0.04 7 6 35 15 0.8 1000;
+#X obj 250 -85 oneTone;
+#X connect 1 0 16 0;
+#X connect 1 0 43 0;
+#X connect 1 0 44 0;
+#X connect 2 0 3 0;
+#X connect 3 0 26 0;
+#X connect 4 0 5 0;
+#X connect 5 0 1 0;
+#X connect 9 0 11 0;
+#X connect 10 0 6 0;
+#X connect 10 1 7 0;
+#X connect 11 0 12 0;
+#X connect 12 0 10 0;
+#X connect 12 0 25 0;
+#X connect 14 0 77 0;
+#X connect 17 0 50 0;
+#X connect 17 1 49 0;
+#X connect 17 2 48 0;
+#X connect 17 3 47 0;
+#X connect 17 4 46 0;
+#X connect 17 5 45 0;
+#X connect 19 0 12 0;
+#X connect 24 0 1 0;
+#X connect 26 0 42 0;
+#X connect 26 0 27 0;
+#X connect 26 0 0 0;
+#X connect 26 1 31 0;
+#X connect 27 0 28 0;
+#X connect 30 0 26 1;
+#X connect 31 0 32 0;
+#X connect 34 0 2 0;
+#X connect 35 0 1 0;
+#X connect 36 0 51 0;
+#X connect 37 0 36 0;
+#X connect 39 0 31 0;
+#X connect 40 0 27 0;
+#X connect 42 0 52 0;
+#X connect 42 0 53 0;
+#X connect 43 0 2 1;
+#X connect 44 0 3 1;
+#X connect 45 0 18 0;
+#X connect 46 0 41 0;
+#X connect 47 0 20 0;
+#X connect 48 0 21 0;
+#X connect 49 0 22 0;
+#X connect 50 0 23 0;
+#X connect 51 0 38 0;
+#X connect 55 0 54 0;
+#X connect 56 0 17 0;
+#X connect 57 0 17 0;
+#X connect 58 0 17 0;
+#X connect 59 0 17 0;
+#X connect 60 0 68 0;
+#X connect 60 1 67 0;
+#X connect 60 2 66 0;
+#X connect 60 3 65 0;
+#X connect 60 4 64 0;
+#X connect 60 5 63 0;
+#X connect 63 0 61 0;
+#X connect 64 0 73 0;
+#X connect 65 0 74 0;
+#X connect 66 0 75 0;
+#X connect 67 0 76 0;
+#X connect 68 0 62 0;
+#X connect 69 0 60 0;
+#X connect 70 0 60 0;
+#X connect 71 0 60 0;
+#X connect 72 0 60 0;
+#X connect 77 0 15 0;
+#X connect 78 0 81 0;
+#X connect 80 0 79 0;
--- a/scene demo/freqCalcCyl3No_D3Mach.pd	Sat Mar 12 20:34:27 2016 +0000
+++ b/scene demo/freqCalcCyl3No_D3Mach.pd	Sun Mar 13 20:53:12 2016 +0000
@@ -17,7 +17,6 @@
 #X obj 776 330 r~ \$0-windSpeed;
 #X obj 709 151 r~ \$0-windSpeed;
 #X obj 709 396 s~ \$0-myFreq;
-#X obj 120 65 vd~ varwind;
 #X obj 1052 334 *~;
 #X obj 722 278 s~ \$0-myRey;
 #X obj 636 57 inlet;
@@ -425,7 +424,7 @@
 #X connect 120 0 48 1;
 #X connect 120 0 117 0;
 #X restore 313 307 pd GoldfreqGain;
-#N canvas 300 30 1006 797 GoldnoiseGain 0;
+#N canvas 300 30 1006 797 GoldnoiseGain 1;
 #X text -21037 364 Mass Density of Air \, squared;
 #X obj -20777 459 *;
 #X text -20777 412 Distance;
@@ -607,9 +606,9 @@
 #X obj -20587 262 /~ 360;
 #X obj -20624 306 *~;
 #X obj -20609 326 /~ 343.56;
-#X obj -20861 488 /~ 400;
 #X text -21131 486 Scale factor to bring in line with CFD calcs;
 #X text -20929 530 Sqrt(2*pi);
+#X obj -20861 488 /~ 1000;
 #X connect 1 0 61 0;
 #X connect 3 0 46 1;
 #X connect 4 0 53 0;
@@ -650,7 +649,7 @@
 #X connect 46 0 47 0;
 #X connect 47 0 20 0;
 #X connect 48 0 49 1;
-#X connect 49 0 69 0;
+#X connect 49 0 71 0;
 #X connect 50 0 37 0;
 #X connect 53 0 57 0;
 #X connect 55 0 54 0;
@@ -669,7 +668,7 @@
 #X connect 66 0 64 0;
 #X connect 67 0 27 0;
 #X connect 68 0 27 1;
-#X connect 69 0 50 0;
+#X connect 71 0 50 0;
 #X restore 294 552 pd GoldnoiseGain;
 #X text 285 599 Calculates the gain of the wake;
 #X obj 467 82 s \$0-azim;
@@ -1134,74 +1133,75 @@
 #X obj 1189 114 s \$0-Qval;
 #X obj 1143 237 r~ \$0-myFreq;
 #X floatatom 1143 288 0 0 0 0 - - -;
+#X obj 120 65 inlet~;
 #X connect 1 0 3 0;
-#X connect 2 0 20 0;
-#X connect 2 0 42 0;
+#X connect 2 0 19 0;
+#X connect 2 0 41 0;
 #X connect 3 0 2 0;
 #X connect 4 0 17 0;
 #X connect 5 0 4 0;
 #X connect 6 0 11 0;
-#X connect 6 0 43 0;
-#X connect 9 0 29 0;
-#X connect 9 0 48 0;
+#X connect 6 0 42 0;
+#X connect 9 0 28 0;
+#X connect 9 0 47 0;
 #X connect 12 0 3 1;
 #X connect 13 0 4 1;
 #X connect 15 0 5 1;
 #X connect 16 0 1 0;
-#X connect 18 0 14 0;
-#X connect 19 0 46 0;
-#X connect 21 0 94 0;
-#X connect 25 0 80 1;
-#X connect 26 0 80 4;
+#X connect 18 0 45 0;
+#X connect 20 0 93 0;
+#X connect 24 0 79 1;
+#X connect 25 0 79 4;
+#X connect 26 0 29 0;
+#X connect 26 0 81 0;
 #X connect 27 0 30 0;
 #X connect 27 0 82 0;
-#X connect 28 0 31 0;
-#X connect 28 0 83 0;
-#X connect 39 0 40 0;
-#X connect 39 0 47 0;
-#X connect 42 0 55 0;
-#X connect 42 0 5 0;
-#X connect 46 0 44 0;
-#X connect 46 1 45 0;
-#X connect 51 0 80 0;
-#X connect 52 0 80 3;
-#X connect 53 0 80 5;
-#X connect 57 0 19 0;
-#X connect 58 0 46 1;
+#X connect 38 0 39 0;
+#X connect 38 0 46 0;
+#X connect 41 0 54 0;
+#X connect 41 0 5 0;
+#X connect 45 0 43 0;
+#X connect 45 1 44 0;
+#X connect 50 0 79 0;
+#X connect 51 0 79 3;
+#X connect 52 0 79 5;
+#X connect 56 0 18 0;
+#X connect 57 0 45 1;
+#X connect 58 0 61 0;
+#X connect 58 0 64 0;
 #X connect 59 0 62 0;
 #X connect 59 0 65 0;
 #X connect 60 0 63 0;
 #X connect 60 0 66 0;
-#X connect 61 0 64 0;
-#X connect 61 0 67 0;
-#X connect 72 0 92 0;
-#X connect 73 0 72 0;
-#X connect 74 0 79 1;
-#X connect 75 0 79 3;
-#X connect 76 0 79 0;
-#X connect 77 0 79 2;
-#X connect 78 0 79 5;
-#X connect 79 0 50 0;
-#X connect 79 1 49 0;
-#X connect 80 0 54 0;
-#X connect 84 0 79 6;
+#X connect 71 0 91 0;
+#X connect 72 0 71 0;
+#X connect 73 0 78 1;
+#X connect 74 0 78 3;
+#X connect 75 0 78 0;
+#X connect 76 0 78 2;
+#X connect 77 0 78 5;
+#X connect 78 0 49 0;
+#X connect 78 1 48 0;
+#X connect 79 0 53 0;
+#X connect 83 0 78 6;
+#X connect 84 0 78 7;
 #X connect 85 0 79 7;
-#X connect 86 0 80 7;
-#X connect 87 0 80 6;
-#X connect 88 0 90 0;
-#X connect 89 0 88 0;
-#X connect 91 0 79 4;
-#X connect 92 0 19 1;
-#X connect 93 0 80 2;
-#X connect 94 0 95 0;
-#X connect 95 0 22 0;
-#X connect 95 0 56 0;
-#X connect 97 0 98 0;
-#X connect 99 0 73 0;
-#X connect 101 0 102 0;
-#X connect 102 0 72 1;
-#X connect 102 0 92 1;
-#X connect 102 0 107 0;
-#X connect 103 0 105 0;
-#X connect 104 0 103 0;
-#X connect 106 0 102 0;
+#X connect 86 0 79 6;
+#X connect 87 0 89 0;
+#X connect 88 0 87 0;
+#X connect 90 0 78 4;
+#X connect 91 0 18 1;
+#X connect 92 0 79 2;
+#X connect 93 0 94 0;
+#X connect 94 0 21 0;
+#X connect 94 0 55 0;
+#X connect 96 0 97 0;
+#X connect 98 0 72 0;
+#X connect 100 0 101 0;
+#X connect 101 0 71 1;
+#X connect 101 0 91 1;
+#X connect 101 0 106 0;
+#X connect 102 0 104 0;
+#X connect 103 0 102 0;
+#X connect 105 0 101 0;
+#X connect 107 0 14 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scene demo/oneTone.pd	Sun Mar 13 20:53:12 2016 +0000
@@ -0,0 +1,180 @@
+#N canvas 0 22 1088 715 10;
+#X obj 276 -4 loadbang;
+#X obj 323 86 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6981 1;
+#X floatatom 330 112 8 0 0 0 - - -;
+#X obj 391 362 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 11534 1;
+#X floatatom 421 391 5 0 0 0 - - -;
+#X text 461 89 Diameter;
+#X obj 364 244 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 6562 1;
+#X floatatom 392 273 5 0 0 0 - - -;
+#X obj 377 299 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 7937 1;
+#X floatatom 407 328 5 0 0 0 - - -;
+#X obj 350 187 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 8877 1;
+#X floatatom 366 216 5 0 0 0 - - -;
+#X text 539 363 Pan Value;
+#X msg 205 227 0;
+#X msg 162 345 0.5;
+#X obj 276 20 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 336 144 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 1337 1;
+#X floatatom 358 163 8 0 0 0 - - -;
+#X msg 242 127 4;
+#X text 468 128 Length;
+#X obj 321 67 r SET_UP;
+#X obj 391 122 r SET_UP;
+#X obj 425 164 r SET_UP;
+#X obj 449 213 r SET_UP;
+#X obj 459 273 r SET_UP;
+#X obj 465 331 r SET_UP;
+#X text 488 188 Obs Distance;
+#X obj 405 420 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6350 1;
+#X floatatom 442 449 5 0 0 0 - - -;
+#X obj 487 394 r SET_UP;
+#X obj 418 480 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6350 1;
+#X floatatom 437 507 5 0 0 0 - - -;
+#X obj 511 448 r SET_UP;
+#X obj 432 532 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6350 1;
+#X floatatom 443 554 5 0 0 0 - - -;
+#X obj 527 501 r SET_UP;
+#X msg 140 403 0;
+#X msg 120 457 0;
+#X msg 101 510 0;
+#X text 568 475 Source Rotation Y;
+#X text 584 528 Source Rotation Z;
+#X msg 308 39 0;
+#X text 516 300 Obs Elevation;
+#X text 503 244 Obs Azimuth;
+#X text 546 411 Source Rotation X;
+#X msg 226 170 4;
+#X msg 185 282 45;
+#X msg 263 71 0.005;
+#X obj 467 602 r blust;
+#X obj 459 620 * 100;
+#X floatatom 461 638 0 0 0 0 - - -;
+#X text 491 608 Free Stream Turbulence Intensity (%);
+#X obj 501 566 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X msg 226 557 200;
+#X obj 226 591 vd~ varwind;
+#X obj 752 5 inlet;
+#X obj 417 52 r \$0-sourceDia;
+#X obj 752 168 s \$0-sourceDia;
+#X obj 773 144 s \$0-sourceLen;
+#X obj 463 109 r \$0-sourceLen;
+#X obj 523 269 r \$0-sourecElev;
+#X obj 537 333 r \$0-sourecPan;
+#X obj 480 164 r \$0-sourceDis;
+#X obj 794 120 s \$0-sourceDis;
+#X obj 815 97 s \$0-sourceElev;
+#X obj 857 53 s \$0-sourecPan;
+#X obj 516 220 r \$0-sourecAzim;
+#X obj 836 76 s \$0-sourecAzim;
+#X obj 129 557 r \$0-soureceDel;
+#X floatatom 129 591 0 0 0 0 - - -;
+#X obj 320 637 freqCalcCyl3No_D3Mach;
+#X obj 918 240 r \$0-sourecPan;
+#X obj 903 216 r \$0-sourceDis;
+#X obj 918 284 cos;
+#X obj 903 307 *;
+#X obj 918 332 vd~ varwind;
+#X obj 918 355 snapshot~;
+#X obj 992 332 r myMet;
+#X obj 918 375 t f b;
+#X obj 903 398 /;
+#X obj 903 443 swap 1500;
+#X obj 903 467 -;
+#X obj 903 419 * 1000;
+#X obj 843 517 s \$0-soureceDel;
+#X obj 752 27 unpack f f f f f f;
+#X obj 918 260 * 3.14159;
+#X connect 0 0 15 0;
+#X connect 1 0 2 0;
+#X connect 1 0 70 1;
+#X connect 3 0 4 0;
+#X connect 3 0 70 6;
+#X connect 6 0 7 0;
+#X connect 6 0 70 4;
+#X connect 8 0 9 0;
+#X connect 8 0 70 5;
+#X connect 10 0 11 0;
+#X connect 10 0 70 3;
+#X connect 13 0 6 0;
+#X connect 14 0 3 0;
+#X connect 15 0 41 0;
+#X connect 15 0 47 0;
+#X connect 15 0 45 0;
+#X connect 15 0 13 0;
+#X connect 15 0 46 0;
+#X connect 15 0 14 0;
+#X connect 15 0 18 0;
+#X connect 15 0 36 0;
+#X connect 15 0 37 0;
+#X connect 15 0 38 0;
+#X connect 15 0 53 0;
+#X connect 16 0 17 0;
+#X connect 16 0 70 2;
+#X connect 18 0 16 0;
+#X connect 20 0 1 0;
+#X connect 21 0 16 0;
+#X connect 22 0 10 0;
+#X connect 23 0 6 0;
+#X connect 24 0 8 0;
+#X connect 25 0 3 0;
+#X connect 27 0 28 0;
+#X connect 27 0 70 7;
+#X connect 29 0 27 0;
+#X connect 30 0 31 0;
+#X connect 30 0 70 8;
+#X connect 32 0 30 0;
+#X connect 33 0 34 0;
+#X connect 33 0 70 9;
+#X connect 35 0 33 0;
+#X connect 36 0 27 0;
+#X connect 37 0 30 0;
+#X connect 38 0 33 0;
+#X connect 45 0 10 0;
+#X connect 46 0 8 0;
+#X connect 47 0 1 0;
+#X connect 48 0 49 0;
+#X connect 49 0 50 0;
+#X connect 53 0 54 0;
+#X connect 54 0 70 0;
+#X connect 55 0 84 0;
+#X connect 56 0 1 0;
+#X connect 59 0 16 0;
+#X connect 60 0 8 0;
+#X connect 61 0 3 0;
+#X connect 62 0 10 0;
+#X connect 66 0 6 0;
+#X connect 68 0 54 0;
+#X connect 68 0 69 0;
+#X connect 71 0 85 0;
+#X connect 72 0 74 0;
+#X connect 73 0 74 1;
+#X connect 74 0 79 0;
+#X connect 75 0 76 0;
+#X connect 76 0 78 0;
+#X connect 77 0 76 0;
+#X connect 78 0 79 1;
+#X connect 78 1 79 0;
+#X connect 79 0 82 0;
+#X connect 80 0 81 0;
+#X connect 80 1 81 1;
+#X connect 81 0 83 0;
+#X connect 82 0 80 0;
+#X connect 84 0 57 0;
+#X connect 84 1 58 0;
+#X connect 84 2 63 0;
+#X connect 84 3 64 0;
+#X connect 84 4 67 0;
+#X connect 84 5 65 0;
+#X connect 85 0 73 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scene demo/testBedD6.pd	Sun Mar 13 20:53:12 2016 +0000
@@ -0,0 +1,181 @@
+#N canvas 84 79 1119 756 10;
+#X obj -154 215 delwrite~ varwind 3000;
+#X obj -44 -36 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2193 1;
+#X obj -153 8 *~ 1;
+#X obj -153 34 +~ 1;
+#X obj 45 -80 loadbang;
+#X msg 45 -60 5;
+#X obj -179 453 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj -116 453 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X text -119 362 Gain;
+#X obj -171 333 loadbang;
+#N canvas 555 179 313 396 opLevels 0;
+#X obj 79 184 dac~;
+#X obj 30 70 catch~ l;
+#X obj 128 70 catch~ r;
+#X obj 129 104 *~ 0.45;
+#X obj 30 104 *~ 0.45;
+#X obj 30 210 prvu~;
+#X obj 129 211 prvu~;
+#X obj 93 33 inlet;
+#X obj 30 239 outlet;
+#X obj 129 239 outlet;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 6 0;
+#X connect 3 0 0 1;
+#X connect 4 0 5 0;
+#X connect 4 0 0 0;
+#X connect 5 0 8 0;
+#X connect 6 0 9 0;
+#X connect 7 0 4 1;
+#X connect 7 0 3 1;
+#X restore -180 410 pd opLevels;
+#X msg -171 356 5;
+#X obj -177 381 hsl 100 25 0.1 1e+09 1 0 empty empty empty -2 -8 0
+10 -262144 -1 -1 7482 1;
+#N canvas 20 383 344 123 machCalc 0;
+#X text 107 15 Speed of Sound (dry air 20 Degs C);
+#X obj 26 -14 vd~ varwind;
+#X obj 26 33 s~ MY_MACH;
+#X obj 26 9 /~ 343.56;
+#X connect 1 0 3 0;
+#X connect 3 0 2 0;
+#X restore -264 -79 pd machCalc;
+#X obj 140 -114 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1
+-1;
+#X obj 140 -47 s SET_UP;
+#X floatatom -6 -13 5 0 0 0 - - -;
+#X obj -180 310 r GAIN;
+#X obj -47 -60 r SPEED;
+#X floatatom -237 411 8 0 0 0 - - -;
+#N canvas 634 290 596 443 windDirection 0;
+#X obj 183 0 inlet~;
+#X obj 280 52 inlet;
+#X obj 280 86 sig~;
+#X obj 185 251 *~;
+#X obj 185 279 outlet~;
+#X obj 246 254 outlet~;
+#X obj 200 195 cos~;
+#X obj 200 135 +~;
+#X obj 200 71 lop~ 1;
+#X obj 246 194 *~ 360;
+#X obj 200 91 lop~ 1;
+#X obj 200 30 noise~;
+#X obj 200 51 lop~ 1;
+#X obj 200 157 /~ 360;
+#X obj 200 113 *~ 800;
+#X obj 200 221 abs~;
+#X connect 0 0 3 0;
+#X connect 1 0 2 0;
+#X connect 2 0 7 1;
+#X connect 3 0 4 0;
+#X connect 6 0 15 0;
+#X connect 7 0 13 0;
+#X connect 8 0 10 0;
+#X connect 9 0 5 0;
+#X connect 10 0 14 0;
+#X connect 11 0 12 0;
+#X connect 12 0 8 0;
+#X connect 13 0 6 0;
+#X connect 13 0 9 0;
+#X connect 14 0 7 0;
+#X connect 15 0 3 1;
+#X restore -365 120 pd windDirection;
+#X obj -335 -13 snapshot~;
+#X floatatom -335 14 10 0 0 0 - - -;
+#X text -338 32 Wind Speed;
+#X obj -343 76 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj -254 -13 snapshot~;
+#X floatatom -254 14 10 0 0 0 - - -;
+#X text -257 32 Wind Direction;
+#X obj -153 -22 WindGenD1;
+#X msg 8 -59 20;
+#X obj -135 -125 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -135 -150 loadbang;
+#X obj -135 -79 s myMet;
+#X obj -254 -36 r myMet;
+#X obj -335 -36 r myMet;
+#X obj -351 151 TUCalc2;
+#X obj -84 -13 * 0.5;
+#X obj -47 -13 * 0.88;
+#X obj -135 -103 metro 100;
+#X obj -351 175 s blust;
+#X floatatom -300 173 0 0 0 0 - - -;
+#X obj -140 273 sig~;
+#X msg -104 257 16.6;
+#X obj 140 -72 uzi 20;
+#X obj 248 19 oneTone;
+#X msg 248 -6 0.023 3 4 20 3 0.9;
+#X msg 408 -110 0.04 7 6 85 20 0.2;
+#X msg 408 -10 0.05 1 9 40 0 0.1;
+#X msg 406 45 0.015 7 11 75 28 0.35;
+#X obj 250 -85 oneTone;
+#X obj 408 -85 oneTone;
+#X obj 249 -33 oneTone;
+#X obj 408 -36 oneTone;
+#X obj 406 70 oneTone;
+#X obj 248 70 oneTone;
+#X obj 247 122 oneTone;
+#X obj 406 119 oneTone;
+#X obj 408 15 oneTone;
+#X msg 247 97 0.008 0.4 15 60 9 0.8;
+#X msg 406 94 0.0085 0.4 15 60 10 0.82;
+#X msg 250 -110 0.012 0.8 4 45 0 0.1;
+#X msg 249 -58 0.006 0.6 17 38 9 0.4;
+#X msg 408 -61 0.005 0.1 17 38 10 0.42;
+#X msg 248 45 0.001 0.4 20 90 0 0.6;
+#X obj 247 182 oneTone;
+#X obj 406 179 oneTone;
+#X msg 406 154 0.085 4 9 45 10 0.5;
+#X msg 247 157 0.08 4 9 68 9 0.55;
+#X connect 1 0 16 0;
+#X connect 1 0 36 0;
+#X connect 1 0 37 0;
+#X connect 2 0 3 0;
+#X connect 3 0 0 0;
+#X connect 3 0 21 0;
+#X connect 4 0 5 0;
+#X connect 5 0 1 0;
+#X connect 9 0 11 0;
+#X connect 10 0 6 0;
+#X connect 10 1 7 0;
+#X connect 11 0 12 0;
+#X connect 12 0 10 0;
+#X connect 12 0 19 0;
+#X connect 14 0 43 0;
+#X connect 17 0 12 0;
+#X connect 18 0 1 0;
+#X connect 20 0 35 0;
+#X connect 20 1 25 0;
+#X connect 21 0 22 0;
+#X connect 24 0 20 1;
+#X connect 25 0 26 0;
+#X connect 28 0 2 0;
+#X connect 29 0 1 0;
+#X connect 30 0 38 0;
+#X connect 31 0 30 0;
+#X connect 33 0 25 0;
+#X connect 34 0 21 0;
+#X connect 35 0 39 0;
+#X connect 35 0 40 0;
+#X connect 36 0 2 1;
+#X connect 37 0 3 1;
+#X connect 38 0 32 0;
+#X connect 42 0 41 0;
+#X connect 43 0 15 0;
+#X connect 45 0 44 0;
+#X connect 46 0 50 0;
+#X connect 47 0 57 0;
+#X connect 48 0 53 0;
+#X connect 58 0 55 0;
+#X connect 59 0 56 0;
+#X connect 60 0 49 0;
+#X connect 61 0 51 0;
+#X connect 62 0 52 0;
+#X connect 63 0 54 0;
+#X connect 66 0 65 0;
+#X connect 67 0 64 0;