Mercurial > hg > weather-synthesis-prototyping

changeset 96:1fc3648f6c34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SwordSounds: Azimuth, distance changed to audio signal Still ony one source
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Wed, 22 Jul 2015 20:01:33 +0100
parents 132bfea825a2
children 1bd137cd8149
files SwordSounds/fcpan~.pd SwordSounds/sourceSpeed.pd SwordSounds/tenSource.pd SwordSounds/woSoFreq.pd SwordSounds/woSoFreqD2.pd SwordSounds/woosh_D5.pd
diffstat 6 files changed, 1015 insertions(+), 322 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SwordSounds/fcpan~.pd	Wed Jul 22 20:01:33 2015 +0100
@@ -0,0 +1,23 @@
+#N canvas 625 304 450 300 10;
+#X obj 74 133 *~;
+#X obj 6 133 *~;
+#X obj 90 87 cos~;
+#X obj 90 50 -~ 0.25;
+#X obj 90 28 *~ 0.25;
+#X obj 22 111 cos~;
+#X obj 22 87 -~ 0.25;
+#X obj 6 156 outlet~ l;
+#X obj 74 156 outlet~ r;
+#X obj 6 6 inlet~;
+#X obj 90 -26 inlet~;
+#X connect 0 0 8 0;
+#X connect 1 0 7 0;
+#X connect 2 0 0 1;
+#X connect 3 0 2 0;
+#X connect 3 0 6 0;
+#X connect 4 0 3 0;
+#X connect 5 0 1 1;
+#X connect 6 0 5 0;
+#X connect 9 0 1 0;
+#X connect 9 0 0 0;
+#X connect 10 0 4 0;
--- a/SwordSounds/sourceSpeed.pd	Wed Jul 22 18:10:54 2015 +0100
+++ b/SwordSounds/sourceSpeed.pd	Wed Jul 22 20:01:33 2015 +0100
@@ -1,93 +1,135 @@
-#N canvas 117 23 1408 813 10;
-#X obj 212 -172 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+#N canvas 19 30 1408 813 10;
+#X obj 133 -151 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
 -1;
-#X obj 212 -119 s GO;
-#X obj 152 -172 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+#X obj 133 -98 s GO;
+#X obj 73 -151 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
 -1 -1;
-#X obj 152 -119 s setUp;
-#X obj 333 369 line~;
-#X text 342 -151 Start calculation with elevation = 0 \, arm length
+#X obj 73 -98 s setUp;
+#X obj 254 390 line~;
+#X text 263 -130 Start calculation with elevation = 0 \, arm length
 is constant \, acceleration/deceleration is constant.;
-#X obj 220 418 loadbang;
-#X obj 220 439 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj 141 439 loadbang;
+#X obj 141 460 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
-#X obj 220 457 metro 10;
-#X obj 220 479 snapshot~;
-#X floatatom 220 499 5 0 0 0 - - -;
-#X obj 301 515 hsl 128 15 0 80 0 0 empty empty empty -2 -8 0 10 -262144
+#X obj 141 478 metro 10;
+#X obj 141 500 snapshot~;
+#X floatatom 141 520 5 0 0 0 - - -;
+#X obj 222 536 hsl 128 15 0 80 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 0 1;
-#X msg 163 303 \$1 \$2;
-#X obj 163 278 pack;
-#X msg 333 335 0;
-#X obj 162 255 f;
-#X obj 162 210 r GO;
-#X msg 472 337 0 \$1;
-#X obj 471 260 t f b;
-#X obj 472 288 delay;
-#X obj 333 314 r setUp;
-#X text 316 295 Start at 0 speed;
-#X text 514 348 \$1 = time to reach speed of 0;
-#X obj 486 213 r preswingTime;
-#X text 424 173 Trigger once full speed;
-#X obj 333 402 outlet~;
-#X obj 664 -154 inlet;
-#X obj 758 -156 inlet;
-#X obj 664 -131 s \$0_thisGroup;
-#X obj 758 -132 s \$0_thisSource;
-#X text 100 334 \$1 = source speed;
-#X text 100 350 \$2 = time to reach source speed;
-#X obj 188 254 r preswingTime;
-#X obj 667 -35 r \$0_thisGroup;
-#X obj 682 -15 r \$0_thisSource;
-#X obj 667 7 +;
-#X floatatom 621 34 5 0 0 0 - - -;
-#X obj 667 33 s \$0_mySourceNo;
-#X obj 192 -90 r \$0_mySourceNo;
-#X obj 207 -70 r deltaPreCirc;
-#X obj 192 -49 *;
-#X obj 192 -8 +;
-#X obj 207 -29 r minPreCirc;
-#X floatatom 129 13 5 0 0 0 - - -;
-#X obj 207 13 r preswingTime;
-#X obj 192 56 /;
-#X obj 207 34 * 0.001;
-#X obj 192 83 * 2;
-#X text 235 63 Average Speed;
-#X text 232 87 Top Speed for this source;
-#X floatatom 139 109 5 0 0 0 - - -;
-#X obj 454 -84 r \$0_mySourceNo;
-#X obj 454 -43 *;
-#X obj 454 -2 +;
-#X floatatom 391 19 5 0 0 0 - - -;
-#X obj 454 62 /;
-#X obj 469 40 * 0.001;
-#X obj 454 89 * 2;
-#X text 497 69 Average Speed;
-#X text 494 93 Top Speed for this source;
-#X floatatom 401 115 5 0 0 0 - - -;
-#X obj 469 -64 r deltaPostCirc;
-#X obj 469 -23 r minPostCirc;
-#X obj 469 19 r postswingTime;
-#X obj 192 110 s \$0_myPreSourceSpeed;
-#X obj 177 231 r \$0_myPreSourceSpeed;
-#X obj 454 116 s \$0_myPostSourceSpeed;
-#X obj 529 277 r postswingTime;
-#X floatatom 561 300 5 0 0 0 - - -;
-#X obj 471 193 r GO;
-#X obj 471 235 f;
-#X obj 472 315 f;
-#X obj 893 -14 r start_armLength;
-#X obj 878 -36 r length;
-#X obj 878 48 -;
-#X obj 926 29 r NoOfSources;
-#X obj 911 8 r \$0_mySourceNo;
-#X obj 911 51 /;
-#X obj 878 73 *;
-#X floatatom 829 142 5 0 0 0 - - -;
-#X obj 878 116 +;
-#X obj 893 94 r start_armLength;
-#X obj 878 143 outlet;
-#X text 933 142 Distance from centre of arc;
+#X msg 84 324 \$1 \$2;
+#X obj 84 299 pack;
+#X msg 254 356 0;
+#X obj 83 276 f;
+#X obj 83 231 r GO;
+#X msg 393 358 0 \$1;
+#X obj 392 281 t f b;
+#X obj 393 309 delay;
+#X obj 254 335 r setUp;
+#X text 237 316 Start at 0 speed;
+#X text 435 369 \$1 = time to reach speed of 0;
+#X obj 407 234 r preswingTime;
+#X text 345 194 Trigger once full speed;
+#X obj 254 423 outlet~;
+#X obj 585 -133 inlet;
+#X obj 679 -135 inlet;
+#X obj 585 -110 s \$0_thisGroup;
+#X obj 679 -111 s \$0_thisSource;
+#X text 21 355 \$1 = source speed;
+#X text 21 371 \$2 = time to reach source speed;
+#X obj 109 275 r preswingTime;
+#X obj 588 -14 r \$0_thisGroup;
+#X obj 603 6 r \$0_thisSource;
+#X obj 588 28 +;
+#X floatatom 542 55 5 0 0 0 - - -;
+#X obj 588 54 s \$0_mySourceNo;
+#X obj 113 -69 r \$0_mySourceNo;
+#X obj 128 -49 r deltaPreCirc;
+#X obj 113 -28 *;
+#X obj 113 13 +;
+#X obj 128 -8 r minPreCirc;
+#X floatatom 50 34 5 0 0 0 - - -;
+#X obj 128 34 r preswingTime;
+#X obj 113 77 /;
+#X obj 128 55 * 0.001;
+#X obj 113 104 * 2;
+#X text 156 84 Average Speed;
+#X text 153 108 Top Speed for this source;
+#X floatatom 60 130 5 0 0 0 - - -;
+#X obj 375 -63 r \$0_mySourceNo;
+#X obj 375 -22 *;
+#X obj 375 19 +;
+#X floatatom 312 40 5 0 0 0 - - -;
+#X obj 375 83 /;
+#X obj 390 61 * 0.001;
+#X obj 375 110 * 2;
+#X text 418 90 Average Speed;
+#X text 415 114 Top Speed for this source;
+#X floatatom 322 136 5 0 0 0 - - -;
+#X obj 390 -43 r deltaPostCirc;
+#X obj 390 -2 r minPostCirc;
+#X obj 390 40 r postswingTime;
+#X obj 113 131 s \$0_myPreSourceSpeed;
+#X obj 98 252 r \$0_myPreSourceSpeed;
+#X obj 375 137 s \$0_myPostSourceSpeed;
+#X obj 450 298 r postswingTime;
+#X floatatom 482 321 5 0 0 0 - - -;
+#X obj 392 214 r GO;
+#X obj 392 256 f;
+#X obj 393 336 f;
+#X obj 788 -23 r start_armLength;
+#X obj 773 -45 r length;
+#X obj 773 39 -;
+#X obj 821 20 r NoOfSources;
+#X obj 806 -1 r \$0_mySourceNo;
+#X obj 806 42 /;
+#X obj 773 64 *;
+#X floatatom 728 132 5 0 0 0 - - -;
+#X obj 773 107 +;
+#X obj 788 85 r start_armLength;
+#X text 828 133 Distance from centre of arc;
+#X obj 779 297 f;
+#X obj 779 254 r GO;
+#X obj 794 275 r preswingTime;
+#X obj 941 355 line~;
+#X obj 806 419 loadbang;
+#X obj 806 440 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 806 458 metro 10;
+#X obj 806 480 snapshot~;
+#X floatatom 806 500 5 0 0 0 - - -;
+#X obj 887 516 hsl 128 15 -90 270 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 5884 1;
+#X obj 941 254 r setUp;
+#X text 924 235 Start at 0 speed;
+#X obj 941 382 outlet~;
+#X obj 956 275 r presweepAzim;
+#X obj 941 298 f;
+#X msg 941 321 \$1;
+#X msg 779 320 0 \$1;
+#X obj 1065 199 t f b;
+#X obj 1066 227 delay;
+#X obj 1080 152 r preswingTime;
+#X obj 1087 276 r postswingTime;
+#X obj 1065 132 r GO;
+#X obj 1065 174 f;
+#X obj 1066 254 f;
+#X obj 1066 299 pack;
+#X obj 1108 202 r postsweepAzim;
+#X msg 1066 325 \$1 \$2;
+#X obj 1064 -89 r preswingTime;
+#X obj 1049 -67 +;
+#X obj 1036 34 delay;
+#X obj 1034 -19 t f b;
+#X obj 1034 -132 r GO;
+#X obj 1034 -44 f;
+#X obj 1063 11 + 5;
+#X obj 1108 225 * -1;
+#X obj 1049 -111 r postswingTime;
+#X obj 1036 57 s myEnd;
+#X obj 889 254 r myEnd;
+#X obj 773 156 outlet~;
+#X obj 773 132 sig~;
+#X text 1004 374 Current source Azimuth angle;
 #X connect 0 0 1 0;
 #X connect 2 0 3 0;
 #X connect 4 0 9 0;
@@ -151,5 +193,43 @@
 #X connect 77 0 78 1;
 #X connect 78 0 80 0;
 #X connect 80 0 79 0;
-#X connect 80 0 82 0;
+#X connect 80 0 122 0;
 #X connect 81 0 80 1;
+#X connect 83 0 99 0;
+#X connect 84 0 83 0;
+#X connect 85 0 83 1;
+#X connect 86 0 90 0;
+#X connect 86 0 95 0;
+#X connect 87 0 88 0;
+#X connect 88 0 89 0;
+#X connect 89 0 90 0;
+#X connect 90 0 91 0;
+#X connect 90 0 92 0;
+#X connect 93 0 97 0;
+#X connect 96 0 97 1;
+#X connect 97 0 98 0;
+#X connect 98 0 86 0;
+#X connect 99 0 86 0;
+#X connect 100 0 101 1;
+#X connect 100 1 101 0;
+#X connect 101 0 106 0;
+#X connect 102 0 105 1;
+#X connect 103 0 107 1;
+#X connect 104 0 105 0;
+#X connect 105 0 100 0;
+#X connect 106 0 107 0;
+#X connect 107 0 109 0;
+#X connect 108 0 117 0;
+#X connect 109 0 86 0;
+#X connect 110 0 111 1;
+#X connect 111 0 115 1;
+#X connect 112 0 119 0;
+#X connect 113 0 116 0;
+#X connect 113 1 112 0;
+#X connect 114 0 115 0;
+#X connect 115 0 113 0;
+#X connect 116 0 112 1;
+#X connect 117 0 106 1;
+#X connect 118 0 111 0;
+#X connect 120 0 97 0;
+#X connect 122 0 121 0;
--- a/SwordSounds/tenSource.pd	Wed Jul 22 18:10:54 2015 +0100
+++ b/SwordSounds/tenSource.pd	Wed Jul 22 20:01:33 2015 +0100
@@ -122,7 +122,6 @@
 #X obj 973 15 inlet;
 #X obj 973 39 s \$0_elev;
 #X obj 373 353 r \$0_elev;
-#X obj -158 490 woSoFreq;
 #X obj 150 368 r \$0_elev;
 #X obj -39 195 r \$0_elev;
 #X obj -80 470 r \$0_elev;
@@ -132,15 +131,6 @@
 #X obj 630 685 r \$0_elev;
 #X obj 855 457 r \$0_elev;
 #X obj 627 334 r \$0_elev;
-#X obj 313 375 woSoFreq;
-#X obj -159 239 woSoFreq;
-#X obj -155 727 woSoFreq;
-#X obj 77 385 woSoFreq;
-#X obj 80 750 woSoFreq;
-#X obj 303 724 woSoFreq;
-#X obj 537 352 woSoFreq;
-#X obj 541 702 woSoFreq;
-#X obj 772 476 woSoFreq;
 #X obj 99 328 obsPosition;
 #X obj 559 306 obsPosition;
 #X obj 794 427 obsPosition;
@@ -161,19 +151,29 @@
 #X obj -155 598 freqCalcWooD2;
 #X obj -159 109 sourceSpeed;
 #X floatatom 3 169 5 0 0 0 - - -;
+#X obj -158 490 woSoFreq;
+#X obj 313 375 woSoFreq;
+#X obj -155 727 woSoFreq;
+#X obj 77 385 woSoFreq;
+#X obj 80 750 woSoFreq;
+#X obj 303 724 woSoFreq;
+#X obj 537 352 woSoFreq;
+#X obj 541 702 woSoFreq;
+#X obj 772 476 woSoFreq;
+#X obj -159 239 woSoFreqD2;
 #X connect 0 0 1 0;
 #X connect 0 0 12 0;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
 #X connect 3 0 4 0;
-#X connect 5 0 160 0;
+#X connect 5 0 150 0;
 #X connect 6 0 11 1;
 #X connect 7 0 6 1;
 #X connect 8 0 9 0;
 #X connect 9 0 6 0;
 #X connect 10 0 11 0;
-#X connect 11 0 134 1;
-#X connect 11 0 161 0;
+#X connect 11 0 151 0;
+#X connect 11 0 161 1;
 #X connect 12 0 13 0;
 #X connect 12 0 14 0;
 #X connect 12 0 15 0;
@@ -195,126 +195,127 @@
 #X connect 21 0 31 0;
 #X connect 22 0 32 0;
 #X connect 33 0 9 1;
-#X connect 34 0 160 1;
-#X connect 35 0 151 0;
+#X connect 34 0 150 1;
+#X connect 35 0 141 0;
 #X connect 36 0 41 1;
 #X connect 37 0 36 1;
 #X connect 38 0 39 0;
 #X connect 39 0 36 0;
-#X connect 39 0 149 0;
+#X connect 39 0 139 0;
 #X connect 40 0 41 0;
-#X connect 41 0 123 1;
-#X connect 42 0 151 1;
+#X connect 41 0 152 1;
+#X connect 42 0 141 1;
 #X connect 43 0 39 1;
-#X connect 44 0 159 0;
+#X connect 44 0 149 0;
 #X connect 45 0 50 1;
 #X connect 46 0 45 1;
 #X connect 47 0 48 0;
 #X connect 48 0 45 0;
-#X connect 48 0 148 0;
+#X connect 48 0 138 0;
 #X connect 49 0 50 0;
-#X connect 50 0 135 1;
-#X connect 51 0 159 1;
+#X connect 50 0 154 1;
+#X connect 51 0 149 1;
 #X connect 52 0 48 1;
-#X connect 53 0 152 0;
+#X connect 53 0 142 0;
 #X connect 54 0 59 1;
 #X connect 55 0 54 1;
 #X connect 56 0 57 0;
 #X connect 57 0 54 0;
-#X connect 57 0 142 0;
+#X connect 57 0 132 0;
 #X connect 58 0 59 0;
-#X connect 59 0 136 1;
-#X connect 60 0 152 1;
+#X connect 59 0 155 1;
+#X connect 60 0 142 1;
 #X connect 61 0 57 1;
-#X connect 62 0 158 0;
+#X connect 62 0 148 0;
 #X connect 63 0 68 1;
 #X connect 64 0 63 1;
 #X connect 65 0 66 0;
 #X connect 66 0 63 0;
-#X connect 66 0 147 0;
+#X connect 66 0 137 0;
 #X connect 67 0 68 0;
-#X connect 68 0 137 1;
+#X connect 68 0 156 1;
 #X connect 69 0 66 1;
-#X connect 70 0 158 1;
-#X connect 71 0 153 0;
+#X connect 70 0 148 1;
+#X connect 71 0 143 0;
 #X connect 72 0 77 1;
 #X connect 73 0 72 1;
 #X connect 74 0 75 0;
 #X connect 75 0 72 0;
-#X connect 75 0 150 0;
+#X connect 75 0 140 0;
 #X connect 76 0 77 0;
-#X connect 77 0 133 1;
-#X connect 78 0 153 1;
+#X connect 77 0 153 1;
+#X connect 78 0 143 1;
 #X connect 79 0 75 1;
-#X connect 80 0 157 0;
+#X connect 80 0 147 0;
 #X connect 81 0 86 1;
 #X connect 82 0 81 1;
 #X connect 83 0 84 0;
 #X connect 84 0 81 0;
-#X connect 84 0 146 0;
+#X connect 84 0 136 0;
 #X connect 85 0 86 0;
-#X connect 86 0 138 1;
-#X connect 87 0 157 1;
+#X connect 86 0 157 1;
+#X connect 87 0 147 1;
 #X connect 88 0 84 1;
-#X connect 89 0 154 0;
+#X connect 89 0 144 0;
 #X connect 90 0 95 1;
 #X connect 91 0 90 1;
 #X connect 92 0 93 0;
 #X connect 93 0 90 0;
-#X connect 93 0 143 0;
+#X connect 93 0 133 0;
 #X connect 94 0 95 0;
-#X connect 95 0 139 1;
-#X connect 96 0 154 1;
+#X connect 95 0 158 1;
+#X connect 96 0 144 1;
 #X connect 97 0 93 1;
-#X connect 98 0 156 0;
+#X connect 98 0 146 0;
 #X connect 99 0 104 1;
 #X connect 100 0 99 1;
 #X connect 101 0 102 0;
 #X connect 102 0 99 0;
-#X connect 102 0 145 0;
+#X connect 102 0 135 0;
 #X connect 103 0 104 0;
-#X connect 104 0 140 1;
-#X connect 105 0 156 1;
+#X connect 104 0 159 1;
+#X connect 105 0 146 1;
 #X connect 106 0 102 1;
-#X connect 107 0 155 0;
+#X connect 107 0 145 0;
 #X connect 108 0 113 1;
 #X connect 109 0 108 1;
 #X connect 110 0 111 0;
 #X connect 111 0 108 0;
-#X connect 111 0 144 0;
+#X connect 111 0 134 0;
 #X connect 112 0 113 0;
-#X connect 113 0 141 1;
-#X connect 114 0 155 1;
+#X connect 113 0 160 1;
+#X connect 114 0 145 1;
 #X connect 115 0 111 1;
 #X connect 116 0 119 0;
 #X connect 117 0 118 0;
 #X connect 120 0 121 0;
-#X connect 122 0 133 4;
-#X connect 124 0 136 4;
-#X connect 125 0 134 4;
-#X connect 126 0 123 4;
-#X connect 127 0 135 4;
-#X connect 128 0 137 4;
-#X connect 129 0 138 4;
-#X connect 130 0 140 4;
-#X connect 131 0 141 4;
-#X connect 132 0 139 4;
-#X connect 142 0 136 2;
-#X connect 142 1 136 3;
-#X connect 143 0 139 2;
-#X connect 143 1 139 3;
-#X connect 144 0 141 2;
-#X connect 144 1 141 3;
-#X connect 145 0 140 2;
-#X connect 145 1 140 3;
-#X connect 146 0 138 2;
-#X connect 146 1 138 3;
-#X connect 147 0 137 2;
-#X connect 147 1 137 3;
-#X connect 148 0 135 2;
-#X connect 148 1 135 3;
-#X connect 149 0 123 2;
-#X connect 149 1 123 3;
-#X connect 150 0 133 2;
-#X connect 150 1 133 3;
-#X connect 160 0 134 0;
+#X connect 122 0 153 4;
+#X connect 123 0 155 4;
+#X connect 124 0 161 4;
+#X connect 125 0 152 4;
+#X connect 126 0 154 4;
+#X connect 127 0 156 4;
+#X connect 128 0 157 4;
+#X connect 129 0 159 4;
+#X connect 130 0 160 4;
+#X connect 131 0 158 4;
+#X connect 132 0 155 2;
+#X connect 132 1 155 3;
+#X connect 133 0 158 2;
+#X connect 133 1 158 3;
+#X connect 134 0 160 2;
+#X connect 134 1 160 3;
+#X connect 135 0 159 2;
+#X connect 135 1 159 3;
+#X connect 136 0 157 2;
+#X connect 136 1 157 3;
+#X connect 137 0 156 2;
+#X connect 137 1 156 3;
+#X connect 138 0 154 2;
+#X connect 138 1 154 3;
+#X connect 139 0 152 2;
+#X connect 139 1 152 3;
+#X connect 140 0 153 2;
+#X connect 140 1 153 3;
+#X connect 150 0 161 0;
+#X connect 150 1 161 2;
--- a/SwordSounds/woSoFreq.pd	Wed Jul 22 18:10:54 2015 +0100
+++ b/SwordSounds/woSoFreq.pd	Wed Jul 22 20:01:33 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 47 23 1236 817 10;
+#N canvas 58 23 1236 817 10;
 #X text 115 130 Frequency (Hz);
 #X obj 278 606 throw~ l;
 #X obj 305 587 throw~ r;
@@ -22,7 +22,6 @@
 #X obj 458 516 r~ \$0-myRey;
 #X text 529 589 Reynolds Number;
 #X obj 75 -110 inlet~;
-#X obj 278 562 fcpan;
 #X obj 125 54 metro 10;
 #X text 201 162 Mass Density of Air;
 #X obj 293 464 osc~;
@@ -137,7 +136,7 @@
 #X text -20981 74 Diameter;
 #N canvas 1567 153 479 552 angleCalc 0;
 #X obj 307 116 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 9900 1;
+-1 -1 0 1;
 #X text 287 77 Elevation Angle;
 #X obj 236 118 / 360;
 #X obj 236 140 * 6.28319;
@@ -166,7 +165,7 @@
 #X obj 236 90 inlet;
 #X obj 164 57 inlet;
 #X obj 52 80 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4950 1;
+-1 -1 0 1;
 #X text 56 42 Azimuth Angle;
 #X connect 0 0 7 0;
 #X connect 2 0 3 0;
@@ -450,7 +449,6 @@
 #X obj 412 -88 s \$0_elev;
 #X obj 330 -111 inlet;
 #X obj 330 -89 s \$0_azim;
-#X obj 260 -110 inlet;
 #X obj 260 -88 s \$0_dist;
 #X obj 830 31 r~ \$0-myFreq;
 #X obj 796 -19 noise~;
@@ -506,12 +504,20 @@
 #X obj 320 19 abs;
 #X obj 320 41 s \$0_thisPan;
 #X obj 305 540 r \$0_thisPan;
+#X obj 744 -100 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 744 -47 s GO;
+#X obj 684 -100 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj 684 -47 s setUp;
+#X obj 278 562 fcpan;
+#X obj 260 -110 inlet~;
 #X connect 3 0 5 0;
 #X connect 3 0 7 0;
-#X connect 4 0 22 0;
+#X connect 4 0 21 0;
 #X connect 6 0 10 0;
 #X connect 8 0 4 0;
-#X connect 9 0 21 0;
+#X connect 9 0 139 0;
 #X connect 12 0 3 0;
 #X connect 13 0 16 0;
 #X connect 14 0 13 0;
@@ -519,99 +525,101 @@
 #X connect 17 0 15 0;
 #X connect 18 0 13 0;
 #X connect 20 0 11 0;
-#X connect 21 0 1 0;
-#X connect 21 1 2 0;
-#X connect 22 0 3 0;
-#X connect 24 0 34 0;
-#X connect 25 0 27 0;
-#X connect 26 0 29 1;
-#X connect 26 0 48 0;
-#X connect 27 0 26 0;
-#X connect 28 0 31 0;
-#X connect 29 0 53 0;
-#X connect 30 0 28 0;
-#X connect 31 0 24 0;
-#X connect 31 0 45 0;
-#X connect 34 0 9 1;
+#X connect 21 0 3 0;
+#X connect 23 0 33 0;
+#X connect 24 0 26 0;
+#X connect 25 0 28 1;
+#X connect 25 0 47 0;
+#X connect 26 0 25 0;
+#X connect 27 0 30 0;
+#X connect 28 0 52 0;
+#X connect 29 0 27 0;
+#X connect 30 0 23 0;
+#X connect 30 0 44 0;
+#X connect 33 0 9 1;
+#X connect 35 0 36 0;
 #X connect 36 0 37 0;
-#X connect 37 0 38 0;
-#X connect 38 0 9 0;
+#X connect 37 0 9 0;
+#X connect 38 0 26 1;
 #X connect 39 0 27 1;
-#X connect 40 0 28 1;
-#X connect 41 0 30 1;
-#X connect 42 0 25 0;
-#X connect 44 0 38 1;
-#X connect 46 0 36 0;
-#X connect 47 0 34 1;
-#X connect 52 0 29 0;
-#X connect 53 0 54 0;
-#X connect 54 0 56 1;
-#X connect 55 0 56 0;
-#X connect 56 0 43 0;
-#X connect 56 0 30 0;
-#X connect 57 0 68 1;
-#X connect 58 0 68 0;
-#X connect 59 0 61 1;
-#X connect 60 0 61 0;
-#X connect 61 0 66 0;
-#X connect 61 1 67 0;
-#X connect 62 0 61 2;
-#X connect 63 0 61 6;
-#X connect 64 0 61 5;
-#X connect 65 0 61 4;
-#X connect 68 0 74 0;
-#X connect 68 1 73 0;
-#X connect 69 0 68 2;
-#X connect 70 0 68 6;
-#X connect 71 0 68 4;
-#X connect 72 0 68 5;
-#X connect 77 0 68 3;
-#X connect 78 0 61 3;
-#X connect 79 0 80 0;
-#X connect 81 0 82 0;
-#X connect 83 0 84 0;
-#X connect 85 0 106 1;
-#X connect 86 0 126 0;
+#X connect 40 0 29 1;
+#X connect 41 0 24 0;
+#X connect 43 0 37 1;
+#X connect 45 0 35 0;
+#X connect 46 0 33 1;
+#X connect 51 0 28 0;
+#X connect 52 0 53 0;
+#X connect 53 0 55 1;
+#X connect 54 0 55 0;
+#X connect 55 0 42 0;
+#X connect 55 0 29 0;
+#X connect 56 0 67 1;
+#X connect 57 0 67 0;
+#X connect 58 0 60 1;
+#X connect 59 0 60 0;
+#X connect 60 0 65 0;
+#X connect 60 1 66 0;
+#X connect 61 0 60 2;
+#X connect 62 0 60 6;
+#X connect 63 0 60 5;
+#X connect 64 0 60 4;
+#X connect 67 0 73 0;
+#X connect 67 1 72 0;
+#X connect 68 0 67 2;
+#X connect 69 0 67 6;
+#X connect 70 0 67 4;
+#X connect 71 0 67 5;
+#X connect 76 0 67 3;
+#X connect 77 0 60 3;
+#X connect 78 0 79 0;
+#X connect 80 0 81 0;
+#X connect 83 0 104 1;
+#X connect 84 0 124 0;
+#X connect 88 0 89 0;
+#X connect 88 0 104 2;
 #X connect 90 0 91 0;
-#X connect 90 0 106 2;
-#X connect 92 0 93 0;
-#X connect 93 0 118 0;
-#X connect 94 0 115 0;
-#X connect 95 0 105 0;
-#X connect 96 0 127 0;
+#X connect 91 0 116 0;
+#X connect 92 0 113 0;
+#X connect 93 0 103 0;
+#X connect 94 0 125 0;
+#X connect 98 0 99 0;
+#X connect 98 0 105 2;
 #X connect 100 0 101 0;
-#X connect 100 0 107 2;
-#X connect 102 0 103 0;
-#X connect 103 0 119 0;
-#X connect 104 0 114 0;
-#X connect 105 0 107 1;
-#X connect 106 0 89 0;
-#X connect 107 0 99 0;
-#X connect 108 0 87 0;
-#X connect 108 1 88 0;
-#X connect 109 0 97 0;
-#X connect 109 1 98 0;
-#X connect 110 0 89 1;
-#X connect 111 0 99 1;
-#X connect 112 0 100 0;
-#X connect 113 0 90 0;
-#X connect 114 0 117 0;
-#X connect 115 0 116 0;
-#X connect 116 0 113 0;
-#X connect 117 0 112 0;
-#X connect 118 0 90 0;
-#X connect 119 0 100 0;
-#X connect 120 0 108 1;
-#X connect 121 0 109 1;
-#X connect 124 0 111 0;
-#X connect 125 0 110 0;
-#X connect 126 0 106 0;
-#X connect 127 0 107 0;
-#X connect 128 0 126 1;
+#X connect 101 0 117 0;
+#X connect 102 0 112 0;
+#X connect 103 0 105 1;
+#X connect 104 0 87 0;
+#X connect 105 0 97 0;
+#X connect 106 0 85 0;
+#X connect 106 1 86 0;
+#X connect 107 0 95 0;
+#X connect 107 1 96 0;
+#X connect 108 0 87 1;
+#X connect 109 0 97 1;
+#X connect 110 0 98 0;
+#X connect 111 0 88 0;
+#X connect 112 0 115 0;
+#X connect 113 0 114 0;
+#X connect 114 0 111 0;
+#X connect 115 0 110 0;
+#X connect 116 0 88 0;
+#X connect 117 0 98 0;
+#X connect 118 0 106 1;
+#X connect 119 0 107 1;
+#X connect 122 0 109 0;
+#X connect 123 0 108 0;
+#X connect 124 0 104 0;
+#X connect 125 0 105 0;
+#X connect 126 0 124 1;
+#X connect 127 0 128 0;
+#X connect 128 0 125 1;
 #X connect 129 0 130 0;
-#X connect 130 0 127 1;
+#X connect 130 0 131 0;
 #X connect 131 0 132 0;
 #X connect 132 0 133 0;
-#X connect 133 0 134 0;
-#X connect 134 0 135 0;
-#X connect 136 0 21 1;
+#X connect 134 0 139 1;
+#X connect 135 0 136 0;
+#X connect 137 0 138 0;
+#X connect 139 0 1 0;
+#X connect 139 1 2 0;
+#X connect 140 0 82 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SwordSounds/woSoFreqD2.pd	Wed Jul 22 20:01:33 2015 +0100
@@ -0,0 +1,631 @@
+#N canvas 175 89 1319 828 10;
+#X text 125 140 Frequency (Hz);
+#X obj 288 616 throw~ l;
+#X obj 315 597 throw~ r;
+#X obj 135 89 snapshot~;
+#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 185 -100 inlet;
+#X obj 215 114 outlet;
+#X obj 135 16 loadbang;
+#X obj 288 529 +~;
+#X obj 185 -77 s \$0-diameter;
+#X obj 85 -77 s~ \$0-windSpeed;
+#X obj 49 64 r~ \$0-myFreq;
+#X obj 554 551 snapshot~;
+#X obj 554 526 metro 100;
+#X obj 554 504 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 554 577 10 0 0 0 - - -;
+#X obj 554 478 loadbang;
+#X obj 468 526 r~ \$0-myRey;
+#X text 539 599 Reynolds Number;
+#X obj 85 -100 inlet~;
+#X obj 135 64 metro 10;
+#X text 211 172 Mass Density of Air;
+#X obj 303 474 osc~;
+#X obj 333 173 *~ 1.225;
+#X obj 333 248 /~ 1.81e-05;
+#X obj 333 203 *~ 1;
+#X obj 303 423 /~ 1;
+#X obj 318 291 /~;
+#X obj 303 399 *~;
+#X obj 303 448 clip~ 0 20000;
+#X text 174 241 Reynolds Number;
+#X text 187 415 Strouhal Number;
+#X obj 303 504 *~;
+#X text 363 228 Viscosity;
+#X obj 67 425 *~ 2;
+#X obj 67 452 osc~;
+#X obj 67 474 *~;
+#X obj 394 172 r \$0-diameter;
+#X obj 383 372 r \$0-diameter;
+#X obj 382 341 r~ \$0-windSpeed;
+#X obj 333 145 r~ \$0-windSpeed;
+#X obj 238 398 s~ \$0_str;
+#X obj 100 452 r~ \$0_dragDiGain;
+#X obj 218 474 s~ \$0-myFreq;
+#X obj 67 404 r~ \$0-myFreq;
+#X obj 341 474 r~ \$0_liftDiGain;
+#X obj 346 272 s~ \$0-myRey;
+#X text 54 287 Calculates the frequency;
+#X text 54 300 based on the physics of;
+#X text 55 313 the object and environment;
+#X obj 284 252 sig~ 1;
+#X obj 318 317 sqrt~;
+#X obj 318 342 *~ 1.0356;
+#X obj 244 333 sig~ 0.2684;
+#X obj 303 372 -~;
+#X obj 566 -52 r~ \$0-windSpeed;
+#X obj 556 -73 r~ \$0_str;
+#X obj 563 207 r~ \$0-windSpeed;
+#X obj 552 184 r~ \$0_str;
+#N canvas 515 100 622 660 noiseGain 0;
+#X text -21205 129 Mass Density of Air \, squared;
+#X text -20857 164 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 -20859 118 *;
+#X obj -20859 141 * 118033;
+#X obj -21022 193 /~ 1;
+#X obj -21021 422 *~ 0.27;
+#X text -20859 71 Distance;
+#X obj -20890 352 cos;
+#X obj -20890 307 / 360;
+#X floatatom -20863 403 8 0 0 0 - - -;
+#X obj -20890 376 *;
+#X obj -20911 435 *~ 0.27;
+#X obj -20890 329 * 6.28319;
+#X obj -21000 282 + 90;
+#X text -20895 510 Calculates Drag Dipole gain;
+#X text -21175 486 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 222 s~ \$0-c;
+#X obj -20948 385 r~ \$0-c;
+#X obj -21070 7 inlet~;
+#X obj -21022 7 inlet~;
+#X obj -20989 55 inlet;
+#X obj -20942 229 inlet;
+#X obj -20873 229 inlet;
+#X obj -20859 92 inlet;
+#X obj -21021 465 outlet~;
+#X obj -20911 485 outlet~;
+#X text -20947 211 Azimuth;
+#X text -20871 210 Elevation;
+#X text -20961 26 Gain proportional to windspeed to power 8 for spectrum
+;
+#X text -20981 74 Diameter;
+#N canvas 1567 153 479 552 angleCalc 0;
+#X obj 307 116 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X text 287 77 Elevation Angle;
+#X obj 236 118 / 360;
+#X obj 236 140 * 6.28319;
+#X obj 164 80 / 360;
+#X obj 164 102 * 6.28319;
+#X floatatom 49 106 5 0 0 0 - - -;
+#X floatatom 304 140 5 0 0 0 - - -;
+#X obj 278 443 * 360;
+#X floatatom 325 494 5 0 0 0 - - -;
+#X obj 278 467 / 6.28319;
+#X obj 236 235 *;
+#X obj 236 267 swap 1;
+#X obj 236 300 -;
+#X obj 236 329 sqrt;
+#X obj 278 360 /;
+#X obj 278 388 atan;
+#X obj 278 414 * 2;
+#X text 318 296 Arccos of angle;
+#X obj 293 236 + 1;
+#X obj 164 126 cos;
+#X obj 236 171 cos;
+#X obj 236 205 *;
+#X obj 164 149 t f b;
+#X obj 162 174 delay 9;
+#X obj 278 494 outlet;
+#X obj 236 90 inlet;
+#X obj 164 57 inlet;
+#X obj 52 80 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X text 56 42 Azimuth Angle;
+#X connect 0 0 7 0;
+#X connect 2 0 3 0;
+#X connect 3 0 21 0;
+#X connect 4 0 5 0;
+#X connect 5 0 20 0;
+#X connect 8 0 10 0;
+#X connect 10 0 9 0;
+#X connect 10 0 25 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 12 1 13 1;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 8 0;
+#X connect 19 0 15 1;
+#X connect 20 0 23 0;
+#X connect 21 0 22 0;
+#X connect 22 0 11 0;
+#X connect 22 0 11 1;
+#X connect 22 0 19 0;
+#X connect 23 0 22 1;
+#X connect 23 1 24 0;
+#X connect 24 0 22 0;
+#X connect 26 0 2 0;
+#X connect 26 0 0 0;
+#X connect 27 0 4 0;
+#X connect 27 0 28 0;
+#X connect 28 0 6 0;
+#X restore -20942 252 pd angleCalc;
+#X obj -20951 117 inlet;
+#X obj -20951 142 *;
+#X obj -21022 167 *~ 1;
+#X text -20953 99 Length;
+#X obj -21000 305 / 360;
+#X obj -21000 351 cos;
+#X obj -21000 375 *;
+#X obj -21000 328 * 6.28319;
+#X obj -21021 397 *~ 1;
+#X obj -20911 411 *~ 1;
+#X text -20848 459 Need for scienctific reasoning here!;
+#X text -21239 441 Need for scienctific reasoning here!;
+#X obj -21021 444 *~ 0.02;
+#X obj -20911 460 *~ 0.002;
+#X connect 2 0 3 1;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 5 0 38 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 1;
+#X connect 8 0 21 0;
+#X connect 8 0 44 0;
+#X connect 9 0 48 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 45 1;
+#X connect 15 0 49 0;
+#X connect 16 0 11 0;
+#X connect 17 0 40 0;
+#X connect 20 0 3 0;
+#X connect 22 0 45 0;
+#X connect 23 0 2 0;
+#X connect 23 0 2 1;
+#X connect 24 0 20 0;
+#X connect 25 0 4 1;
+#X connect 26 0 35 0;
+#X connect 27 0 35 1;
+#X connect 28 0 6 0;
+#X connect 28 0 6 1;
+#X connect 35 0 17 0;
+#X connect 35 0 12 0;
+#X connect 36 0 37 0;
+#X connect 36 0 37 1;
+#X connect 37 0 38 1;
+#X connect 38 0 8 0;
+#X connect 40 0 43 0;
+#X connect 41 0 42 0;
+#X connect 41 0 42 1;
+#X connect 42 0 44 1;
+#X connect 43 0 41 0;
+#X connect 44 0 9 0;
+#X connect 45 0 15 0;
+#X connect 48 0 29 0;
+#X connect 49 0 30 0;
+#X restore 552 336 pd noiseGain;
+#X obj 575 228 r \$0-diameter;
+#X obj 621 312 r \$0_dist;
+#X obj 609 290 r \$0_azim;
+#X obj 598 269 r \$0_elev;
+#X obj 552 381 s~ \$0_liftNoiseGain;
+#X obj 621 359 s~ \$0_dragNoiseGain;
+#N canvas 242 208 702 650 freqGain 1;
+#X text 36 127 Mass Density of Air \, squared;
+#X text 508 93 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 219 506 *~ 0.27;
+#X text 380 261 Azimuth;
+#X text 497 1 Distance;
+#X obj 419 420 cos;
+#X obj 419 375 / 360;
+#X floatatom 446 466 8 0 0 0 - - -;
+#X obj 419 444 *;
+#X obj 398 491 *~ 0.27;
+#X obj 236 269 s~ \$0-a;
+#X obj 357 441 r~ \$0-a;
+#X obj 419 397 * 6.28319;
+#N canvas 131 175 477 312 angleCalc 0;
+#X obj 297 33 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X text 233 6 Elevation Angle;
+#X obj 242 59 / 360;
+#X obj 242 81 * 6.28319;
+#X obj 170 21 / 360;
+#X obj 170 43 * 6.28319;
+#X floatatom 50 22 5 0 0 0 - - -;
+#X floatatom 294 57 5 0 0 0 - - -;
+#X floatatom 204 196 5 0 0 0 - - -;
+#X obj 170 67 cos;
+#X obj 242 112 cos;
+#X obj 242 146 *;
+#X obj 170 90 t f b;
+#X obj 168 115 delay 9;
+#X obj 242 197 outlet;
+#X obj 242 31 inlet;
+#X obj 170 -6 inlet;
+#X obj 53 -4 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X text 136 -30 Azimuth Angle;
+#X obj 242 172 arccos;
+#X connect 0 0 7 0;
+#X connect 0 0 2 0;
+#X connect 2 0 3 0;
+#X connect 3 0 10 0;
+#X connect 4 0 5 0;
+#X connect 5 0 9 0;
+#X connect 9 0 12 0;
+#X connect 10 0 11 0;
+#X connect 11 0 19 0;
+#X connect 12 0 11 1;
+#X connect 12 1 13 0;
+#X connect 13 0 11 0;
+#X connect 15 0 2 0;
+#X connect 16 0 4 0;
+#X connect 17 0 6 0;
+#X connect 17 0 4 0;
+#X connect 19 0 14 0;
+#X connect 19 0 8 0;
+#X restore 365 297 pd angleCalc;
+#X text 451 260 Elevation;
+#X text 476 498 Calculates Drag Dipole gain;
+#X text 48 445 Calculates Lift Dipole gain;
+#X obj 398 516 *~ 0.1;
+#X obj 173 8 inlet~;
+#X obj 219 7 inlet~;
+#X text 256 54 Diameter;
+#X obj 250 69 inlet;
+#X obj 434 275 inlet;
+#X obj 219 530 outlet~;
+#X obj 398 541 outlet~;
+#X obj 297 125 inlet;
+#X obj 297 149 *;
+#X obj 219 193 *~ 1;
+#X text 292 106 Length;
+#X obj 398 467 *~ 1;
+#X obj 305 247 arccos;
+#X obj 305 223 r sigMac;
+#X obj 240 362 +;
+#X obj 305 269 t f b;
+#X obj 240 323 delay 9;
+#X text 309 203 Replicates Doppler effect;
+#X obj 506 20 inlet~;
+#X obj 506 45 *~;
+#X obj 506 70 *~ 118033;
+#X obj 219 240 /~;
+#X obj 365 276 inlet~;
+#X obj 240 388 /~ 360;
+#X obj 240 411 *~ 6.28319;
+#X obj 240 434 cos~;
+#X obj 240 458 *~;
+#X obj 219 481 *~;
+#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 32 0;
+#X connect 7 0 28 0;
+#X connect 10 0 13 0;
+#X connect 10 0 13 1;
+#X connect 11 0 17 0;
+#X connect 13 0 12 0;
+#X connect 13 0 34 1;
+#X connect 14 0 22 0;
+#X connect 16 0 34 0;
+#X connect 17 0 10 0;
+#X connect 18 0 11 0;
+#X connect 22 0 29 0;
+#X connect 23 0 3 0;
+#X connect 23 0 3 1;
+#X connect 24 0 2 0;
+#X connect 26 0 5 1;
+#X connect 27 0 18 1;
+#X connect 30 0 31 0;
+#X connect 30 0 31 1;
+#X connect 31 0 32 1;
+#X connect 32 0 44 0;
+#X connect 34 0 14 0;
+#X connect 35 0 38 0;
+#X connect 36 0 35 0;
+#X connect 38 0 37 1;
+#X connect 38 1 39 0;
+#X connect 39 0 37 0;
+#X connect 41 0 42 1;
+#X connect 41 0 42 0;
+#X connect 42 0 43 0;
+#X connect 43 0 44 1;
+#X connect 44 0 15 0;
+#X connect 44 0 50 0;
+#X connect 45 0 18 0;
+#X connect 45 0 46 0;
+#X connect 46 0 47 0;
+#X connect 47 0 48 0;
+#X connect 48 0 49 0;
+#X connect 48 0 49 1;
+#X connect 49 0 50 1;
+#X connect 50 0 7 0;
+#X restore 556 78 pd freqGain;
+#X obj 577 -31 r \$0-diameter;
+#X obj 608 35 r \$0_elev;
+#X obj 619 102 s~ \$0_dragDiGain;
+#X obj 556 122 s~ \$0_liftDiGain;
+#X text 546 139 Calculates the gain of the dipole source;
+#X text 543 400 Calculates the gain of the source;
+#X obj 587 -8 r length;
+#X obj 586 249 r length;
+#X obj 422 -100 inlet;
+#X obj 422 -78 s \$0_elev;
+#X obj 840 41 r~ \$0-myFreq;
+#X obj 806 -9 noise~;
+#X obj 883 225 throw~ l;
+#X obj 910 204 throw~ r;
+#X obj 883 132 *~;
+#X obj 1021 42 snapshot~;
+#X floatatom 1021 68 10 0 0 0 - - -;
+#X obj 1021 -31 loadbang;
+#X obj 1021 -6 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 932 -60 r~ \$0-myRey;
+#X obj 848 393 r~ \$0-myFreq;
+#X obj 814 322 noise~;
+#X obj 891 582 throw~ l;
+#X obj 918 559 throw~ r;
+#X obj 891 490 *~;
+#X obj 1029 402 snapshot~;
+#X floatatom 1029 428 10 0 0 0 - - -;
+#X obj 1029 329 loadbang;
+#X obj 1029 354 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 940 300 r~ \$0-myRey;
+#X obj 848 419 *~ 2;
+#X obj 806 84 vcf~ 1000 10;
+#X obj 814 444 vcf~ 1000 10;
+#X obj 898 105 *~ 1;
+#X obj 906 465 *~ 1;
+#X obj 940 375 clip~ 2 400;
+#X obj 932 15 clip~ 2 400;
+#X obj 940 324 *~ -0.003;
+#X obj 932 -36 *~ -0.003;
+#X obj 932 -11 +~ 20;
+#X obj 940 349 +~ 20;
+#X obj 1021 17 metro 10;
+#X obj 1029 377 metro 10;
+#X text 942 478 Drag Dipole spectrum calculation;
+#X text 937 122 Lift Dipole spectrum calculation;
+#X obj 906 442 r~ \$0_dragNoiseGain;
+#X obj 898 63 r~ \$0_liftNoiseGain;
+#X obj 806 38 hip~;
+#X obj 814 419 hip~;
+#X obj 827 15 r \$0_contFreq;
+#X obj 835 343 r \$0_contFreq;
+#X obj 835 366 * 2;
+#X obj 754 -90 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 754 -37 s GO;
+#X obj 694 -90 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj 694 -37 s setUp;
+#X obj 270 -100 inlet~;
+#X obj 340 -101 inlet~;
+#X obj 270 -78 s~ \$0_dist;
+#X obj 340 -79 s~ \$0_azim;
+#X obj 330 -37 r~ \$0_azim;
+#X obj 330 6 +~ 0.5;
+#X obj 332 103 s~ \$0_thisPan;
+#X obj 918 512 r~ \$0_thisPan;
+#X obj 288 572 fcpan~;
+#X obj 315 550 r~ \$0_thisPan;
+#X obj 891 534 fcpan~;
+#X obj 619 57 r~ \$0_dist;
+#X obj 598 14 r~ \$0_azim;
+#X obj 427 86 snapshot~;
+#X floatatom 427 112 10 0 0 0 - - -;
+#X obj 427 13 loadbang;
+#X obj 427 61 metro 10;
+#X obj 425 37 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 330 -15 /~ 360;
+#X obj 910 157 r~ \$0_thisPan;
+#X obj 883 181 fcpan~;
+#X connect 3 0 5 0;
+#X connect 3 0 7 0;
+#X connect 4 0 21 0;
+#X connect 6 0 10 0;
+#X connect 8 0 4 0;
+#X connect 9 0 132 0;
+#X connect 12 0 3 0;
+#X connect 13 0 16 0;
+#X connect 14 0 13 0;
+#X connect 15 0 14 0;
+#X connect 17 0 15 0;
+#X connect 18 0 13 0;
+#X connect 20 0 11 0;
+#X connect 21 0 3 0;
+#X connect 23 0 33 0;
+#X connect 24 0 26 0;
+#X connect 25 0 28 1;
+#X connect 25 0 47 0;
+#X connect 26 0 25 0;
+#X connect 27 0 30 0;
+#X connect 28 0 52 0;
+#X connect 29 0 27 0;
+#X connect 30 0 23 0;
+#X connect 30 0 44 0;
+#X connect 33 0 9 1;
+#X connect 35 0 36 0;
+#X connect 36 0 37 0;
+#X connect 37 0 9 0;
+#X connect 38 0 26 1;
+#X connect 39 0 27 1;
+#X connect 40 0 29 1;
+#X connect 41 0 24 0;
+#X connect 43 0 37 1;
+#X connect 45 0 35 0;
+#X connect 46 0 33 1;
+#X connect 51 0 28 0;
+#X connect 52 0 53 0;
+#X connect 53 0 55 1;
+#X connect 54 0 55 0;
+#X connect 55 0 42 0;
+#X connect 55 0 29 0;
+#X connect 56 0 67 1;
+#X connect 57 0 67 0;
+#X connect 58 0 60 1;
+#X connect 59 0 60 0;
+#X connect 60 0 65 0;
+#X connect 60 1 66 0;
+#X connect 61 0 60 2;
+#X connect 62 0 60 6;
+#X connect 63 0 60 5;
+#X connect 64 0 60 4;
+#X connect 67 0 71 0;
+#X connect 67 1 70 0;
+#X connect 68 0 67 2;
+#X connect 69 0 67 5;
+#X connect 74 0 67 3;
+#X connect 75 0 60 3;
+#X connect 76 0 77 0;
+#X connect 78 0 99 1;
+#X connect 79 0 115 0;
+#X connect 82 0 144 0;
+#X connect 83 0 84 0;
+#X connect 83 0 99 2;
+#X connect 85 0 86 0;
+#X connect 86 0 109 0;
+#X connect 87 0 106 0;
+#X connect 88 0 98 0;
+#X connect 89 0 116 0;
+#X connect 92 0 134 0;
+#X connect 93 0 94 0;
+#X connect 93 0 100 2;
+#X connect 95 0 96 0;
+#X connect 96 0 110 0;
+#X connect 97 0 105 0;
+#X connect 98 0 100 1;
+#X connect 99 0 82 0;
+#X connect 100 0 92 0;
+#X connect 101 0 82 1;
+#X connect 102 0 92 1;
+#X connect 103 0 93 0;
+#X connect 104 0 83 0;
+#X connect 105 0 108 0;
+#X connect 106 0 107 0;
+#X connect 107 0 104 0;
+#X connect 108 0 103 0;
+#X connect 109 0 83 0;
+#X connect 110 0 93 0;
+#X connect 113 0 102 0;
+#X connect 114 0 101 0;
+#X connect 115 0 99 0;
+#X connect 116 0 100 0;
+#X connect 117 0 115 1;
+#X connect 118 0 119 0;
+#X connect 119 0 116 1;
+#X connect 120 0 121 0;
+#X connect 122 0 123 0;
+#X connect 124 0 126 0;
+#X connect 125 0 127 0;
+#X connect 128 0 142 0;
+#X connect 129 0 130 0;
+#X connect 129 0 137 0;
+#X connect 131 0 134 1;
+#X connect 132 0 1 0;
+#X connect 132 1 2 0;
+#X connect 133 0 132 1;
+#X connect 134 0 90 0;
+#X connect 134 1 91 0;
+#X connect 137 0 138 0;
+#X connect 139 0 141 0;
+#X connect 140 0 137 0;
+#X connect 141 0 140 0;
+#X connect 142 0 129 0;
+#X connect 143 0 144 1;
+#X connect 144 0 80 0;
+#X connect 144 1 81 0;
--- a/SwordSounds/woosh_D5.pd	Wed Jul 22 18:10:54 2015 +0100
+++ b/SwordSounds/woosh_D5.pd	Wed Jul 22 20:01:33 2015 +0100
@@ -1,9 +1,9 @@
-#N canvas 80 23 1253 824 10;
+#N canvas -80 44 1412 817 10;
 #X obj 551 -93 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 614 -93 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X text 611 -184 Gain;
 #X obj 550 -210 loadbang;
-#N canvas 865 368 284 318 opLevels 0;
+#N canvas 865 368 284 318 opLevels 1;
 #X obj 85 188 dac~;
 #X obj 30 70 catch~ l;
 #X obj 155 76 catch~ r;
@@ -18,7 +18,7 @@
 #X obj 155 30 r NoOfSources;
 #X obj 155 132 /~ 1;
 #X obj 30 131 /~ 1;
-#X obj 155 49 / 20;
+#X obj 155 49 / 2;
 #X connect 1 0 4 0;
 #X connect 2 0 3 0;
 #X connect 3 0 12 0;
@@ -132,14 +132,14 @@
 #X obj -178 -183 s NoOfSources;
 #X obj 85 141 s topSpeed;
 #X obj 33 115 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2857 1;
+-1 -1 3457 1;
 #X floatatom 30 141 8 0 0 0 - - -;
 #X text 57 -216 Blade Length;
 #X text 56 -150 Arm Length;
 #X text -150 -206 Number of Sources;
 #X text 141 119 Top Speed;
 #X obj 820 -141 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4412 1;
+-1 -1 2112 1;
 #X floatatom 817 -109 8 0 0 0 - - -;
 #X obj 518 174 s firstSpeed;
 #X obj 613 173 s deltaSpeed;
@@ -169,9 +169,9 @@
 #X connect 10 0 5 0;
 #X restore 382 -113 pd thickCalc;
 #X obj 27 202 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2805 1;
+-1 -1 7305 1;
 #X obj 26 287 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2475 1;
+-1 -1 8775 1;
 #X floatatom 24 232 8 0 0 0 - - -;
 #X obj 78 231 s hiltThick;
 #X floatatom 23 315 8 0 0 0 - - -;
@@ -193,7 +193,7 @@
 0 1;
 #X obj 224 -197 metro 200;
 #X obj 278 -221 hsl 100 20 300 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 0 1;
+-262144 -1 -1 700 1;
 #X obj 164 -170 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
 -1 -1;
 #X obj 164 -117 s setUp;
@@ -205,7 +205,7 @@
 #X obj -317 191 r setUp;
 #X obj -203 155 s obsDistance;
 #X obj -207 242 s obsAngle;
-#N canvas 250 113 911 675 circumferCalc 1;
+#N canvas 250 113 911 675 circumferCalc 0;
 #X obj 440 104 +;
 #X obj 440 127 s length;
 #X obj 168 153 r start_armLength;
@@ -445,7 +445,7 @@
 #X connect 76 0 48 0;
 #X restore 381 -146 pd angleCalc;
 #X obj 553 -165 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3118 1;
+-1 -1 618 1;
 #X obj 24 -239 loadbang;
 #X obj 22 -170 loadbang;
 #X obj -178 -228 loadbang;
@@ -516,60 +516,10 @@
 #X obj 33 14 r setUp;
 #X msg 33 61 10;
 #X obj 84 120 r elev;
-#X obj 202 116 r distance;
-#X obj 185 95 r angle;
-#X obj 168 54 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 168 26 r setUp;
-#X obj 219 132 r elev;
-#X msg 168 73 9;
-#X obj 66 269 r distance;
-#X obj 49 248 r angle;
-#X obj 32 207 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 32 179 r setUp;
-#X obj 83 285 r elev;
-#X obj 195 278 r distance;
-#X obj 178 257 r angle;
-#X obj 161 216 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 161 188 r setUp;
-#X obj 212 294 r elev;
-#X obj 63 420 r distance;
-#X obj 46 399 r angle;
-#X obj 29 358 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 29 330 r setUp;
-#X obj 80 436 r elev;
-#X msg 29 377 6;
-#X msg 161 235 7;
-#X msg 32 226 8;
-#X obj 197 427 r distance;
-#X obj 180 406 r angle;
-#X obj 163 365 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 163 337 r setUp;
-#X obj 214 443 r elev;
-#X msg 163 384 5;
 #X obj 27 147 tenSource;
-#X obj 169 157 tenSource;
-#X obj 29 305 tenSource;
-#X obj 161 318 tenSource;
-#X obj 32 461 tenSource;
-#X obj 168 470 tenSource;
 #X connect 2 0 4 0;
 #X connect 3 0 2 0;
-#X connect 4 0 36 0;
-#X connect 8 0 11 0;
-#X connect 9 0 8 0;
-#X connect 14 0 29 0;
-#X connect 15 0 14 0;
-#X connect 19 0 28 0;
-#X connect 20 0 19 0;
-#X connect 24 0 27 0;
-#X connect 25 0 24 0;
-#X connect 32 0 35 0;
-#X connect 33 0 32 0;
+#X connect 4 0 6 0;
 #X restore 381 -85 pd allSource;
 #X obj 865 81 s presweepElev;
 #X obj 863 159 s postsweepElev;