changeset 78:3fd10ec003c3

testBed added to trial new developments without disturbing previous generations. Noise source (pow8) not connected porperly which has now been rectified. Gives much more white noise type sound.
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Fri, 26 Jun 2015 10:32:49 +0100
parents f15a9429abdb
children 310f1de5b676
files .DS_Store June/.DS_Store June/freqCalcCylD3.pd June/testBed.pd
diffstat 4 files changed, 633 insertions(+), 372 deletions(-) [+]
line wrap: on
line diff
Binary file .DS_Store has changed
Binary file June/.DS_Store has changed
--- a/June/freqCalcCylD3.pd	Thu Jun 25 17:06:01 2015 +0100
+++ b/June/freqCalcCylD3.pd	Fri Jun 26 10:32:49 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 302 23 1138 747 10;
+#N canvas 1501 22 1512 852 10;
 #X text 191 166 Mass Density of Air;
 #X text 125 140 Frequency (Hz);
 #X obj 268 614 throw~ l;
@@ -9,93 +9,36 @@
 #X obj 313 197 *~ 1;
 #X obj 283 417 /~ 1;
 #X obj 135 89 snapshot~;
-#X obj 135 42 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 135 42 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X floatatom 135 115 10 0 0 0 - - -;
 #X obj 298 285 /~;
 #X obj 283 393 *~;
 #X obj 283 442 clip~ 0 20000;
 #X obj 185 -100 inlet;
-#X obj 215 114 outlet;
 #X obj 135 16 loadbang;
-#X text 375 43 Mass Density of Air \, squared;
-#X text 638 68 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 558 -54 pd pow6;
 #X text 154 235 Reynolds Number;
 #X text 167 409 Strouhal Number;
-#X obj 521 -41 *~;
-#X obj 558 -16 *~;
-#X obj 558 18 *~ 1;
-#X obj 558 46 *~ 1.50063;
-#X obj 636 -5 inlet;
-#X obj 636 20 *;
-#X obj 636 45 * 118033;
-#X obj 558 81 /~ 1;
-#X obj 631 126 inlet;
-#X obj 558 354 *~ 0.27;
+#X obj 408 -91 inlet;
 #X obj 283 498 *~;
-#X text 628 109 Azimuth;
-#X text 635 -25 Distance;
 #X text 343 222 Viscosity;
 #X obj 47 425 *~ 2;
 #X obj 47 452 osc~;
 #X obj 47 488 *~;
 #X obj 268 527 +~;
-#X obj 680 427 cos;
-#X obj 680 382 / 360;
-#X floatatom 707 478 5 0 0 0 - - -;
-#X obj 680 451 *;
-#X obj 641 531 *~ 0.27;
 #X obj 185 -77 s \$0-diameter;
 #X obj 374 166 r \$0-diameter;
 #X obj 363 366 r \$0-diameter;
-#X obj 627 -48 r \$0-diameter;
 #X obj 110 -43 s~ \$0-windSpeed;
-#X obj 558 -80 r~ \$0-windSpeed;
+#X obj 674 -50 r~ \$0-windSpeed;
 #X obj 362 335 r~ \$0-windSpeed;
 #X obj 313 139 r~ \$0-windSpeed;
 #X obj 218 392 s~ \$0_str;
-#X obj 491 -79 r~ \$0_str;
-#X obj 575 110 s~ \$0-a;
-#X obj 616 481 r~ \$0-a;
-#X obj 641 581 s~ \$0_dragDiGain;
+#X obj 664 -71 r~ \$0_str;
 #X obj 80 452 r~ \$0_dragDiGain;
 #X obj 198 468 s~ \$0-myFreq;
 #X obj 47 398 r~ \$0-myFreq;
 #X obj 49 64 r~ \$0-myFreq;
-#X obj 558 404 s~ \$0_liftDiGain;
 #X obj 321 468 r~ \$0_liftDiGain;
 #X obj 110 -85 sig~;
 #X obj 110 -63 vd~ varwind;
@@ -107,7 +50,7 @@
 #X obj 1257 137 *~;
 #X obj 285 10 snapshot~;
 #X obj 285 -15 metro 100;
-#X obj 285 -37 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 285 -37 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X floatatom 285 36 10 0 0 0 - - -;
 #X obj 285 -63 loadbang;
@@ -116,7 +59,7 @@
 #X obj 1395 47 snapshot~;
 #X floatatom 1395 73 10 0 0 0 - - -;
 #X obj 1395 -26 loadbang;
-#X obj 1395 -1 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 1395 -1 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 1306 -55 r~ \$0-myRey;
 #X obj 1232 346 r~ \$0-myFreq;
@@ -128,7 +71,7 @@
 #X floatatom 1413 381 10 0 0 0 - - -;
 #X obj 1413 282 loadbang;
 #X obj 1413 307 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
-0 1;
+1 1;
 #X obj 1324 253 r~ \$0-myRey;
 #X obj 1232 372 *~ 2;
 #X text 270 58 Reynolds Number;
@@ -137,7 +80,6 @@
 #X obj 268 570 fcpan;
 #X obj 1257 186 fcpan;
 #X obj 1275 487 fcpan;
-#X obj 680 404 * 6.28319;
 #X obj 1272 110 *~ 1;
 #X obj 1290 418 *~ 1;
 #X obj 1324 328 clip~ 2 400;
@@ -146,13 +88,65 @@
 #X obj 1306 -31 *~ -0.003;
 #X obj 1306 -6 +~ 20;
 #X obj 1324 302 +~ 20;
-#X floatatom 601 21 5 0 0 0 - - -;
 #X obj 1395 22 metro 10;
 #X obj 1413 330 metro 10;
 #X obj 135 64 metro 10;
+#X obj 408 -71 s \$0_dist;
+#X obj 956 163 inlet;
+#X obj 956 232 s \$0_thisPan;
+#X obj 295 541 r \$0_thisPan;
+#X obj 1284 162 r \$0_thisPan;
+#X obj 1302 465 r \$0_thisPan;
+#X floatatom 891 188 8 0 0 0 - - -;
+#X obj 956 187 max 0.1;
+#X obj 956 210 min 0.9;
+#X text 1014 165 Pan value inlet;
+#X text 1326 431 Drag Dipole spectrum calculation;
+#X text 1311 127 Lift Dipole spectrum calculation;
+#X text 34 281 Calculates the frequency;
+#X text 34 294 based on the physics of;
+#X text 35 307 the object and environment;
+#X obj 875 -55 r~ \$0-windSpeed;
+#X obj 864 -78 r~ \$0_str;
+#X obj 1290 395 r~ \$0_dragNoiseGain;
+#X obj 1272 68 r~ \$0_liftNoiseGain;
+#X floatatom 1025 201 5 0 0 0 - - -;
+#X obj 264 246 sig~ 1;
+#X obj 298 311 sqrt~;
+#X obj 298 336 *~ 1.0356;
+#X obj 224 327 sig~ 0.2684;
+#X obj 283 366 -~;
+#X obj 145 603 snapshot~;
+#X obj 145 578 metro 100;
+#X obj 145 556 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 145 629 10 0 0 0 - - -;
+#X obj 145 530 loadbang;
+#X obj 59 578 r~ \$0_str;
+#X obj 31 -15 hsl 128 15 0 30 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X msg 246 -103 0.003;
+#N canvas 1951 174 622 660 noiseGain 1;
+#X text -21205 129 Mass Density of Air \, squared;
+#X text -20901 154 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 -20903 108 *;
+#X obj -20903 131 * 118033;
+#X obj -21022 167 /~ 1;
+#X obj -21022 440 *~ 0.27;
+#X text -20903 61 Distance;
+#X obj -20847 410 cos;
+#X obj -20847 365 / 360;
+#X floatatom -20820 461 5 0 0 0 - - -;
+#X obj -20847 434 *;
+#X obj -20886 514 *~ 0.27;
+#X obj -20847 387 * 6.28319;
 #N canvas 409 243 688 659 angleCalc 0;
 #X obj 341 79 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
+-1 -1 8146 1;
 #X text 321 40 Elevation Angle;
 #X obj 270 81 / 360;
 #X obj 270 103 * 6.28319;
@@ -193,7 +187,7 @@
 #X obj 295 234 r \$0_tDist;
 #X floatatom 482 81 5 0 0 0 - - -;
 #X obj 67 79 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
+-1 -1 4989 1;
 #X text 71 41 Azimuth Angle;
 #X connect 0 0 8 0;
 #X connect 2 0 3 0;
@@ -234,59 +228,179 @@
 #X connect 36 0 25 1;
 #X connect 37 0 22 1;
 #X connect 39 0 7 0;
-#X restore 597 210 pd angleCalc;
-#X obj 597 160 inlet;
-#X obj 667 21 s \$0_dist;
-#X obj 666 188 r \$0_dist;
-#X text 568 144 Elevation;
-#X obj 597 273 / 90;
-#X floatatom 565 297 5 0 0 0 - - -;
-#X obj 680 354 + 90;
-#X obj 447 550 inlet;
-#X obj 445 628 s \$0_thisPan;
-#X obj 295 541 r \$0_thisPan;
-#X obj 1284 162 r \$0_thisPan;
-#X obj 1302 465 r \$0_thisPan;
-#X floatatom 378 583 8 0 0 0 - - -;
-#X obj 444 578 max 0.1;
-#X obj 443 605 min 0.9;
-#X text 501 560 Pan value inlet;
-#X text 1326 431 Drag Dipole spectrum calculation;
-#X text 1311 127 Lift Dipole spectrum calculation;
-#X obj 643 274 loadbang;
-#X msg 643 296 0.05;
-#X obj 558 329 *~ 0.05;
-#X obj 745 456 loadbang;
-#X msg 745 478 0.05;
-#X obj 641 507 *~ 0.05;
-#X text 719 538 Calculates Drag Dipole gain;
-#X text 499 439 Calculates Lift Dipole gain;
-#X text 34 281 Calculates the frequency;
-#X text 34 294 based on the physics of;
-#X text 35 307 the object and environment;
-#X text 739 51 Mass Density of Air \, squared;
-#X text 1002 76 Speed of Sound to power 2;
-#X obj 885 -33 *~;
-#X obj 922 -8 *~;
-#X obj 922 26 *~ 1;
-#X obj 922 54 *~ 1.50063;
-#X obj 1000 28 *;
-#X obj 1000 53 * 118033;
-#X obj 922 89 /~ 1;
-#X obj 922 362 *~ 0.27;
-#X text 1000 -17 Distance;
-#X obj 1044 435 cos;
-#X obj 1044 390 / 360;
-#X floatatom 1071 486 5 0 0 0 - - -;
-#X obj 1044 459 *;
-#X obj 1005 539 *~ 0.27;
-#X obj 991 -40 r \$0-diameter;
-#X obj 922 -72 r~ \$0-windSpeed;
-#X obj 855 -71 r~ \$0_str;
-#X obj 1044 412 * 6.28319;
-#N canvas 409 243 688 659 angleCalc 0;
+#X restore -20983 296 pd angleCalc;
+#X obj -20983 359 / 90;
+#X floatatom -21015 383 5 0 0 0 - - -;
+#X obj -20847 337 + 90;
+#X obj -20937 360 loadbang;
+#X msg -20937 382 0.05;
+#X obj -21022 415 *~ 0.05;
+#X obj -20782 439 loadbang;
+#X msg -20782 461 0.05;
+#X obj -20886 490 *~ 0.05;
+#X text -20812 529 Calculates Drag Dipole gain;
+#X text -21198 433 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 -21005 196 s~ \$0-c;
+#X obj -20911 464 r~ \$0-c;
+#X obj -21022 462 *~ 1;
+#X obj -20886 539 *~ 0.1;
+#X obj -21070 7 inlet~;
+#X obj -21022 7 inlet~;
+#X obj -20989 55 inlet;
+#X obj -20983 232 inlet;
+#X obj -20949 253 inlet;
+#X obj -20914 275 inlet;
+#X obj -20903 82 inlet;
+#X obj -21022 483 outlet~;
+#X obj -20886 564 outlet~;
+#X text -20949 220 Azimuth;
+#X text -20914 243 Elevation;
+#X text -20880 267 Distance;
+#X text -20961 26 Gain proportional to windspeed to power 8 for spectrum
+;
+#X text -20981 74 Diameter;
+#X connect 2 0 3 1;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 5 0 8 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 1;
+#X connect 8 0 23 0;
+#X connect 8 0 30 0;
+#X connect 9 0 32 0;
+#X connect 11 0 14 0;
+#X connect 11 0 14 1;
+#X connect 12 0 16 0;
+#X connect 14 0 13 0;
+#X connect 14 0 26 1;
+#X connect 15 0 33 0;
+#X connect 16 0 11 0;
+#X connect 17 0 18 0;
+#X connect 17 0 20 0;
+#X connect 18 0 19 0;
+#X connect 18 0 23 1;
+#X connect 20 0 12 0;
+#X connect 21 0 22 0;
+#X connect 22 0 23 1;
+#X connect 23 0 9 0;
+#X connect 24 0 25 0;
+#X connect 25 0 26 1;
+#X connect 26 0 15 0;
+#X connect 29 0 3 0;
+#X connect 31 0 26 0;
+#X connect 32 0 41 0;
+#X connect 33 0 42 0;
+#X connect 34 0 2 0;
+#X connect 34 0 2 1;
+#X connect 35 0 29 0;
+#X connect 36 0 4 1;
+#X connect 37 0 17 0;
+#X connect 38 0 17 1;
+#X connect 39 0 17 2;
+#X connect 40 0 6 0;
+#X connect 40 0 6 1;
+#X restore 864 57 pd noiseGain;
+#X obj 887 -34 r \$0-diameter;
+#X obj 933 33 r \$0_dist;
+#X obj 910 11 r \$0_azim;
+#X obj 898 -11 r \$0_elev;
+#X obj 864 102 s~ \$0_liftNoiseGain;
+#X obj 933 80 s~ \$0_dragNoiseGain;
+#N canvas 1958 298 585 642 freqGain 0;
+#X text 36 127 Mass Density of Air \, squared;
+#X text 299 152 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 297 104 *;
+#X obj 297 129 * 118033;
+#X obj 219 165 /~ 1;
+#X obj 219 438 *~ 0.27;
+#X text 273 221 Azimuth;
+#X text 317 63 Distance;
+#X obj 370 423 cos;
+#X obj 370 378 / 360;
+#X floatatom 397 474 5 0 0 0 - - -;
+#X obj 370 447 *;
+#X obj 331 527 *~ 0.27;
+#X obj 236 194 s~ \$0-a;
+#X obj 306 477 r~ \$0-a;
+#X obj 370 400 * 6.28319;
+#X floatatom 262 105 5 0 0 0 - - -;
+#N canvas 713 150 688 659 angleCalc 0;
 #X obj 341 79 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
+-1 -1 4989 1;
 #X text 321 40 Elevation Angle;
 #X obj 270 81 / 360;
 #X obj 270 103 * 6.28319;
@@ -327,7 +441,7 @@
 #X obj 295 234 r \$0_tDist;
 #X floatatom 482 81 5 0 0 0 - - -;
 #X obj 67 79 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
+-1 -1 8146 1;
 #X text 71 41 Azimuth Angle;
 #X connect 0 0 8 0;
 #X connect 2 0 3 0;
@@ -368,264 +482,199 @@
 #X connect 36 0 25 1;
 #X connect 37 0 22 1;
 #X connect 39 0 7 0;
-#X restore 961 218 pd angleCalc;
-#X obj 1030 196 r \$0_dist;
-#X obj 961 281 / 90;
-#X floatatom 929 305 5 0 0 0 - - -;
-#X obj 1044 362 + 90;
-#X obj 1007 282 loadbang;
-#X msg 1007 304 0.05;
-#X obj 922 337 *~ 0.05;
-#X obj 1109 464 loadbang;
-#X msg 1109 486 0.05;
-#X obj 1005 515 *~ 0.05;
-#X text 1079 554 Calculates Drag Dipole gain;
-#X text 830 429 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 13 0 3 0;
-#X connect 13 0 4 0;
-#X restore 922 -46 pd pow8;
-#X obj 922 412 s~ \$0_liftNoiseGain;
-#X obj 1005 589 s~ \$0_dragNoiseGain;
-#X obj 1290 395 r~ \$0_dragNoiseGain;
-#X obj 1272 68 r~ \$0_liftNoiseGain;
-#X obj 939 118 s~ \$0-c;
-#X obj 980 489 r~ \$0-c;
-#X obj 1000 6 r \$0_dist;
-#X obj 657 148 s \$0_azim;
-#X obj 604 184 s \$0_elev;
-#X obj 995 177 r \$0_azim;
-#X obj 961 154 r \$0_elev;
-#X floatatom 734 231 5 0 0 0 - - -;
-#X floatatom 749 206 5 0 0 0 - - -;
-#X floatatom 512 596 5 0 0 0 - - -;
-#X obj 264 246 sig~ 1;
-#X obj 298 311 sqrt~;
-#X obj 298 336 *~ 1.0356;
-#X obj 224 327 sig~ 0.2684;
-#X obj 283 366 -~;
-#X obj 145 603 snapshot~;
-#X obj 145 578 metro 100;
-#X obj 145 556 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
-1;
-#X floatatom 145 629 10 0 0 0 - - -;
-#X obj 145 530 loadbang;
-#X obj 59 578 r~ \$0_str;
-#X obj 31 -15 hsl 128 15 0 30 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
-#X msg 246 -103 0.003;
-#X obj 559 376 *~ 1;
-#X obj 641 556 *~ 0.1;
-#X obj 922 384 *~ 1;
-#X obj 1005 564 *~ 0.1;
-#X connect 4 0 33 0;
+#X restore 258 294 pd angleCalc;
+#X text 309 240 Elevation;
+#X obj 258 357 / 90;
+#X floatatom 226 381 5 0 0 0 - - -;
+#X obj 370 350 + 90;
+#X obj 294 357 loadbang;
+#X msg 294 379 0.05;
+#X obj 219 413 *~ 0.05;
+#X obj 435 452 loadbang;
+#X msg 435 474 0.05;
+#X obj 331 503 *~ 0.05;
+#X text 409 534 Calculates Drag Dipole gain;
+#X text 48 445 Calculates Lift Dipole gain;
+#X obj 220 460 *~ 1;
+#X obj 331 552 *~ 0.1;
+#X obj 173 8 inlet~;
+#X obj 219 7 inlet~;
+#X text 256 54 Diameter;
+#X obj 250 69 inlet;
+#X obj 297 79 inlet;
+#X obj 327 272 inlet;
+#X obj 258 236 inlet;
+#X obj 292 255 inlet;
+#X text 362 273 Distance;
+#X obj 220 488 outlet~;
+#X obj 331 577 outlet~;
+#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 9 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 1;
+#X connect 9 0 18 0;
+#X connect 9 0 29 0;
+#X connect 10 0 35 0;
+#X connect 13 0 16 0;
+#X connect 13 0 16 1;
+#X connect 14 0 20 0;
+#X connect 16 0 15 0;
+#X connect 16 0 32 1;
+#X connect 17 0 36 0;
+#X connect 19 0 32 0;
+#X connect 20 0 13 0;
+#X connect 22 0 24 0;
+#X connect 22 0 26 0;
+#X connect 24 0 25 0;
+#X connect 24 0 29 1;
+#X connect 26 0 14 0;
+#X connect 27 0 28 0;
+#X connect 28 0 29 1;
+#X connect 29 0 10 0;
+#X connect 30 0 31 0;
+#X connect 31 0 32 1;
+#X connect 32 0 17 0;
+#X connect 35 0 46 0;
+#X connect 36 0 47 0;
+#X connect 37 0 3 0;
+#X connect 37 0 3 1;
+#X connect 38 0 2 0;
+#X connect 40 0 5 1;
+#X connect 41 0 7 1;
+#X connect 41 0 7 0;
+#X connect 41 0 21 0;
+#X connect 42 0 22 2;
+#X connect 43 0 22 0;
+#X connect 44 0 22 1;
+#X restore 664 54 pd freqGain;
+#X obj 477 -91 inlet;
+#X obj 477 -71 s \$0_elev;
+#X obj 685 -29 r \$0-diameter;
+#X obj 545 -93 inlet;
+#X obj 545 -71 s \$0_azim;
+#X obj 727 33 r \$0_dist;
+#X obj 695 -9 r \$0_azim;
+#X obj 706 12 r \$0_elev;
+#X obj 727 78 s~ \$0_dragDiGain;
+#X obj 664 98 s~ \$0_liftDiGain;
+#X floatatom 408 -44 5 0 0 0 - - -;
+#X floatatom 478 -45 5 0 0 0 - - -;
+#X floatatom 546 -49 5 0 0 0 - - -;
+#X connect 4 0 20 0;
 #X connect 5 0 7 0;
 #X connect 6 0 12 1;
-#X connect 6 0 79 0;
+#X connect 6 0 54 0;
 #X connect 7 0 6 0;
 #X connect 8 0 14 0;
 #X connect 9 0 11 0;
-#X connect 9 0 16 0;
-#X connect 10 0 114 0;
-#X connect 12 0 194 0;
+#X connect 10 0 87 0;
+#X connect 12 0 109 0;
 #X connect 13 0 8 0;
 #X connect 14 0 4 0;
-#X connect 14 0 60 0;
-#X connect 15 0 46 0;
-#X connect 17 0 10 0;
-#X connect 20 0 24 0;
-#X connect 23 0 24 1;
+#X connect 14 0 36 0;
+#X connect 15 0 26 0;
+#X connect 16 0 10 0;
+#X connect 19 0 88 0;
+#X connect 19 0 139 0;
+#X connect 20 0 25 1;
+#X connect 22 0 23 0;
+#X connect 23 0 24 0;
 #X connect 24 0 25 0;
-#X connect 25 0 26 0;
-#X connect 26 0 30 0;
-#X connect 27 0 28 0;
-#X connect 27 0 28 1;
-#X connect 27 0 111 0;
-#X connect 27 0 117 0;
-#X connect 28 0 29 0;
-#X connect 29 0 30 1;
-#X connect 30 0 56 0;
-#X connect 30 0 136 0;
-#X connect 31 0 115 1;
-#X connect 31 0 186 0;
-#X connect 31 0 191 0;
-#X connect 32 0 206 0;
-#X connect 33 0 40 1;
-#X connect 37 0 38 0;
-#X connect 38 0 39 0;
-#X connect 39 0 40 0;
-#X connect 40 0 99 0;
-#X connect 41 0 44 0;
-#X connect 41 0 44 1;
-#X connect 42 0 102 0;
-#X connect 44 0 43 0;
-#X connect 44 0 139 1;
-#X connect 45 0 207 0;
-#X connect 47 0 7 1;
-#X connect 48 0 8 1;
-#X connect 49 0 25 1;
-#X connect 51 0 20 0;
-#X connect 52 0 13 1;
-#X connect 53 0 5 0;
-#X connect 55 0 23 1;
-#X connect 55 0 23 0;
-#X connect 57 0 139 0;
-#X connect 59 0 39 1;
-#X connect 61 0 37 0;
-#X connect 62 0 9 0;
-#X connect 64 0 33 1;
+#X connect 27 0 7 1;
+#X connect 28 0 8 1;
+#X connect 30 0 128 1;
+#X connect 31 0 13 1;
+#X connect 32 0 5 0;
+#X connect 34 0 128 0;
+#X connect 35 0 24 1;
+#X connect 37 0 22 0;
+#X connect 38 0 9 0;
+#X connect 39 0 20 1;
+#X connect 40 0 41 0;
+#X connect 41 0 29 0;
+#X connect 42 0 40 0;
+#X connect 43 0 72 1;
+#X connect 44 0 72 0;
+#X connect 47 0 75 0;
+#X connect 48 0 51 0;
+#X connect 49 0 48 0;
+#X connect 50 0 49 0;
+#X connect 52 0 50 0;
+#X connect 53 0 48 0;
+#X connect 55 0 56 0;
+#X connect 55 0 72 2;
+#X connect 57 0 58 0;
+#X connect 58 0 85 0;
+#X connect 59 0 82 0;
+#X connect 60 0 70 0;
+#X connect 61 0 73 0;
+#X connect 64 0 76 0;
 #X connect 65 0 66 0;
-#X connect 66 0 50 0;
-#X connect 67 0 65 0;
-#X connect 68 0 97 1;
-#X connect 69 0 97 0;
-#X connect 72 0 100 0;
-#X connect 73 0 76 0;
-#X connect 74 0 73 0;
-#X connect 75 0 74 0;
-#X connect 77 0 75 0;
-#X connect 78 0 73 0;
-#X connect 80 0 81 0;
-#X connect 80 0 97 2;
+#X connect 65 0 73 2;
+#X connect 67 0 68 0;
+#X connect 68 0 86 0;
+#X connect 69 0 81 0;
+#X connect 70 0 73 1;
+#X connect 72 0 47 0;
+#X connect 73 0 64 0;
+#X connect 74 0 2 0;
+#X connect 74 1 3 0;
+#X connect 75 0 45 0;
+#X connect 75 1 46 0;
+#X connect 76 0 62 0;
+#X connect 76 1 63 0;
+#X connect 77 0 47 1;
+#X connect 78 0 64 1;
+#X connect 79 0 65 0;
+#X connect 80 0 55 0;
+#X connect 81 0 84 0;
 #X connect 82 0 83 0;
-#X connect 83 0 112 0;
-#X connect 84 0 108 0;
-#X connect 85 0 95 0;
-#X connect 86 0 98 0;
-#X connect 89 0 101 0;
-#X connect 90 0 91 0;
-#X connect 90 0 98 2;
-#X connect 92 0 93 0;
-#X connect 93 0 113 0;
-#X connect 94 0 107 0;
-#X connect 95 0 98 1;
-#X connect 97 0 72 0;
-#X connect 98 0 89 0;
-#X connect 99 0 2 0;
-#X connect 99 1 3 0;
-#X connect 100 0 70 0;
-#X connect 100 1 71 0;
-#X connect 101 0 87 0;
-#X connect 101 1 88 0;
-#X connect 102 0 41 0;
-#X connect 103 0 72 1;
-#X connect 104 0 89 1;
-#X connect 105 0 90 0;
-#X connect 106 0 80 0;
-#X connect 107 0 110 0;
-#X connect 108 0 109 0;
-#X connect 109 0 106 0;
-#X connect 110 0 105 0;
-#X connect 112 0 80 0;
-#X connect 113 0 90 0;
-#X connect 114 0 9 0;
-#X connect 115 0 120 0;
-#X connect 115 0 122 0;
-#X connect 116 0 115 0;
-#X connect 116 0 187 0;
-#X connect 116 0 190 0;
-#X connect 118 0 115 2;
-#X connect 120 0 121 0;
-#X connect 120 0 136 1;
-#X connect 122 0 42 0;
-#X connect 123 0 129 0;
-#X connect 123 0 192 0;
-#X connect 125 0 99 1;
-#X connect 126 0 100 1;
-#X connect 127 0 101 1;
+#X connect 83 0 80 0;
+#X connect 84 0 79 0;
+#X connect 85 0 55 0;
+#X connect 86 0 65 0;
+#X connect 87 0 9 0;
+#X connect 89 0 95 0;
+#X connect 89 0 107 0;
+#X connect 91 0 74 1;
+#X connect 92 0 75 1;
+#X connect 93 0 76 1;
+#X connect 95 0 96 0;
+#X connect 96 0 90 0;
+#X connect 96 0 94 0;
+#X connect 103 0 121 1;
+#X connect 104 0 121 0;
+#X connect 105 0 78 0;
+#X connect 106 0 77 0;
+#X connect 108 0 12 0;
+#X connect 109 0 110 0;
+#X connect 110 0 112 1;
+#X connect 111 0 112 0;
+#X connect 112 0 33 0;
+#X connect 112 0 13 0;
+#X connect 113 0 116 0;
+#X connect 114 0 113 0;
+#X connect 115 0 114 0;
+#X connect 117 0 115 0;
+#X connect 118 0 113 0;
+#X connect 121 0 126 0;
+#X connect 121 1 127 0;
+#X connect 122 0 121 2;
+#X connect 123 0 121 5;
+#X connect 123 0 121 6;
+#X connect 124 0 121 4;
+#X connect 125 0 121 3;
+#X connect 128 0 138 0;
+#X connect 128 1 137 0;
 #X connect 129 0 130 0;
-#X connect 130 0 124 0;
-#X connect 130 0 128 0;
-#X connect 134 0 135 0;
-#X connect 135 0 136 1;
-#X connect 136 0 32 0;
-#X connect 137 0 138 0;
-#X connect 138 0 139 1;
-#X connect 139 0 45 0;
-#X connect 147 0 148 1;
-#X connect 148 0 149 0;
-#X connect 149 0 150 0;
-#X connect 150 0 153 0;
-#X connect 151 0 152 0;
-#X connect 152 0 153 1;
-#X connect 153 0 172 0;
-#X connect 153 0 183 0;
-#X connect 154 0 208 0;
-#X connect 156 0 159 0;
-#X connect 156 0 159 1;
-#X connect 157 0 164 0;
-#X connect 159 0 158 0;
-#X connect 159 0 175 1;
-#X connect 160 0 209 0;
-#X connect 161 0 149 1;
-#X connect 162 0 178 0;
-#X connect 163 0 147 1;
-#X connect 163 0 147 0;
-#X connect 164 0 156 0;
-#X connect 165 0 167 0;
-#X connect 165 0 169 0;
-#X connect 166 0 165 2;
-#X connect 167 0 168 0;
-#X connect 167 0 172 1;
-#X connect 169 0 157 0;
-#X connect 170 0 171 0;
-#X connect 171 0 172 1;
-#X connect 172 0 154 0;
-#X connect 173 0 174 0;
-#X connect 174 0 175 1;
-#X connect 175 0 160 0;
-#X connect 178 0 148 0;
-#X connect 181 0 104 0;
-#X connect 182 0 103 0;
-#X connect 184 0 175 0;
-#X connect 185 0 151 0;
-#X connect 185 0 151 1;
-#X connect 188 0 165 1;
-#X connect 189 0 165 0;
-#X connect 193 0 12 0;
-#X connect 194 0 195 0;
-#X connect 195 0 197 1;
-#X connect 196 0 197 0;
-#X connect 197 0 54 0;
-#X connect 197 0 13 0;
-#X connect 198 0 201 0;
-#X connect 199 0 198 0;
-#X connect 200 0 199 0;
-#X connect 202 0 200 0;
-#X connect 203 0 198 0;
-#X connect 206 0 63 0;
-#X connect 207 0 58 0;
-#X connect 208 0 179 0;
-#X connect 209 0 180 0;
+#X connect 129 0 140 0;
+#X connect 131 0 128 2;
+#X connect 132 0 133 0;
+#X connect 132 0 141 0;
+#X connect 134 0 128 6;
+#X connect 134 0 128 5;
+#X connect 135 0 128 3;
+#X connect 136 0 128 4;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/June/testBed.pd	Fri Jun 26 10:32:49 2015 +0100
@@ -0,0 +1,212 @@
+#N canvas 131 166 748 611 10;
+#X obj 18 306 freqCalcCylD3;
+#X msg 18 2 300;
+#X obj 18 -21 loadbang;
+#N canvas 236 158 426 423 windspeed 0;
+#X obj 3 -19 +~ 1;
+#X obj 3 76 +~;
+#X obj 3 3 *~ 0.25;
+#X obj 19 53 +~;
+#X obj 3 98 clip~ 0 1;
+#N canvas 548 156 136 193 squall 0;
+#X obj 63 20 noise~;
+#X obj 63 83 hip~ 0;
+#X obj 63 41 lop~ 3;
+#X obj 63 62 lop~ 3;
+#X obj 0 86 *~;
+#X obj 22 130 *~;
+#X obj 0 64 *~ 8;
+#X obj 63 104 *~ 20;
+#X obj 0 0 inlet~;
+#X obj 22 154 outlet~;
+#X obj 0 20 max~ 0.42;
+#X obj 0 42 -~ 0.42;
+#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 restore 77 28 pd squall;
+#N canvas 398 157 136 192 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 42 lop~ 0.5;
+#X obj 0 21 lop~ 0.5;
+#X obj 0 84 *~ 50;
+#X obj 67 0 inlet~;
+#X obj 0 131 outlet~;
+#X connect 0 0 7 0;
+#X connect 1 0 8 0;
+#X connect 2 0 10 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 1 0;
+#X connect 7 0 6 0;
+#X connect 8 0 2 0;
+#X connect 9 0 4 0;
+#X restore 18 29 pd gust;
+#X obj 3 120 outlet~;
+#X obj 3 -41 osc~ 0.01;
+#X connect 0 0 2 0;
+#X connect 1 0 4 0;
+#X connect 2 0 5 0;
+#X connect 2 0 6 0;
+#X connect 2 0 1 0;
+#X connect 3 0 1 1;
+#X connect 4 0 7 0;
+#X connect 5 0 3 1;
+#X connect 6 0 3 0;
+#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 4270 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
+1 1;
+#X floatatom -333 -1 10 0 0 0 - - -;
+#X obj -376 -99 *~ 1;
+#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 36 51 hsl 128 15 0.001 0.01 1 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 9900 1;
+#X floatatom 55 78 8 0 0 0 - - -;
+#X obj 96 281 hsl 128 15 0.009 0.9 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 5900 1;
+#X floatatom 115 310 5 0 0 0 - - -;
+#X text 169 51 Diameter;
+#X obj 66 163 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 6300 1;
+#X floatatom 85 192 5 0 0 0 - - -;
+#X obj 81 218 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 3000 1;
+#X floatatom 100 247 5 0 0 0 - - -;
+#X obj 51 106 hsl 128 15 100 1 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 10400 1;
+#X floatatom 70 135 5 0 0 0 - - -;
+#X text 230 282 Pan Value;
+#X text 203 163 Elevation;
+#X text 215 219 Azimuth;
+#X text 189 107 Distance;
+#X obj -384 227 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj -321 227 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X text -324 136 Gain;
+#X obj -385 110 loadbang;
+#N canvas 865 368 284 318 opLevels 0;
+#X obj 74 188 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 186 75 / 127;
+#X obj 186 40 inlet;
+#X obj 30 239 outlet;
+#X obj 129 239 outlet;
+#X obj 95 37 r NoOfSources;
+#X obj 74 143 /~ 15;
+#X obj 95 165 /~ 15;
+#X msg 94 111 15;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 6 0;
+#X connect 3 0 13 0;
+#X connect 4 0 5 0;
+#X connect 4 0 12 0;
+#X connect 5 0 9 0;
+#X connect 6 0 10 0;
+#X connect 7 0 3 1;
+#X connect 7 0 4 1;
+#X connect 8 0 7 0;
+#X connect 12 0 0 0;
+#X connect 13 0 0 1;
+#X connect 14 0 12 1;
+#X connect 14 0 13 1;
+#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 8190 1;
+#X obj -91 18 snapshot~;
+#X obj -91 -7 metro 100;
+#X floatatom -91 45 10 0 0 0 - - -;
+#X obj -91 -54 loadbang;
+#X obj -91 -31 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X text -94 63 Mach No;
+#N canvas 20 383 344 123 machCalc 1;
+#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 connect 0 0 3 0;
+#X connect 2 0 0 0;
+#X restore -50 -149 pd machCalc;
+#X obj -176 -21 r~ myMach;
+#X obj 166 250 r setUp;
+#X obj 33 30 r setUp;
+#X obj 152 132 r setUp;
+#X obj 158 192 r setUp;
+#X obj 165 80 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 connect 1 0 0 0;
+#X connect 2 0 1 0;
+#X connect 3 0 10 0;
+#X connect 5 0 10 1;
+#X connect 5 0 11 1;
+#X connect 6 0 9 0;
+#X connect 6 0 14 0;
+#X connect 7 0 6 0;
+#X connect 8 0 7 0;
+#X connect 10 0 11 0;
+#X connect 11 0 4 0;
+#X connect 11 0 6 0;
+#X connect 12 0 8 0;
+#X connect 15 0 16 0;
+#X connect 16 0 5 0;
+#X connect 17 0 18 0;
+#X connect 17 0 0 1;
+#X connect 19 0 20 0;
+#X connect 19 0 0 5;
+#X connect 22 0 23 0;
+#X connect 22 0 0 3;
+#X connect 24 0 25 0;
+#X connect 24 0 0 4;
+#X connect 26 0 27 0;
+#X connect 26 0 0 2;
+#X connect 35 0 37 0;
+#X connect 36 0 32 0;
+#X connect 36 1 33 0;
+#X connect 37 0 38 0;
+#X connect 38 0 36 0;
+#X connect 39 0 41 0;
+#X connect 40 0 39 0;
+#X connect 42 0 43 0;
+#X connect 43 0 40 0;
+#X connect 46 0 39 0;
+#X connect 47 0 19 0;
+#X connect 48 0 17 0;
+#X connect 49 0 22 0;
+#X connect 50 0 24 0;
+#X connect 51 0 26 0;
+#X connect 53 0 52 0;