Mercurial > hg > weather-synthesis-prototyping

changeset 291:9b4152202ec1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
EdgeTone Started
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Mon, 29 May 2017 20:12:36 +0100
parents 25ad577fa549
children f145954b62f1
files .DS_Store EdgeTonePatches/EdgeToneD1.pd EdgeTonePatches/arccos.pd EdgeTonePatches/fcpan.pd MechAeolian/MA_Test3.pd MechAeolian/MechAeolianD3.pd MechAeolian/harpD2.pd
diffstat 7 files changed, 625 insertions(+), 185 deletions(-) [+]
line wrap: on
line diff
Binary file .DS_Store has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/EdgeTonePatches/EdgeToneD1.pd	Mon May 29 20:12:36 2017 +0100
@@ -0,0 +1,382 @@
+#N canvas 415 171 940 594 10;
+#N canvas 322 154 491 423 Dipoles 0;
+#X obj 210 217 *~;
+#X obj 210 308 throw~ l;
+#X obj 237 285 throw~ r;
+#X obj 210 264 fcpan;
+#X text 101 35 Generates the sound associated with the lift dipole.
+;
+#X obj 210 108 vcf~ 10;
+#X obj 210 131 vcf~ 10;
+#X obj 284 95 r \$0-Qval;
+#X floatatom 255 263 5 0 0 0 - - -;
+#X obj 362 158 r myMet;
+#X obj 362 178 snapshot~;
+#X floatatom 362 199 0 0 0 0 - - -;
+#X obj 210 67 inlet~;
+#X obj 225 196 inlet~;
+#X obj 131 67 inlet~;
+#X obj 237 242 r centrePan;
+#X connect 0 0 3 0;
+#X connect 3 0 1 0;
+#X connect 3 1 2 0;
+#X connect 5 0 6 0;
+#X connect 6 0 0 0;
+#X connect 7 0 5 2;
+#X connect 7 0 6 2;
+#X connect 9 0 10 0;
+#X connect 10 0 11 0;
+#X connect 12 0 5 0;
+#X connect 13 0 0 1;
+#X connect 14 0 5 1;
+#X connect 14 0 6 1;
+#X connect 15 0 3 1;
+#X connect 15 0 8 0;
+#X restore 230 343 pd Dipoles;
+#X obj 258 315 noise~;
+#X obj 437 62 s centrePan;
+#X msg 437 41 0.5;
+#X obj 437 19 loadbang;
+#X obj 88 46 hsl 80 25 0.0001 1 1 0 empty empty Distance 2 12 0 10
+-4034 -1 -1 3164 1;
+#X obj 180 45 hsl 80 25 0.0001 1 1 0 empty empty Height 2 12 0 10 -257985
+-1 -1 1537 1;
+#X obj 270 44 hsl 80 25 0.0001 10000 1 0 empty empty Breadth 2 12 0
+10 -260097 -1 -1 5200 1;
+#X floatatom 105 78 0 0 0 0 - - -;
+#X floatatom 190 75 0 0 0 0 - - -;
+#X floatatom 280 74 0 0 0 0 - - -;
+#X msg 85 98 \$1 30;
+#X obj 85 120 line~;
+#X msg 177 97 \$1 30;
+#X obj 177 119 line~;
+#X msg 267 95 \$1 30;
+#X obj 267 117 line~;
+#X obj 85 143 s~ L;
+#X obj 177 141 s~ d;
+#X obj 267 139 s~ b;
+#X obj 547 32 vsl 25 80 1 4 0 0 empty empty Mode 0 -9 0 10 -258113
+-1 -1 4800 1;
+#X obj 547 121 + 0.5;
+#X obj 547 141 i;
+#X floatatom 581 160 0 0 0 0 - - -;
+#N canvas 665 374 472 358 alphaCalc 1;
+#X obj 174 82 r~ b;
+#X obj 189 104 r~ L;
+#X obj 174 126 /~;
+#X obj 174 168 log~;
+#X obj 195 146 sig~ 10;
+#X obj 174 190 *~ -0.1812;
+#X obj 174 212 +~ 2.1952;
+#X obj 174 236 s~ alpha;
+#X text 78 47 Plotfit from MatLab used to get equation of line;
+#X text 77 29 From Howe 1997 Table 1;
+#X obj 314 154 r myMet;
+#X obj 314 174 snapshot~;
+#X floatatom 314 195 0 0 0 0 - - -;
+#X connect 0 0 2 0;
+#X connect 0 0 11 0;
+#X connect 1 0 2 1;
+#X connect 2 0 3 0;
+#X connect 3 0 5 0;
+#X connect 4 0 3 1;
+#X connect 5 0 6 0;
+#X connect 6 0 7 0;
+#X connect 10 0 11 0;
+#X connect 11 0 12 0;
+#X restore 175 214 pd alphaCalc;
+#N canvas 230 325 623 469 thetaCalc 0;
+#X obj 130 65 r~ alpha;
+#X obj 130 90 /~ 0.92;
+#X obj 130 174 pow~;
+#X obj 151 110 sig~ 2;
+#X obj 166 129 sig~ 3;
+#X obj 151 152 /~;
+#X obj 145 237 /~;
+#X obj 145 195 sig~ 9;
+#X obj 160 214 sig~ 8;
+#X obj 130 260 -~;
+#X obj 130 286 s~ theta;
+#X text 118 31 From Howe 1997 \, page 16;
+#X obj 393 244 r myMet;
+#X obj 393 264 snapshot~;
+#X floatatom 393 285 0 0 0 0 - - -;
+#X connect 0 0 1 0;
+#X connect 1 0 2 0;
+#X connect 2 0 9 0;
+#X connect 3 0 5 0;
+#X connect 4 0 5 1;
+#X connect 5 0 2 1;
+#X connect 6 0 9 1;
+#X connect 7 0 6 0;
+#X connect 8 0 6 1;
+#X connect 9 0 10 0;
+#X connect 9 0 13 0;
+#X connect 12 0 13 0;
+#X connect 13 0 14 0;
+#X restore 302 237 pd thetaCalc;
+#X obj 547 165 s n;
+#X obj 481 304 r~ freq;
+#X obj 419 300 r~ St;
+#X obj 422 334 r myMet;
+#X obj 422 354 snapshot~;
+#X floatatom 422 375 0 0 0 0 - - -;
+#X obj 495 333 r myMet;
+#X obj 495 353 snapshot~;
+#X floatatom 495 374 0 0 0 0 - - -;
+#X msg 76 19 0.004;
+#X msg 177 17 0.0006;
+#X obj 56 281 r myMet;
+#X obj 56 301 snapshot~;
+#X floatatom 56 322 0 0 0 0 - - -;
+#X obj 121 279 r myMet;
+#X obj 121 299 snapshot~;
+#X floatatom 121 320 0 0 0 0 - - -;
+#X obj 43 249 r~ alpha;
+#X obj 108 256 r~ theta;
+#X obj 691 342 hsl 128 15 0.001 1e+09 1 0 empty empty empty -2 -8 0
+10 -262144 -1 -1 0 1;
+#X floatatom 697 360 0 0 0 0 - - -;
+#X obj 669 430 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj 732 430 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#N canvas 555 179 313 396 opLevels 0;
+#X obj 83 210 dac~;
+#X obj 30 70 catch~ l;
+#X obj 128 70 catch~ r;
+#X obj 129 104 *~ 0.45;
+#X obj 30 104 *~ 0.45;
+#X obj 30 210 prvu~;
+#X obj 129 211 prvu~;
+#X obj 93 33 inlet;
+#X obj 30 239 outlet;
+#X obj 129 239 outlet;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 6 0;
+#X connect 3 0 0 1;
+#X connect 4 0 5 0;
+#X connect 4 0 0 0;
+#X connect 5 0 8 0;
+#X connect 6 0 9 0;
+#X connect 7 0 4 1;
+#X connect 7 0 3 1;
+#X restore 668 387 pd opLevels;
+#X obj 641 120 s~ windspeed;
+#X msg 641 75 \$1 30;
+#X obj 641 97 line~;
+#X obj 644 40 hsl 80 25 1 10 0 0 empty empty Windspeed 2 12 0 10 -4032
+-1 -1 3511 1;
+#X floatatom 695 72 0 0 0 0 - - -;
+#X msg 639 15 5;
+#X obj 834 80 s myMet;
+#X obj 832 11 loadbang;
+#X obj 833 55 metro 20;
+#X obj 832 34 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#N canvas 284 378 431 543 freqCalcHowe 0;
+#X obj 139 17 r~ theta;
+#X obj 139 62 +~ 1;
+#X obj 160 39 r n;
+#X obj 139 85 +~ 0.125;
+#X obj 139 172 pow~;
+#X obj 160 150 /~;
+#X obj 160 108 sig~ 3;
+#X obj 175 127 sig~ 2;
+#X obj 154 194 r~ d;
+#X obj 169 214 r~ L;
+#X obj 154 236 /~;
+#X obj 154 259 sqrt~;
+#X obj 139 281 *~;
+#X obj 139 303 *~ 0.92;
+#X obj 85 330 s~ St;
+#X obj 154 322 r~ windspeed;
+#X obj 154 362 r~ L;
+#X obj 139 342 *~;
+#X obj 139 383 /~;
+#X obj 139 408 s~ freq;
+#X obj 270 144 r myMet;
+#X obj 270 164 snapshot~;
+#X floatatom 270 185 0 0 0 0 - - -;
+#X connect 0 0 1 0;
+#X connect 1 0 3 0;
+#X connect 2 0 1 1;
+#X connect 3 0 4 0;
+#X connect 4 0 12 0;
+#X connect 5 0 4 1;
+#X connect 6 0 5 0;
+#X connect 7 0 5 1;
+#X connect 8 0 10 0;
+#X connect 9 0 10 1;
+#X connect 10 0 11 0;
+#X connect 11 0 12 1;
+#X connect 12 0 13 0;
+#X connect 13 0 14 0;
+#X connect 13 0 17 0;
+#X connect 15 0 17 1;
+#X connect 16 0 18 1;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
+#X restore 448 229 pd freqCalcHowe;
+#N canvas 373 161 720 763 freqCalcCrighton 0;
+#X obj 152 23 r~ d;
+#X obj 152 45 /~ 2;
+#X obj 152 92 /~;
+#X obj 167 70 r~ L;
+#X obj 152 175 pow~;
+#X obj 173 153 /~;
+#X obj 173 111 sig~ 3;
+#X obj 188 130 sig~ 2;
+#X obj 167 198 sig~ 12.566;
+#X obj 182 219 sig~ 0.375;
+#X obj 182 263 *~ 1;
+#X obj 203 240 r n;
+#X obj 167 370 pow~;
+#X obj 188 348 /~;
+#X obj 188 306 sig~ 3;
+#X obj 203 325 sig~ 2;
+#X obj 167 285 *~;
+#X obj 152 392 *~;
+#X obj 178 476 /~;
+#X obj 152 434 *~;
+#X obj 167 412 r~ windspeed;
+#X obj 193 497 sig~ 3.14159;
+#X obj 178 520 /~;
+#X obj 178 545 s~ freq_Crighton;
+#X connect 0 0 1 0;
+#X connect 1 0 18 1;
+#X connect 1 0 2 0;
+#X connect 2 0 4 0;
+#X connect 3 0 2 1;
+#X connect 4 0 17 0;
+#X connect 5 0 4 1;
+#X connect 6 0 5 0;
+#X connect 7 0 5 1;
+#X connect 8 0 16 0;
+#X connect 9 0 10 0;
+#X connect 10 0 16 1;
+#X connect 11 0 10 1;
+#X connect 12 0 17 1;
+#X connect 13 0 12 1;
+#X connect 14 0 13 0;
+#X connect 15 0 13 1;
+#X connect 16 0 12 0;
+#X connect 17 0 19 0;
+#X connect 18 0 22 0;
+#X connect 19 0 18 0;
+#X connect 20 0 19 1;
+#X connect 21 0 22 1;
+#X connect 22 0 23 0;
+#X restore 556 250 pd freqCalcCrighton;
+#X obj 178 417 r~ freq_Crighton;
+#X obj 225 439 r myMet;
+#X obj 225 459 snapshot~;
+#X floatatom 225 480 0 0 0 0 - - -;
+#N canvas 31 274 1056 639 freqCalcHolger 0;
+#X obj 411 79 r~ d;
+#X obj 426 101 r~ L;
+#X obj 411 122 /~;
+#X obj 411 144 sqrt~;
+#X obj 396 54 sig~ 0.925;
+#X obj 396 167 *~;
+#X obj 487 131 r n;
+#X msg 502 219 0.4;
+#X msg 525 197 0.35;
+#X msg 548 176 0.5;
+#X obj 502 153 select 1 2 3;
+#X obj 446 229 line~;
+#X msg 446 203 \$1 30;
+#X obj 481 369 pow~;
+#X obj 502 347 /~;
+#X obj 502 305 sig~ 3;
+#X obj 517 324 sig~ 2;
+#X obj 396 415 *~;
+#X obj 402 551 s~ freqHolg;
+#X obj 481 283 +~ 1;
+#X obj 406 447 r~ windspeed;
+#X obj 412 494 r~ L;
+#X obj 391 470 *~;
+#X obj 396 515 /~;
+#X connect 0 0 2 0;
+#X connect 1 0 2 1;
+#X connect 2 0 3 0;
+#X connect 3 0 5 1;
+#X connect 4 0 5 0;
+#X connect 5 0 17 0;
+#X connect 6 0 10 0;
+#X connect 6 0 12 0;
+#X connect 7 0 19 1;
+#X connect 8 0 19 1;
+#X connect 9 0 19 1;
+#X connect 10 0 7 0;
+#X connect 10 1 8 0;
+#X connect 10 2 9 0;
+#X connect 11 0 19 0;
+#X connect 12 0 11 0;
+#X connect 13 0 17 1;
+#X connect 14 0 13 1;
+#X connect 15 0 14 0;
+#X connect 16 0 14 1;
+#X connect 17 0 22 0;
+#X connect 19 0 13 0;
+#X connect 20 0 22 1;
+#X connect 21 0 23 1;
+#X connect 22 0 23 0;
+#X connect 23 0 18 0;
+#X restore 681 217 pd freqCalcHolger;
+#X obj 347 408 r~ freqHolg;
+#X obj 361 431 r myMet;
+#X obj 361 451 snapshot~;
+#X floatatom 361 472 0 0 0 0 - - -;
+#X connect 1 0 0 1;
+#X connect 3 0 2 0;
+#X connect 4 0 3 0;
+#X connect 5 0 8 0;
+#X connect 5 0 11 0;
+#X connect 6 0 9 0;
+#X connect 6 0 13 0;
+#X connect 7 0 10 0;
+#X connect 7 0 15 0;
+#X connect 11 0 12 0;
+#X connect 12 0 17 0;
+#X connect 13 0 14 0;
+#X connect 14 0 18 0;
+#X connect 15 0 16 0;
+#X connect 16 0 19 0;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
+#X connect 22 0 23 0;
+#X connect 22 0 26 0;
+#X connect 27 0 33 0;
+#X connect 28 0 30 0;
+#X connect 29 0 30 0;
+#X connect 30 0 31 0;
+#X connect 32 0 33 0;
+#X connect 33 0 34 0;
+#X connect 35 0 5 0;
+#X connect 36 0 6 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 0;
+#X connect 40 0 41 0;
+#X connect 41 0 42 0;
+#X connect 43 0 38 0;
+#X connect 44 0 41 0;
+#X connect 45 0 46 0;
+#X connect 45 0 49 0;
+#X connect 49 0 47 0;
+#X connect 49 1 48 0;
+#X connect 51 0 52 0;
+#X connect 52 0 50 0;
+#X connect 53 0 51 0;
+#X connect 53 0 54 0;
+#X connect 55 0 53 0;
+#X connect 57 0 59 0;
+#X connect 58 0 56 0;
+#X connect 59 0 58 0;
+#X connect 62 0 64 0;
+#X connect 63 0 64 0;
+#X connect 64 0 65 0;
+#X connect 67 0 69 0;
+#X connect 68 0 69 0;
+#X connect 69 0 70 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/EdgeTonePatches/arccos.pd	Mon May 29 20:12:36 2017 +0100
@@ -0,0 +1,30 @@
+#N canvas 88 45 313 368 10;
+#X obj 112 255 * 360;
+#X floatatom 159 306 5 0 0 0 - - -;
+#X obj 112 279 / 6.28319;
+#X obj 70 47 *;
+#X obj 70 79 swap 1;
+#X obj 70 112 -;
+#X obj 70 141 sqrt;
+#X obj 112 172 /;
+#X obj 112 200 atan;
+#X obj 112 226 * 2;
+#X text 152 108 Arccos of angle;
+#X obj 127 48 + 1;
+#X obj 112 306 outlet;
+#X obj 70 20 inlet;
+#X connect 0 0 2 0;
+#X connect 2 0 1 0;
+#X connect 2 0 12 0;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 4 1 5 1;
+#X connect 5 0 6 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 9 0 0 0;
+#X connect 11 0 7 1;
+#X connect 13 0 3 1;
+#X connect 13 0 3 0;
+#X connect 13 0 11 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/EdgeTonePatches/fcpan.pd	Mon May 29 20:12:36 2017 +0100
@@ -0,0 +1,25 @@
+#N canvas 316 389 443 292 10;
+#X obj 133 131 *~;
+#X obj -4 123 *~;
+#X obj 149 85 cos~;
+#X obj 149 57 -~ 0.25;
+#X obj 149 35 *~ 0.25;
+#X obj 12 101 cos~;
+#X obj 12 77 -~ 0.25;
+#X obj -4 183 outlet~ l;
+#X obj 133 191 outlet~ r;
+#X obj -4 -4 inlet~;
+#X obj 149 -28 inlet;
+#X obj 149 14 sig~;
+#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 11 0;
+#X connect 11 0 4 0;
--- a/MechAeolian/MA_Test3.pd	Mon May 15 08:21:35 2017 +0100
+++ b/MechAeolian/MA_Test3.pd	Mon May 29 20:12:36 2017 +0100
@@ -1,7 +1,7 @@
 #N canvas 235 24 931 825 10;
 #X obj 359 -59 loadbang;
 #X obj 406 31 hsl 128 15 0.0001 0.3 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 1784 1;
+-262144 -1 -1 0 1;
 #X floatatom 413 57 8 0 0 0 - - -;
 #X obj 474 307 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 6350 1;
@@ -10,10 +10,10 @@
 -1 -1 6350 1;
 #X floatatom 475 218 5 0 0 0 - - -;
 #X obj 460 244 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 9525 1;
+-262144 -1 -1 7937 1;
 #X floatatom 490 273 5 0 0 0 - - -;
 #X obj 433 132 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 7759 1;
+-1 -1 8877 1;
 #X floatatom 449 161 5 0 0 0 - - -;
 #X text 622 308 Pan Value;
 #X obj 532 -116 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1
@@ -23,7 +23,7 @@
 #X obj 359 -35 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 419 89 hsl 128 15 0.01 20 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 438 1;
+-1 -1 0 1;
 #X floatatom 441 108 8 0 0 0 - - -;
 #X obj 532 -58 s SET_UP;
 #X obj 404 12 r SET_UP;
@@ -33,11 +33,11 @@
 #X obj 542 218 r SET_UP;
 #X obj 548 276 r SET_UP;
 #X obj 492 365 hsl 128 15 1 10000 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 9811 1;
+-262144 -1 -1 0 1;
 #X floatatom 525 394 5 0 0 0 - - -;
 #X obj 570 339 r SET_UP;
 #X obj 501 425 hsl 128 15 0 1000 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 393 1;
+-1 -1 0 1;
 #X floatatom 520 452 5 0 0 0 - - -;
 #X obj 594 393 r SET_UP;
 #X obj 515 477 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
@@ -102,7 +102,7 @@
 #X obj 363 656 outlet~;
 #X obj 514 600 outlet;
 #X obj 665 470 hsl 128 15 1e-07 0.5 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 8154 1;
+-262144 -1 -1 0 1;
 #X floatatom 676 500 0 0 0 0 - - -;
 #X obj 13 -57 unpack f f f f f f f f f;
 #X obj 155 -29 line \$1 50;
--- a/MechAeolian/MechAeolianD3.pd	Mon May 15 08:21:35 2017 +0100
+++ b/MechAeolian/MechAeolianD3.pd	Mon May 29 20:12:36 2017 +0100
@@ -291,8 +291,6 @@
 #X obj 332 446 line~;
 #X msg 332 424 \$1 5;
 #X msg 219 100 \$1 5;
-#X obj 219 317 /~ 400;
-#X text -53 316 Scale factor to bring in line with CFD calcs;
 #X obj 559 214 r~ MY_MACH;
 #X floatatom 265 294 5 0 0 0 - - -;
 #X floatatom 311 117 0 0 0 0 - - -;
@@ -303,13 +301,13 @@
 #X connect 3 0 44 0;
 #X connect 8 0 1 0;
 #X connect 8 0 1 1;
-#X connect 9 0 115 0;
+#X connect 9 0 113 0;
 #X connect 11 0 90 1;
 #X connect 12 0 5 0;
 #X connect 12 0 76 0;
 #X connect 15 0 17 1;
-#X connect 15 0 113 0;
-#X connect 17 0 110 0;
+#X connect 15 0 111 0;
+#X connect 17 0 36 0;
 #X connect 18 0 93 0;
 #X connect 19 0 20 1;
 #X connect 20 0 43 0;
@@ -386,10 +384,9 @@
 #X connect 107 0 40 0;
 #X connect 108 0 107 0;
 #X connect 109 0 95 0;
-#X connect 110 0 36 0;
-#X connect 112 0 48 1;
-#X connect 115 0 109 0;
-#X connect 115 0 114 0;
+#X connect 110 0 48 1;
+#X connect 113 0 109 0;
+#X connect 113 0 112 0;
 #X restore 83 325 pd GoldfreqGain;
 #N canvas 300 30 1006 797 GoldnoiseGain 0;
 #X text -21037 364 Mass Density of Air \, squared;
@@ -506,11 +503,7 @@
 #X obj -20720 502 *~;
 #X obj -20777 530 *~;
 #X obj -20861 574 /~;
-#X obj -20624 194 -~;
-#X text -20533 187 Angle goes with the flow in Goldstein hence 90 -
-theta so that theta is same angle as dipole angles.;
-#X obj -20624 149 sig~ 180;
-#X obj -20609 172 r~ \$0-this_elev;
+#X obj -20624 172 r~ \$0-this_elev;
 #X obj -20916 137 inlet~;
 #X obj -20916 164 *~;
 #X obj -20828 253 inlet~;
@@ -575,23 +568,23 @@
 #X text -20929 530 Sqrt(2*pi);
 #X obj -20609 328 r~ MY_MACH;
 #X obj -20861 488 /~ 10000;
-#X connect 1 0 60 0;
-#X connect 3 0 46 1;
-#X connect 4 0 53 0;
-#X connect 5 0 45 1;
+#X connect 1 0 57 0;
+#X connect 3 0 43 1;
+#X connect 4 0 50 0;
+#X connect 5 0 42 1;
 #X connect 6 0 1 0;
 #X connect 6 0 1 1;
 #X connect 13 0 17 0;
-#X connect 13 0 62 0;
+#X connect 13 0 59 0;
 #X connect 14 0 16 0;
-#X connect 14 0 58 0;
-#X connect 20 0 49 0;
-#X connect 21 0 65 0;
+#X connect 14 0 55 0;
+#X connect 20 0 46 0;
+#X connect 21 0 62 0;
 #X connect 22 0 35 1;
 #X connect 23 0 22 0;
 #X connect 24 0 34 1;
 #X connect 25 0 26 0;
-#X connect 26 0 66 0;
+#X connect 26 0 63 0;
 #X connect 27 0 29 1;
 #X connect 28 0 29 0;
 #X connect 29 0 24 0;
@@ -603,36 +596,34 @@
 #X connect 34 0 35 0;
 #X connect 35 0 36 1;
 #X connect 36 0 37 1;
-#X connect 37 0 64 0;
+#X connect 37 0 61 0;
 #X connect 38 0 25 0;
-#X connect 40 0 38 0;
-#X connect 41 0 38 1;
-#X connect 42 0 43 0;
-#X connect 42 0 43 1;
-#X connect 43 0 46 0;
-#X connect 44 0 45 0;
-#X connect 45 0 47 1;
-#X connect 46 0 47 0;
-#X connect 47 0 20 0;
-#X connect 48 0 49 1;
-#X connect 49 0 70 0;
-#X connect 50 0 37 0;
-#X connect 53 0 56 0;
-#X connect 54 0 53 0;
-#X connect 55 0 3 0;
-#X connect 56 0 55 0;
-#X connect 57 0 19 0;
-#X connect 58 0 57 0;
-#X connect 59 0 36 0;
-#X connect 60 0 59 0;
-#X connect 61 0 18 0;
-#X connect 62 0 61 0;
-#X connect 63 0 66 1;
-#X connect 64 0 7 0;
-#X connect 65 0 63 0;
-#X connect 66 0 27 0;
-#X connect 69 0 27 1;
-#X connect 70 0 50 0;
+#X connect 39 0 40 0;
+#X connect 39 0 40 1;
+#X connect 40 0 43 0;
+#X connect 41 0 42 0;
+#X connect 42 0 44 1;
+#X connect 43 0 44 0;
+#X connect 44 0 20 0;
+#X connect 45 0 46 1;
+#X connect 46 0 67 0;
+#X connect 47 0 37 0;
+#X connect 50 0 53 0;
+#X connect 51 0 50 0;
+#X connect 52 0 3 0;
+#X connect 53 0 52 0;
+#X connect 54 0 19 0;
+#X connect 55 0 54 0;
+#X connect 56 0 36 0;
+#X connect 57 0 56 0;
+#X connect 58 0 18 0;
+#X connect 59 0 58 0;
+#X connect 60 0 63 1;
+#X connect 61 0 7 0;
+#X connect 62 0 60 0;
+#X connect 63 0 27 0;
+#X connect 66 0 27 1;
+#X connect 67 0 47 0;
 #X restore 64 570 pd GoldnoiseGain;
 #X text 55 617 Calculates the gain of the wake;
 #X obj 467 82 s \$0-azim;
@@ -687,8 +678,6 @@
 #X obj 636 104 min 0.99;
 #N canvas 125 74 950 728 Dipoles 0;
 #X obj 225 154 r~ \$0-liftDiGain;
-#X obj 495 160 r~ \$0-liftDiGain;
-#X obj 495 182 *~ 0.6;
 #X obj 381 91 *~ 3;
 #X obj 468 490 r~ \$0-dragDiGain;
 #X obj 354 400 *~ 2;
@@ -743,59 +732,73 @@
 #X obj 495 248 r~ \$0-reyGain;
 #X obj 453 577 *~;
 #X obj 468 555 r~ \$0-reyGain;
-#X connect 0 0 6 1;
-#X connect 1 0 2 0;
-#X connect 2 0 12 1;
-#X connect 3 0 15 1;
-#X connect 3 0 31 1;
-#X connect 4 0 18 1;
-#X connect 5 0 21 1;
-#X connect 5 0 32 1;
-#X connect 6 0 41 0;
-#X connect 9 0 30 0;
-#X connect 10 0 38 1;
-#X connect 11 0 9 0;
-#X connect 12 0 42 0;
-#X connect 15 0 31 0;
-#X connect 16 0 39 1;
-#X connect 17 0 15 0;
-#X connect 18 0 43 0;
-#X connect 21 0 32 0;
-#X connect 22 0 40 1;
-#X connect 23 0 21 0;
-#X connect 26 0 9 2;
-#X connect 26 0 29 0;
+#X obj 691 127 r~ \$0-liftDiGain;
+#X obj 670 226 pow~;
+#X obj 670 106 sig~ 10;
+#X obj 691 149 /~ 2e-05;
+#X obj 670 249 *~ 2e-05;
+#X obj 691 199 *~ 0.6;
+#X obj 691 176 log~ 10;
+#X obj 763 152 sig~ 10;
+#X connect 0 0 4 1;
+#X connect 1 0 13 1;
+#X connect 1 0 29 1;
+#X connect 2 0 16 1;
+#X connect 3 0 19 1;
+#X connect 3 0 30 1;
+#X connect 4 0 39 0;
+#X connect 7 0 28 0;
+#X connect 8 0 36 1;
+#X connect 9 0 7 0;
+#X connect 10 0 40 0;
+#X connect 13 0 29 0;
+#X connect 14 0 37 1;
+#X connect 15 0 13 0;
+#X connect 16 0 41 0;
+#X connect 19 0 30 0;
+#X connect 20 0 38 1;
+#X connect 21 0 19 0;
+#X connect 24 0 7 2;
+#X connect 24 0 27 0;
+#X connect 24 0 28 2;
+#X connect 25 0 13 2;
+#X connect 25 0 29 2;
+#X connect 26 0 19 2;
 #X connect 26 0 30 2;
-#X connect 27 0 15 2;
-#X connect 27 0 31 2;
-#X connect 28 0 21 2;
-#X connect 28 0 32 2;
-#X connect 30 0 6 0;
-#X connect 31 0 12 0;
-#X connect 32 0 18 0;
-#X connect 33 0 34 0;
-#X connect 35 0 9 1;
-#X connect 35 0 30 1;
-#X connect 36 0 3 0;
-#X connect 37 0 5 0;
-#X connect 38 0 7 0;
-#X connect 38 1 8 0;
-#X connect 39 0 13 0;
-#X connect 39 1 14 0;
-#X connect 40 0 19 0;
-#X connect 40 1 20 0;
-#X connect 41 0 46 0;
-#X connect 42 0 48 0;
-#X connect 43 0 50 0;
-#X connect 44 0 42 1;
-#X connect 44 0 41 1;
-#X connect 44 0 43 1;
-#X connect 46 0 38 0;
+#X connect 28 0 4 0;
+#X connect 29 0 10 0;
+#X connect 30 0 16 0;
+#X connect 31 0 32 0;
+#X connect 33 0 7 1;
+#X connect 33 0 28 1;
+#X connect 34 0 1 0;
+#X connect 35 0 3 0;
+#X connect 36 0 5 0;
+#X connect 36 1 6 0;
+#X connect 37 0 11 0;
+#X connect 37 1 12 0;
+#X connect 38 0 17 0;
+#X connect 38 1 18 0;
+#X connect 39 0 44 0;
+#X connect 40 0 46 0;
+#X connect 41 0 48 0;
+#X connect 42 0 40 1;
+#X connect 42 0 39 1;
+#X connect 42 0 41 1;
+#X connect 44 0 36 0;
+#X connect 45 0 44 1;
+#X connect 46 0 37 0;
 #X connect 47 0 46 1;
-#X connect 48 0 39 0;
+#X connect 48 0 38 0;
 #X connect 49 0 48 1;
-#X connect 50 0 40 0;
-#X connect 51 0 50 1;
+#X connect 50 0 53 0;
+#X connect 51 0 54 0;
+#X connect 52 0 51 0;
+#X connect 53 0 56 0;
+#X connect 54 0 10 1;
+#X connect 55 0 51 1;
+#X connect 56 0 55 0;
+#X connect 57 0 56 1;
 #X restore 474 688 pd Dipoles;
 #X obj 1088 69 noise~;
 #X obj 1088 92 s~ \$0-thisNoise;
--- a/MechAeolian/harpD2.pd	Mon May 15 08:21:35 2017 +0100
+++ b/MechAeolian/harpD2.pd	Mon May 29 20:12:36 2017 +0100
@@ -31,7 +31,7 @@
 #X floatatom -251 243 8 0 0 0 - - -;
 #X obj -85 74 delwrite~ varwind 3000;
 #X obj 24 -18 hsl 128 15 0 100 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 355 1;
+-1 -1 0 1;
 #X obj -85 26 *~ 1;
 #X obj -85 48 +~ 1;
 #X obj -85 -76 loadbang;
@@ -68,7 +68,7 @@
 #X obj -158 -13 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 218 -20 hsl 300 35 1 10000 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 17764 1;
+-262144 -1 -1 15260 1;
 #X obj 254 38 s mod;
 #X obj 105 233 r rand2;
 #X obj -242 524 r rand2;
@@ -144,7 +144,7 @@
 #X connect 27 0 0 0;
 #X restore 184 437 pd PlotWrt;
 #X obj -82 -52 hsl 50 30 0 1 0 0 empty empty Gusts 2 8 0 10 -261995
--1 -4032 1138 1;
+-1 -4032 0 1;
 #X obj -17 -21 t f b;
 #X obj -18 -43 * 0.75;
 #X floatatom 146 459 0 0 0 0 - - -;
@@ -193,15 +193,15 @@
 #X obj 184 1320 r rand3;
 #X obj 485 1323 r rand3;
 #X obj 639 -8 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 2927 1;
+10 -204800 -1 -1 0 1;
 #X obj 639 14 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 639 36 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 726 1;
+-262130 -1 -1 0 1;
 #X obj 639 58 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 914 1;
+-1 -1 0 1;
 #X obj 639 80 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0 10
--261234 -1 -1 1180 1;
+-261234 -1 -1 0 1;
 #X obj 637 -45 tgl 35 0 empty empty empty 17 7 0 40 -228856 -257985
 -257985 0 1;
 #X floatatom 715 123 0 0 0 0 - - -;
@@ -220,19 +220,19 @@
 #X obj 1657 286 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 1720 286 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 1630 205 hsl 100 35 1 500 0 0 empty empty Modulation_Index 3
-16 0 10 -203904 -1 -1 4700 1;
+16 0 10 -203904 -1 -1 2163 1;
 #X floatatom 1733 215 0 0 0 0 - - -;
 #X floatatom 1733 250 0 0 0 0 - - -;
 #X obj 798 -10 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3355 1;
+10 -204800 -1 -1 0 1;
 #X obj 798 12 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 798 34 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 702 1;
+-262130 -1 -1 0 1;
 #X obj 798 56 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 590 1;
+-1 -1 0 1;
 #X obj 798 78 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0 10
--261234 -1 -1 1180 1;
+-261234 -1 -1 0 1;
 #X floatatom 874 121 0 0 0 0 - - -;
 #X floatatom 874 142 0 0 0 0 - - -;
 #X floatatom 862 -8 0 0 0 0 - - -;
@@ -245,15 +245,15 @@
 #X text 795 121 Current Freq;
 #X text 772 141 Current Harmonic;
 #X obj 962 -9 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3355 1;
+10 -204800 -1 -1 0 1;
 #X obj 962 13 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 962 35 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 711 1;
+-262130 -1 -1 0 1;
 #X obj 962 57 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 590 1;
+-1 -1 0 1;
 #X obj 962 79 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0 10
--261234 -1 -1 1180 1;
+-261234 -1 -1 0 1;
 #X floatatom 1038 122 0 0 0 0 - - -;
 #X floatatom 1038 143 0 0 0 0 - - -;
 #X floatatom 1026 -7 0 0 0 0 - - -;
@@ -266,15 +266,15 @@
 #X text 959 122 Current Freq;
 #X text 936 142 Current Harmonic;
 #X obj 1130 -8 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3355 1;
+10 -204800 -1 -1 0 1;
 #X obj 1130 14 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 1130 36 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 667 1;
+-262130 -1 -1 0 1;
 #X obj 1130 58 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 619 1;
+-1 -1 0 1;
 #X obj 1130 80 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 1206 123 0 0 0 0 - - -;
 #X floatatom 1206 144 0 0 0 0 - - -;
 #X floatatom 1194 -6 0 0 0 0 - - -;
@@ -287,15 +287,15 @@
 #X text 1127 123 Current Freq;
 #X text 1104 143 Current Harmonic;
 #X obj 1308 -8 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3355 1;
+10 -204800 -1 -1 0 1;
 #X obj 1308 14 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 1308 36 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 702 1;
+-262130 -1 -1 0 1;
 #X obj 1308 58 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 590 1;
+-1 -1 0 1;
 #X obj 1308 80 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 1384 123 0 0 0 0 - - -;
 #X floatatom 1384 144 0 0 0 0 - - -;
 #X floatatom 1372 -6 0 0 0 0 - - -;
@@ -308,15 +308,15 @@
 #X text 1305 123 Current Freq;
 #X text 1282 143 Current Harmonic;
 #X obj 1493 -7 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3355 1;
+10 -204800 -1 -1 0 1;
 #X obj 1493 15 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 1493 37 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 711 1;
+-262130 -1 -1 0 1;
 #X obj 1493 59 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 590 1;
+-1 -1 0 1;
 #X obj 1493 81 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 1569 124 0 0 0 0 - - -;
 #X floatatom 1569 145 0 0 0 0 - - -;
 #X floatatom 1557 -5 0 0 0 0 - - -;
@@ -329,15 +329,15 @@
 #X text 1490 124 Current Freq;
 #X text 1467 144 Current Harmonic;
 #X obj 1667 -8 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3355 1;
+10 -204800 -1 -1 0 1;
 #X obj 1667 14 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 1667 36 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 667 1;
+-262130 -1 -1 0 1;
 #X obj 1667 58 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 619 1;
+-1 -1 0 1;
 #X obj 1667 80 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 1743 123 0 0 0 0 - - -;
 #X floatatom 1743 144 0 0 0 0 - - -;
 #X floatatom 1731 -6 0 0 0 0 - - -;
@@ -350,15 +350,15 @@
 #X text 1664 123 Current Freq;
 #X text 1641 143 Current Harmonic;
 #X obj 637 236 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3355 1;
+10 -204800 -1 -1 0 1;
 #X obj 637 258 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 637 280 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 702 1;
+-262130 -1 -1 0 1;
 #X obj 637 302 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 590 1;
+-1 -1 0 1;
 #X obj 637 324 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 713 367 0 0 0 0 - - -;
 #X floatatom 713 388 0 0 0 0 - - -;
 #X floatatom 701 238 0 0 0 0 - - -;
@@ -371,15 +371,15 @@
 #X text 634 367 Current Freq;
 #X text 611 387 Current Harmonic;
 #X obj 795 236 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3355 1;
+10 -204800 -1 -1 0 1;
 #X obj 795 258 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 795 280 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 711 1;
+-262130 -1 -1 0 1;
 #X obj 795 302 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 590 1;
+-1 -1 0 1;
 #X obj 795 324 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 871 367 0 0 0 0 - - -;
 #X floatatom 871 388 0 0 0 0 - - -;
 #X floatatom 859 238 0 0 0 0 - - -;
@@ -392,15 +392,15 @@
 #X text 792 367 Current Freq;
 #X text 769 387 Current Harmonic;
 #X obj 965 236 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3355 1;
+10 -204800 -1 -1 0 1;
 #X obj 965 258 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 965 280 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 667 1;
+-262130 -1 -1 0 1;
 #X obj 965 302 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 619 1;
+-1 -1 0 1;
 #X obj 965 324 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 1041 367 0 0 0 0 - - -;
 #X floatatom 1041 388 0 0 0 0 - - -;
 #X floatatom 1029 238 0 0 0 0 - - -;
@@ -413,15 +413,15 @@
 #X text 962 367 Current Freq;
 #X text 939 387 Current Harmonic;
 #X obj 1129 240 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10
-0 10 -204800 -1 -1 3355 1;
+0 10 -204800 -1 -1 0 1;
 #X obj 1129 262 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 1129 284 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 702 1;
+-262130 -1 -1 0 1;
 #X obj 1129 306 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 590 1;
+-1 -1 0 1;
 #X obj 1129 328 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 1205 371 0 0 0 0 - - -;
 #X floatatom 1205 392 0 0 0 0 - - -;
 #X floatatom 1193 242 0 0 0 0 - - -;
@@ -434,15 +434,15 @@
 #X text 1126 371 Current Freq;
 #X text 1103 391 Current Harmonic;
 #X obj 1306 239 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10
-0 10 -204800 -1 -1 3355 1;
+0 10 -204800 -1 -1 0 1;
 #X obj 1306 261 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 1306 283 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 711 1;
+-262130 -1 -1 0 1;
 #X obj 1306 305 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 590 1;
+-1 -1 0 1;
 #X obj 1306 327 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 1382 370 0 0 0 0 - - -;
 #X floatatom 1382 391 0 0 0 0 - - -;
 #X floatatom 1370 241 0 0 0 0 - - -;
@@ -455,15 +455,15 @@
 #X text 1303 370 Current Freq;
 #X text 1280 390 Current Harmonic;
 #X obj 1486 237 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10
-0 10 -204800 -1 -1 3355 1;
+0 10 -204800 -1 -1 0 1;
 #X obj 1486 259 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2065 1;
+-1 -1 0 1;
 #X obj 1486 281 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 667 1;
+-262130 -1 -1 0 1;
 #X obj 1486 303 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 619 1;
+-1 -1 0 1;
 #X obj 1486 325 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 1180 1;
+10 -261234 -1 -1 0 1;
 #X floatatom 1562 368 0 0 0 0 - - -;
 #X floatatom 1562 389 0 0 0 0 - - -;
 #X floatatom 1550 239 0 0 0 0 - - -;
@@ -488,15 +488,15 @@
 #X obj 1753 675 s rand2;
 #X obj 1772 658 s rand3;
 #X obj 1632 465 hsl 100 35 0 1 0 0 empty empty Gusts 3 16 0 10 -191407
--1 -13330 2300 1;
+-1 -13330 0 1;
 #X obj 1632 502 hsl 100 35 0.1 100 1 0 empty empty Wind_Speed 3 16
-0 10 -232576 -1 -1 4775 1;
+0 10 -232576 -1 -1 0 1;
 #X obj 673 -45 bng 35 250 50 0 empty empty empty 1 16 0 10 -260097
 -1 -1;
 #X obj 711 -43 tgl 15 0 empty empty empty 17 7 0 10 -262144 -4034 -4034
-1 1;
+0 1;
 #X obj 711 -25 tgl 15 0 empty empty empty 17 7 0 10 -262144 -258113
--258113 0 1;
+-258113 1 1;
 #X text 729 -44 On;
 #X text 729 -26 Off;
 #N canvas 1067 303 450 300 onOff 0;
@@ -1928,7 +1928,7 @@
 #X msg 58 582 3 0.000508 0.7 6 90 1205 20 20 0.002;
 #X msg 73 622 0.9 0.0002794 0.65 6 90 7820 49.5 20 0.002;
 #X msg 319 500 2.6 0.000508 0.6096 6 90 2453 33 20 0.002;
-#X msg 339 545 1.4 0.001 0.9 6 90 1000 94 20 0.002;
+#X msg 339 545 1.4 0.001 0.9 6 90 1000 94 20 0.002 ;
 #X msg 360 585 3 0.000508 0.7 6 90 1130 21 20 0.002;
 #X msg 390 625 0.9 0.0002286 0.65 6 90 7940 59.98 20 0.002;
 #X msg -98 778 2.6 0.000508 0.6096 6 90 2234 38 20 0.002;