changeset 115:61d267c71a18

freqCalcCyl2_D4Mach added. This includes the effect of mach number on the angle of sound radiated from the dipole. This is limited up to 0.3M. angleCalc converted to an object for both control and audio.
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Fri, 31 Jul 2015 07:15:40 +0100
parents e57832817def
children 3f2588a64b25 622e6692b214
files .DS_Store scene demo/angleCalc.pd scene demo/angleCalc~.pd scene demo/freqCalcCyl2_D4Mach.pd scene demo/newStrou.pd scene demo/testBed.pd
diffstat 6 files changed, 833 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
Binary file .DS_Store has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scene demo/angleCalc.pd	Fri Jul 31 07:15:40 2015 +0100
@@ -0,0 +1,46 @@
+#N canvas 373 91 541 315 10;
+#X obj 275 46 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X text 255 27 Elevation Angle;
+#X obj 204 68 / 360;
+#X obj 204 90 * 6.28319;
+#X floatatom 79 166 8 0 0 0 - - -;
+#X obj 138 69 / 360;
+#X obj 138 91 * 6.28319;
+#X floatatom 23 72 5 0 0 0 - - -;
+#X floatatom 272 70 5 0 0 0 - - -;
+#X floatatom 166 207 5 0 0 0 - - -;
+#X floatatom 251 239 5 0 0 0 - - -;
+#X obj 138 115 cos;
+#X obj 204 121 cos;
+#X obj 204 185 *;
+#X obj 138 139 t f b;
+#X obj 136 164 delay 9;
+#X obj 204 239 outlet;
+#X obj 204 40 inlet;
+#X obj 139 42 inlet;
+#X obj 26 46 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X text 30 28 Azimuth Angle;
+#X text 278 129 Create an audio version of this patch;
+#X obj 204 210 arccos;
+#X connect 0 0 8 0;
+#X connect 0 0 2 0;
+#X connect 2 0 3 0;
+#X connect 3 0 12 0;
+#X connect 5 0 6 0;
+#X connect 6 0 11 0;
+#X connect 11 0 14 0;
+#X connect 12 0 13 0;
+#X connect 13 0 9 0;
+#X connect 13 0 22 0;
+#X connect 14 0 13 1;
+#X connect 14 0 4 0;
+#X connect 14 1 15 0;
+#X connect 15 0 13 0;
+#X connect 17 0 2 0;
+#X connect 18 0 5 0;
+#X connect 19 0 7 0;
+#X connect 19 0 5 0;
+#X connect 22 0 16 0;
+#X connect 22 0 10 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scene demo/angleCalc~.pd	Fri Jul 31 07:15:40 2015 +0100
@@ -0,0 +1,92 @@
+#N canvas 741 141 677 520 10;
+#X obj 463 76 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 5000 1;
+#X text 462 57 Elevation Angle;
+#X floatatom 152 121 8 0 0 0 - - -;
+#X floatatom 499 102 5 0 0 0 - - -;
+#X obj 175 95 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 5300 1;
+#X text 179 77 Azimuth Angle;
+#X obj 250 122 inlet~;
+#X obj 414 102 inlet~;
+#X obj 250 144 /~ 360;
+#X obj 414 125 /~ 360;
+#X obj 415 237 cos~;
+#X obj 313 320 *~;
+#X obj 313 345 arccos~;
+#X obj 313 374 outlet~;
+#X obj 215 121 sig~;
+#X obj 460 102 sig~;
+#X obj 368 313 loadbang;
+#X obj 368 334 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 368 352 metro 10;
+#X obj 368 373 snapshot~;
+#X floatatom 368 393 8 0 0 0 - - -;
+#X obj 88 112 loadbang;
+#X obj 88 133 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 88 151 metro 10;
+#X obj 88 172 snapshot~;
+#X floatatom 49 193 5 0 0 0 - - -;
+#X obj 88 198 > 0;
+#X floatatom 92 236 5 0 0 0 - - -;
+#X obj 249 210 spigot~;
+#X obj 225 270 -~;
+#X obj 240 247 r~ MY_MACH;
+#X obj 327 232 r~ MY_MACH;
+#X obj 116 291 loadbang;
+#X obj 116 312 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 116 330 metro 10;
+#X obj 116 351 snapshot~;
+#X floatatom 116 371 5 0 0 0 - - -;
+#X obj 470 303 loadbang;
+#X obj 470 324 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 470 342 metro 10;
+#X obj 470 363 snapshot~;
+#X floatatom 470 383 8 0 0 0 - - -;
+#X obj 250 180 cos~;
+#X obj 313 267 +~;
+#X connect 0 0 3 0;
+#X connect 0 0 15 0;
+#X connect 4 0 2 0;
+#X connect 4 0 14 0;
+#X connect 7 0 9 0;
+#X connect 8 0 24 0;
+#X connect 8 0 42 0;
+#X connect 9 0 10 0;
+#X connect 10 0 11 1;
+#X connect 11 0 12 0;
+#X connect 11 0 35 0;
+#X connect 12 0 13 0;
+#X connect 12 0 19 0;
+#X connect 14 0 8 0;
+#X connect 16 0 17 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 21 0 22 0;
+#X connect 22 0 23 0;
+#X connect 23 0 24 0;
+#X connect 24 0 25 0;
+#X connect 24 0 26 0;
+#X connect 26 0 27 0;
+#X connect 26 0 28 1;
+#X connect 28 0 29 0;
+#X connect 28 1 43 0;
+#X connect 29 0 11 0;
+#X connect 30 0 29 1;
+#X connect 31 0 43 1;
+#X connect 31 0 40 0;
+#X connect 32 0 33 0;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 35 0 36 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 42 0 28 0;
+#X connect 43 0 11 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scene demo/freqCalcCyl2_D4Mach.pd	Fri Jul 31 07:15:40 2015 +0100
@@ -0,0 +1,623 @@
+#N canvas 0 22 1426 817 10;
+#X text 734 -8 Mass Density of Air;
+#X text 135 314 Frequency (Hz);
+#X obj 841 386 throw~ l;
+#X obj 868 363 throw~ r;
+#X obj 856 237 osc~;
+#X obj 856 -7 *~ 1.225;
+#X obj 856 68 /~ 1.81e-05;
+#X obj 856 23 *~ 1;
+#X obj 856 186 /~ 1;
+#X floatatom 231 292 10 0 0 0 - - -;
+#X obj 856 162 *~;
+#X obj 856 211 clip~ 0 20000;
+#X obj 242 -61 inlet;
+#X text 889 112 Reynolds Number;
+#X text 741 176 Strouhal Number;
+#X obj 407 -63 inlet;
+#X obj 856 267 *~;
+#X text 886 48 Viscosity;
+#X obj 641 208 *~ 2;
+#X obj 641 235 osc~;
+#X obj 641 257 *~;
+#X obj 841 296 +~;
+#X obj 249 -38 s \$0-diameter;
+#X obj 917 -8 r \$0-diameter;
+#X obj 924 167 r \$0-diameter;
+#X obj 159 1 s~ \$0-windSpeed;
+#X obj 331 40 r~ \$0-windSpeed;
+#X obj 923 144 r~ \$0-windSpeed;
+#X obj 856 -35 r~ \$0-windSpeed;
+#X obj 777 236 s~ \$0-myFreq;
+#X obj 641 181 r~ \$0-myFreq;
+#X obj 159 -41 sig~;
+#X obj 159 -19 vd~ varwind;
+#X obj 159 -65 inlet;
+#X obj 1089 42 r~ \$0-myFreq;
+#X obj 1055 -8 noise~;
+#X obj 1132 153 *~;
+#X obj 153 114 snapshot~;
+#X obj 153 89 metro 100;
+#X obj 153 67 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 153 140 10 0 0 0 - - -;
+#X obj 153 41 loadbang;
+#X obj 67 89 r~ \$0-myRey;
+#X obj 869 92 s~ \$0-myRey;
+#X obj 1270 43 snapshot~;
+#X floatatom 1270 69 10 0 0 0 - - -;
+#X obj 1270 -30 loadbang;
+#X obj 1270 -5 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 1181 -59 r~ \$0-myRey;
+#X obj 1097 394 r~ \$0-myFreq;
+#X obj 1063 323 noise~;
+#X obj 1140 491 *~;
+#X obj 1278 403 snapshot~;
+#X floatatom 1278 429 10 0 0 0 - - -;
+#X obj 1278 330 loadbang;
+#X obj 1278 355 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 1189 301 r~ \$0-myRey;
+#X obj 1097 420 *~ 2;
+#X text 138 162 Reynolds Number;
+#X obj 1055 85 vcf~ 1000 10;
+#X obj 1063 445 vcf~ 1000 10;
+#X obj 841 339 fcpan;
+#X obj 1147 126 *~ 1;
+#X obj 1155 466 *~ 1;
+#X obj 1189 376 clip~ 2 400;
+#X obj 1181 16 clip~ 2 400;
+#X obj 1189 325 *~ -0.003;
+#X obj 1181 -35 *~ -0.003;
+#X obj 1270 18 metro 10;
+#X obj 1278 378 metro 10;
+#X obj 655 -67 inlet;
+#X floatatom 600 2 8 0 0 0 - - -;
+#X obj 655 -43 max 0.1;
+#X obj 655 -20 min 0.9;
+#X text 1191 479 Drag Dipole spectrum calculation;
+#X text 1186 143 Lift Dipole spectrum calculation;
+#X text 577 107 Calculates the frequency;
+#X text 577 120 based on the physics of;
+#X text 578 133 the object and environment;
+#X obj 335 322 r~ \$0-windSpeed;
+#X obj 154 436 snapshot~;
+#X obj 154 411 metro 100;
+#X obj 154 389 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 154 462 10 0 0 0 - - -;
+#X obj 154 363 loadbang;
+#N canvas 665 72 843 731 noiseGain 0;
+#X text -21205 129 Mass Density of Air \, squared;
+#X text -20765 142 Speed of Sound to power 2;
+#X obj -21070 29 *~;
+#X obj -21022 70 *~;
+#X obj -21022 104 *~ 1;
+#X obj -21022 132 *~ 1.50063;
+#X obj -20767 96 *;
+#X obj -20767 119 * 118033;
+#X obj -21022 259 /~ 1;
+#X obj -21022 532 *~ 0.27;
+#X text -20767 49 Distance;
+#X obj -20916 518 *~ 0.27;
+#X text -20937 606 Calculates Drag Dipole gain;
+#X text -21198 525 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 -21022 32 pd pow8;
+#X obj -21070 7 inlet~;
+#X obj -21022 7 inlet~;
+#X obj -20989 55 inlet;
+#X obj -20767 70 inlet;
+#X obj -21022 575 outlet~;
+#X obj -20916 568 outlet~;
+#X text -20961 26 Gain proportional to windspeed to power 8 for spectrum
+;
+#X text -20981 74 Diameter;
+#X obj -20991 163 inlet;
+#X obj -20991 187 *;
+#X obj -21022 209 *~ 1;
+#X text -20950 162 Length;
+#X obj -21022 554 *~ 0.02;
+#X obj -20916 543 *~ 0.002;
+#X obj -21005 288 s~ \$0-nGain;
+#X obj -20886 471 r~ \$0-nGain;
+#X text -20917 291 Azimuth;
+#X text -20856 253 Elevation;
+#X obj -20916 308 inlet;
+#X obj -20859 269 inlet;
+#X obj -20916 350 angleCalc~;
+#X obj -20916 331 sig~;
+#X obj -20859 331 sig~;
+#X obj -20859 311 spigot;
+#X text -20757 275 End Source;
+#X text -20756 294 Mid Source;
+#X obj -21007 419 +~ 90;
+#X obj -21007 440 /~ 360;
+#X obj -21007 462 cos~;
+#X obj -21022 507 *~;
+#X obj -21007 486 *~;
+#X obj -20916 426 /~ 360;
+#X obj -20916 447 cos~;
+#X obj -20916 471 *~;
+#X obj -20916 494 *~;
+#X obj -20807 358 loadbang;
+#X obj -20807 379 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -20807 397 metro 10;
+#X obj -20807 418 snapshot~;
+#X floatatom -20807 438 5 0 0 0 - - -;
+#X obj -21107 416 loadbang;
+#X obj -21107 437 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -21107 455 metro 10;
+#X obj -21107 476 snapshot~;
+#X floatatom -21107 496 5 0 0 0 - - -;
+#X obj -20771 448 loadbang;
+#X obj -20771 469 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -20771 487 metro 10;
+#X obj -20771 508 snapshot~;
+#X floatatom -20771 528 5 0 0 0 - - -;
+#X msg -20825 335 0;
+#X obj -20788 316 t f b;
+#X msg -20788 296 0;
+#X msg -20788 276 1;
+#X connect 2 0 3 1;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 5 0 25 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 1;
+#X connect 8 0 29 0;
+#X connect 8 0 44 0;
+#X connect 9 0 27 0;
+#X connect 11 0 28 0;
+#X connect 14 0 3 0;
+#X connect 15 0 2 0;
+#X connect 15 0 2 1;
+#X connect 16 0 14 0;
+#X connect 17 0 4 1;
+#X connect 18 0 6 0;
+#X connect 18 0 6 1;
+#X connect 23 0 24 0;
+#X connect 23 0 24 1;
+#X connect 24 0 25 1;
+#X connect 25 0 8 0;
+#X connect 27 0 19 0;
+#X connect 28 0 20 0;
+#X connect 30 0 49 1;
+#X connect 33 0 36 0;
+#X connect 34 0 38 0;
+#X connect 35 0 41 0;
+#X connect 35 0 46 0;
+#X connect 35 0 53 0;
+#X connect 36 0 35 0;
+#X connect 37 0 35 1;
+#X connect 38 0 37 0;
+#X connect 41 0 42 0;
+#X connect 42 0 43 0;
+#X connect 43 0 45 0;
+#X connect 43 0 45 1;
+#X connect 44 0 9 0;
+#X connect 45 0 44 1;
+#X connect 45 0 58 0;
+#X connect 46 0 47 0;
+#X connect 47 0 48 0;
+#X connect 47 0 48 1;
+#X connect 48 0 49 0;
+#X connect 48 0 63 0;
+#X connect 49 0 11 0;
+#X connect 50 0 51 0;
+#X connect 51 0 52 0;
+#X connect 52 0 53 0;
+#X connect 53 0 54 0;
+#X connect 55 0 56 0;
+#X connect 56 0 57 0;
+#X connect 57 0 58 0;
+#X connect 58 0 59 0;
+#X connect 60 0 61 0;
+#X connect 61 0 62 0;
+#X connect 62 0 63 0;
+#X connect 63 0 64 0;
+#X connect 65 0 37 0;
+#X connect 66 0 38 1;
+#X connect 66 1 65 0;
+#X connect 67 0 66 0;
+#X connect 68 0 38 1;
+#X restore 324 457 pd noiseGain;
+#X obj 358 367 r \$0-diameter;
+#N canvas 607 75 743 677 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 250 156 inlet;
+#X obj 250 180 *;
+#X text 288 151 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 337 angleCalc~;
+#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 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 27 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 1;
+#X connect 9 0 29 0;
+#X connect 9 0 52 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 25 0;
+#X connect 24 0 25 1;
+#X connect 25 0 27 1;
+#X connect 27 0 9 0;
+#X connect 30 0 56 1;
+#X connect 33 0 36 0;
+#X connect 34 0 38 0;
+#X connect 35 0 48 0;
+#X connect 35 0 53 0;
+#X connect 35 0 57 0;
+#X connect 36 0 35 0;
+#X connect 37 0 35 1;
+#X connect 38 0 37 0;
+#X connect 41 0 42 0;
+#X connect 42 0 43 0;
+#X connect 43 0 57 0;
+#X connect 44 0 37 0;
+#X connect 45 0 38 1;
+#X connect 45 1 44 0;
+#X connect 46 0 45 0;
+#X connect 47 0 38 1;
+#X connect 48 0 49 0;
+#X connect 49 0 50 0;
+#X connect 50 0 51 0;
+#X connect 50 0 51 1;
+#X connect 51 0 52 1;
+#X connect 51 0 67 0;
+#X connect 52 0 10 0;
+#X connect 53 0 54 0;
+#X connect 54 0 55 0;
+#X connect 54 0 55 1;
+#X connect 55 0 56 0;
+#X connect 55 0 62 0;
+#X connect 56 0 12 0;
+#X connect 57 0 58 0;
+#X connect 59 0 60 0;
+#X connect 60 0 61 0;
+#X connect 61 0 62 0;
+#X connect 62 0 63 0;
+#X connect 64 0 65 0;
+#X connect 65 0 66 0;
+#X connect 66 0 67 0;
+#X connect 67 0 68 0;
+#X restore 321 162 pd freqGain;
+#X obj 479 -64 inlet;
+#X obj 352 79 r \$0-diameter;
+#X obj 553 -65 inlet;
+#X floatatom 407 -16 5 0 0 0 - - -;
+#X floatatom 479 -18 5 0 0 0 - - -;
+#X floatatom 554 -21 5 0 0 0 - - -;
+#X obj 102 292 outlet;
+#X obj 1055 39 hip~;
+#X obj 146 265 snapshot~;
+#X obj 146 218 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 146 192 loadbang;
+#X obj 146 240 metro 10;
+#X obj 1063 420 hip~;
+#X obj 67 242 r~ \$0-myFreq;
+#X obj 1084 367 * 2;
+#X text 153 491 Strouhal Number;
+#X text 311 223 Calculates the gain of the dipole source;
+#X text 315 521 Calculates the gain of the source;
+#X text 545 -84 Azimuth;
+#X text 660 -85 Pan;
+#X text 473 -83 Elevation;
+#X text 403 -82 Distance;
+#X text 237 -82 Diameter;
+#X text 152 -83 Wind Speed;
+#X obj 334 -64 inlet;
+#X floatatom 334 -20 5 0 0 0 - - -;
+#X text 330 -83 Length;
+#X obj 856 133 newStrou;
+#X floatatom 102 -25 5 0 0 0 - - -;
+#X floatatom 242 -17 5 0 0 0 - - -;
+#X obj 1181 -10 +~ 30;
+#X obj 1189 350 +~ 30;
+#X obj 1132 241 throw~ l;
+#X obj 1159 219 throw~ r;
+#X obj 1132 197 fcpan;
+#X obj 1140 579 throw~ l;
+#X obj 1167 557 throw~ r;
+#X obj 1140 533 fcpan;
+#X obj 344 -41 s \$0-leng;
+#X obj 412 -40 s \$0-dist;
+#X obj 486 -42 s \$0-elev;
+#X obj 561 -42 s \$0-azim;
+#X obj 321 19 r~ \$0-str;
+#X obj 342 59 r \$0-leng;
+#X obj 363 99 r \$0-azim;
+#X obj 373 120 r \$0-elev;
+#X obj 384 141 r \$0-dist;
+#X obj 384 186 s~ \$0-dragDiGain;
+#X obj 321 206 s~ \$0-liftDiGain;
+#X obj 324 299 r~ \$0-str;
+#X obj 347 343 r \$0-leng;
+#X obj 381 410 r \$0-elev;
+#X obj 370 387 r \$0-azim;
+#X obj 393 433 r \$0-dist;
+#X obj 393 480 s~ \$0-dragNoiseGain;
+#X obj 324 502 s~ \$0-liftNoiseGain;
+#X obj 674 235 r~ \$0-dragDiGain;
+#X obj 750 163 s~ \$0-str;
+#X obj 894 237 r~ \$0-liftDiGain;
+#X obj 868 310 r \$0-thisPan;
+#X obj 655 2 s \$0-thisPan;
+#X obj 1076 16 r \$0-contFreq;
+#X obj 146 292 s \$0-contFreq;
+#X obj 69 411 r~ \$0-str;
+#X obj 1147 84 r~ \$0-liftNoiseGain;
+#X obj 1159 178 r \$0-thisPan;
+#X obj 1084 344 r \$0-contFreq;
+#X obj 1155 443 r~ \$0-dragNoiseGain;
+#X obj 1167 513 r \$0-thisPan;
+#X connect 4 0 16 0;
+#X connect 5 0 7 0;
+#X connect 6 0 43 0;
+#X connect 6 0 115 0;
+#X connect 7 0 6 0;
+#X connect 8 0 11 0;
+#X connect 10 0 8 0;
+#X connect 11 0 4 0;
+#X connect 11 0 29 0;
+#X connect 12 0 22 0;
+#X connect 12 0 117 0;
+#X connect 15 0 91 0;
+#X connect 15 0 127 0;
+#X connect 16 0 21 1;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 21 0;
+#X connect 21 0 61 0;
+#X connect 23 0 7 1;
+#X connect 24 0 8 1;
+#X connect 26 0 87 1;
+#X connect 27 0 10 1;
+#X connect 28 0 5 0;
+#X connect 30 0 18 0;
+#X connect 31 0 32 0;
+#X connect 32 0 25 0;
+#X connect 33 0 31 0;
+#X connect 33 0 116 0;
+#X connect 34 0 59 1;
+#X connect 35 0 95 0;
+#X connect 36 0 122 0;
+#X connect 37 0 40 0;
+#X connect 38 0 37 0;
+#X connect 39 0 38 0;
+#X connect 41 0 39 0;
+#X connect 42 0 37 0;
+#X connect 44 0 45 0;
+#X connect 44 0 59 2;
+#X connect 46 0 47 0;
+#X connect 47 0 68 0;
+#X connect 48 0 67 0;
+#X connect 49 0 57 0;
+#X connect 50 0 100 0;
+#X connect 51 0 125 0;
+#X connect 52 0 53 0;
+#X connect 52 0 60 2;
+#X connect 54 0 55 0;
+#X connect 55 0 69 0;
+#X connect 56 0 66 0;
+#X connect 57 0 60 1;
+#X connect 59 0 36 0;
+#X connect 60 0 51 0;
+#X connect 61 0 2 0;
+#X connect 61 1 3 0;
+#X connect 62 0 36 1;
+#X connect 63 0 51 1;
+#X connect 64 0 52 0;
+#X connect 65 0 44 0;
+#X connect 66 0 119 0;
+#X connect 67 0 118 0;
+#X connect 68 0 44 0;
+#X connect 69 0 52 0;
+#X connect 70 0 72 0;
+#X connect 72 0 73 0;
+#X connect 73 0 71 0;
+#X connect 73 0 148 0;
+#X connect 79 0 85 1;
+#X connect 80 0 83 0;
+#X connect 81 0 80 0;
+#X connect 82 0 81 0;
+#X connect 84 0 82 0;
+#X connect 85 0 143 0;
+#X connect 85 1 142 0;
+#X connect 86 0 85 3;
+#X connect 87 0 136 0;
+#X connect 87 1 135 0;
+#X connect 88 0 92 0;
+#X connect 88 0 128 0;
+#X connect 89 0 87 3;
+#X connect 90 0 93 0;
+#X connect 90 0 129 0;
+#X connect 95 0 59 0;
+#X connect 96 0 94 0;
+#X connect 96 0 9 0;
+#X connect 96 0 150 0;
+#X connect 97 0 99 0;
+#X connect 98 0 97 0;
+#X connect 99 0 96 0;
+#X connect 100 0 60 0;
+#X connect 101 0 96 0;
+#X connect 102 0 100 1;
+#X connect 112 0 113 0;
+#X connect 112 0 126 0;
+#X connect 115 0 10 0;
+#X connect 115 0 145 0;
+#X connect 118 0 65 0;
+#X connect 119 0 64 0;
+#X connect 122 0 120 0;
+#X connect 122 1 121 0;
+#X connect 125 0 123 0;
+#X connect 125 1 124 0;
+#X connect 130 0 87 0;
+#X connect 131 0 87 2;
+#X connect 132 0 87 4;
+#X connect 133 0 87 5;
+#X connect 134 0 87 6;
+#X connect 137 0 85 0;
+#X connect 138 0 85 2;
+#X connect 139 0 85 5;
+#X connect 140 0 85 4;
+#X connect 141 0 85 6;
+#X connect 144 0 20 1;
+#X connect 146 0 16 1;
+#X connect 147 0 61 1;
+#X connect 149 0 95 1;
+#X connect 151 0 80 0;
+#X connect 152 0 62 0;
+#X connect 153 0 122 1;
+#X connect 154 0 102 0;
+#X connect 155 0 63 0;
+#X connect 156 0 125 1;
--- a/scene demo/newStrou.pd	Thu Jul 30 12:28:59 2015 +0100
+++ b/scene demo/newStrou.pd	Fri Jul 31 07:15:40 2015 +0100
@@ -35,7 +35,7 @@
 #X obj 302 173 spigot;
 #X obj 365 200 spigot;
 #X obj 411 173 spigot;
-#X floatatom 546 83 5 0 0 0 - - -;
+#X floatatom 546 83 8 0 0 0 - - -;
 #X obj 472 198 spigot;
 #X obj 518 171 spigot;
 #X obj 578 200 spigot;
--- a/scene demo/testBed.pd	Thu Jul 30 12:28:59 2015 +0100
+++ b/scene demo/testBed.pd	Fri Jul 31 07:15:40 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 473 31 842 605 10;
+#N canvas 106 91 842 605 10;
 #X msg 88 -43 300;
 #X obj 59 -86 loadbang;
 #N canvas 236 158 426 423 windspeed 0;
@@ -71,8 +71,8 @@
 #X connect 8 0 0 0;
 #X restore -376 -133 pd windspeed;
 #X obj -376 61 delwrite~ varwind 3000;
-#X obj -293 -131 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 1270 1;
+#X obj -293 -131 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 4000 1;
 #X obj -333 -28 snapshot~;
 #X obj -333 -53 metro 100;
 #X obj -333 -75 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
@@ -82,7 +82,6 @@
 #X obj -376 -73 +~ 1;
 #X obj -333 -100 loadbang;
 #X text -336 17 Wind Speed;
-#X obj -254 -2 s wSpeed;
 #X obj -157 -130 loadbang;
 #X msg -157 -102 5;
 #X obj 103 6 hsl 128 15 0.001 0.01 1 0 empty empty empty -2 -8 0 10
@@ -98,8 +97,8 @@
 #X obj 153 217 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 9525 1;
 #X floatatom 177 246 5 0 0 0 - - -;
-#X obj 128 105 hsl 128 15 100 1 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 11289 1;
+#X obj 128 105 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 5847 1;
 #X floatatom 139 134 5 0 0 0 - - -;
 #X text 307 281 Pan Value;
 #X text 280 162 Elevation;
@@ -142,7 +141,7 @@
 #X restore -385 184 pd opLevels;
 #X msg -385 133 5;
 #X obj -382 155 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 390 1;
+-1 -1 490 1;
 #X obj -115 -25 snapshot~;
 #X obj -115 -50 metro 100;
 #X floatatom -115 2 10 0 0 0 - - -;
@@ -154,17 +153,10 @@
 #X obj 26 9 /~ 343.59;
 #X text 107 15 Speed of Sound (dry air 20 Degs C);
 #X obj 26 -14 vd~ varwind;
-#X obj 26 33 s~ myMach;
+#X obj 26 33 s~ MY_MACH;
 #X connect 0 0 3 0;
 #X connect 2 0 0 0;
 #X restore -50 -149 pd machCalc;
-#X obj -200 -64 r~ myMach;
-#X obj 243 249 r setUp;
-#X obj 102 -15 r setUp;
-#X obj 229 131 r setUp;
-#X obj 235 191 r setUp;
-#X obj 242 79 r setUp;
-#X obj 232 -102 s setUp;
 #X obj 232 -143 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1
 -1;
 #X floatatom 88 330 8 0 0 0 - - -;
@@ -178,75 +170,83 @@
 #X obj 116 62 hsl 128 15 1 10 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 4233 1;
 #X floatatom 137 81 8 0 0 0 - - -;
-#X obj 175 40 r setUp;
 #X msg 25 47 4;
 #X obj -265 158 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 390 1;
+-1 -1 6690 1;
 #X obj -264 111 loadbang;
 #X msg -264 134 5;
 #X text -203 137 No Of Sources;
-#X obj -173 1 s sigMac;
 #X text 248 46 Length;
-#X obj 88 305 freqCalcCyl2D2;
-#X connect 0 0 70 0;
-#X connect 1 0 59 0;
+#X obj 52 302 freqCalcCyl2_D4Mach;
+#X obj -254 -2 s WSPEED;
+#X obj -200 -64 r~ MY_MACH;
+#X obj -182 4 s SIG_MACH;
+#X obj 232 -102 s SET_UP;
+#X obj 102 -15 r SET_UP;
+#X obj 175 40 r SET_UP;
+#X obj 242 79 r SET_UP;
+#X obj 229 131 r SET_UP;
+#X obj 235 191 r SET_UP;
+#X obj 243 249 r SET_UP;
+#X connect 0 0 60 0;
+#X connect 1 0 51 0;
 #X connect 2 0 9 0;
 #X connect 4 0 9 1;
 #X connect 4 0 10 1;
 #X connect 5 0 8 0;
-#X connect 5 0 13 0;
+#X connect 5 0 61 0;
 #X connect 6 0 5 0;
 #X connect 7 0 6 0;
 #X connect 9 0 10 0;
 #X connect 10 0 3 0;
 #X connect 10 0 5 0;
 #X connect 11 0 7 0;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X connect 16 0 17 0;
-#X connect 16 0 70 1;
-#X connect 18 0 19 0;
-#X connect 18 0 70 6;
-#X connect 21 0 22 0;
-#X connect 21 0 70 4;
-#X connect 23 0 24 0;
-#X connect 23 0 70 5;
-#X connect 25 0 26 0;
-#X connect 25 0 70 3;
-#X connect 34 0 36 0;
-#X connect 35 0 31 0;
-#X connect 35 1 32 0;
-#X connect 36 0 37 0;
-#X connect 37 0 35 0;
-#X connect 38 0 40 0;
-#X connect 38 0 68 0;
-#X connect 39 0 38 0;
-#X connect 41 0 42 0;
-#X connect 42 0 39 0;
-#X connect 45 0 38 0;
-#X connect 46 0 18 0;
-#X connect 47 0 16 0;
-#X connect 48 0 21 0;
-#X connect 49 0 23 0;
-#X connect 50 0 25 0;
-#X connect 52 0 51 0;
-#X connect 54 0 16 0;
-#X connect 55 0 25 0;
-#X connect 56 0 21 0;
-#X connect 57 0 23 0;
-#X connect 58 0 18 0;
-#X connect 59 0 0 0;
-#X connect 59 0 54 0;
-#X connect 59 0 55 0;
-#X connect 59 0 56 0;
-#X connect 59 0 57 0;
-#X connect 59 0 58 0;
-#X connect 59 0 63 0;
-#X connect 60 0 61 0;
-#X connect 60 0 70 2;
-#X connect 62 0 60 0;
-#X connect 63 0 60 0;
-#X connect 64 0 35 1;
-#X connect 65 0 66 0;
-#X connect 66 0 64 0;
-#X connect 70 0 53 0;
+#X connect 13 0 14 0;
+#X connect 14 0 4 0;
+#X connect 15 0 16 0;
+#X connect 15 0 60 1;
+#X connect 17 0 18 0;
+#X connect 17 0 60 6;
+#X connect 20 0 21 0;
+#X connect 20 0 60 4;
+#X connect 22 0 23 0;
+#X connect 22 0 60 5;
+#X connect 24 0 25 0;
+#X connect 24 0 60 3;
+#X connect 33 0 35 0;
+#X connect 34 0 30 0;
+#X connect 34 1 31 0;
+#X connect 35 0 36 0;
+#X connect 36 0 34 0;
+#X connect 37 0 39 0;
+#X connect 37 0 63 0;
+#X connect 38 0 37 0;
+#X connect 40 0 41 0;
+#X connect 41 0 38 0;
+#X connect 44 0 64 0;
+#X connect 46 0 15 0;
+#X connect 47 0 24 0;
+#X connect 48 0 20 0;
+#X connect 49 0 22 0;
+#X connect 50 0 17 0;
+#X connect 51 0 0 0;
+#X connect 51 0 46 0;
+#X connect 51 0 47 0;
+#X connect 51 0 48 0;
+#X connect 51 0 49 0;
+#X connect 51 0 50 0;
+#X connect 51 0 54 0;
+#X connect 52 0 53 0;
+#X connect 52 0 60 2;
+#X connect 54 0 52 0;
+#X connect 55 0 34 1;
+#X connect 56 0 57 0;
+#X connect 57 0 55 0;
+#X connect 60 0 45 0;
+#X connect 62 0 37 0;
+#X connect 65 0 15 0;
+#X connect 66 0 52 0;
+#X connect 67 0 24 0;
+#X connect 68 0 20 0;
+#X connect 69 0 22 0;
+#X connect 70 0 17 0;