Mercurial > hg > aeolianharp
changeset 3:432a4398d556 tip
Dipole Gains updated. Wake angle corrected. Scale factors consolidated. 15 05 17
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Mon, 15 May 2017 08:27:39 +0100 |
| parents | cd0900b986e7 |
| children | |
| files | MA_Test3.pd MechAeolianD3.pd harpD2.pd |
| diffstat | 3 files changed, 208 insertions(+), 203 deletions(-) [+] |
line wrap: on
line diff
--- a/MA_Test3.pd Mon Jan 02 11:26:25 2017 +0000 +++ b/MA_Test3.pd Mon May 15 08:27:39 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 2393 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; @@ -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 769 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 11683 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 647 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 9306 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/MechAeolianD3.pd Mon Jan 02 11:26:25 2017 +0000 +++ b/MechAeolianD3.pd Mon May 15 08:27:39 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,9 @@ #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 +570,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 58 0; +#X connect 3 0 44 1; +#X connect 4 0 51 0; +#X connect 5 0 43 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 60 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 56 0; +#X connect 20 0 47 0; +#X connect 21 0 63 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 64 0; #X connect 27 0 29 1; #X connect 28 0 29 0; #X connect 29 0 24 0; @@ -603,36 +598,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 38 0 25 0; -#X connect 40 0 38 0; -#X connect 41 0 38 1; +#X connect 37 0 62 0; +#X connect 39 0 25 0; +#X connect 40 0 41 0; +#X connect 40 0 41 1; +#X connect 41 0 44 0; #X connect 42 0 43 0; -#X connect 42 0 43 1; -#X connect 43 0 46 0; +#X connect 43 0 45 1; #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 45 0 20 0; +#X connect 46 0 47 1; +#X connect 47 0 68 0; +#X connect 48 0 37 0; +#X connect 51 0 54 0; +#X connect 52 0 51 0; +#X connect 53 0 3 0; #X connect 54 0 53 0; -#X connect 55 0 3 0; +#X connect 55 0 19 0; #X connect 56 0 55 0; -#X connect 57 0 19 0; +#X connect 57 0 36 0; #X connect 58 0 57 0; -#X connect 59 0 36 0; +#X connect 59 0 18 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 61 0 64 1; +#X connect 62 0 7 0; +#X connect 63 0 61 0; +#X connect 64 0 27 0; +#X connect 67 0 27 1; +#X connect 68 0 48 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 +680,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 +734,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 710 118 r~ \$0-liftDiGain; +#X obj 689 217 pow~; +#X obj 689 97 sig~ 10; +#X obj 710 140 /~ 2e-05; +#X obj 689 240 *~ 2e-05; +#X obj 710 190 *~ 0.6; +#X obj 710 167 log~ 10; +#X obj 782 143 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/harpD2.pd Mon Jan 02 11:26:25 2017 +0000 +++ b/harpD2.pd Mon May 15 08:27:39 2017 +0100 @@ -26,12 +26,12 @@ #X connect 7 0 3 1; #X restore -194 242 pd opLevels; #X obj -191 213 hsl 100 25 0.01 1e+20 1 0 empty empty empty -2 -8 0 -10 -262144 -1 -1 3700 1; +10 -262144 -1 -1 2700 1; #X obj -194 142 r GAIN; #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 577 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 14217 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 445 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 4655 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 1898 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 1835 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 2786 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 4380 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 - - -; @@ -216,23 +216,23 @@ #X text 636 123 Current Freq; #X text 613 143 Current Harmonic; #X obj 1630 242 hsl 100 35 0.01 1e+20 1 0 empty empty Gain 3 16 0 10 --228856 -1 -1 3700 1; +-228856 -1 -1 2700 1; #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 1563 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 4255 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 5898 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 1318 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 1032 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 4255 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 5298 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 1121 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 1003 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 1798 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 1447 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 973 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 1798 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 1318 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 1121 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 1798 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 1397 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 1091 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 1798 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 1447 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 1062 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 1798 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 1447 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 1086 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 1798 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 1259 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 1593 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 1798 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 1384 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 1593 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 1798 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 1500 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 1593 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 1798 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 1568 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 1563 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 1798 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 1384 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 1622 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 900 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 5469 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; @@ -1975,8 +1975,8 @@ #X msg 375 375 0.4; #X msg 269 371 1.1 5000; #X msg 280 423 10 30000; +#X obj 142 375 MA_Test3; #X obj 58 655 MA_Test3; -#X obj 142 375 MA_Test3; #X obj -72 922 MA_Test3; #X obj -250 661 MA_Test3; #X obj 239 918 MA_Test3; @@ -2379,7 +2379,7 @@ #X connect 474 0 473 0; #X connect 476 0 504 0; #X connect 478 0 477 0; -#X connect 479 0 657 1; +#X connect 479 0 656 1; #X connect 480 0 481 0; #X connect 482 0 483 0; #X connect 483 0 105 0; @@ -2400,7 +2400,7 @@ #X connect 492 3 145 0; #X connect 493 0 495 0; #X connect 494 0 492 0; -#X connect 496 0 656 1; +#X connect 496 0 657 1; #X connect 497 0 498 0; #X connect 499 0 475 0; #X connect 503 0 53 0; @@ -2506,13 +2506,13 @@ #X connect 597 0 5 0; #X connect 597 0 117 0; #X connect 598 0 444 0; -#X connect 598 0 657 0; +#X connect 598 0 656 0; #X connect 599 0 444 0; -#X connect 599 0 657 0; +#X connect 599 0 656 0; #X connect 600 0 444 0; -#X connect 600 0 657 0; +#X connect 600 0 656 0; #X connect 601 0 444 0; -#X connect 601 0 657 0; +#X connect 601 0 656 0; #X connect 602 0 441 0; #X connect 602 0 659 0; #X connect 603 0 441 0; @@ -2522,13 +2522,13 @@ #X connect 605 0 441 0; #X connect 605 0 659 0; #X connect 606 0 445 0; -#X connect 606 0 656 0; +#X connect 606 0 657 0; #X connect 607 0 445 0; -#X connect 607 0 656 0; +#X connect 607 0 657 0; #X connect 608 0 445 0; -#X connect 608 0 656 0; +#X connect 608 0 657 0; #X connect 609 0 445 0; -#X connect 609 0 656 0; +#X connect 609 0 657 0; #X connect 610 0 446 0; #X connect 610 0 668 0; #X connect 611 0 446 0; @@ -2614,21 +2614,21 @@ #X connect 653 0 47 0; #X connect 654 0 47 0; #X connect 655 0 47 0; -#X connect 656 0 497 0; -#X connect 656 1 497 3; -#X connect 656 4 497 1; -#X connect 656 5 497 2; -#X connect 657 0 44 0; -#X connect 657 0 480 0; -#X connect 657 1 480 3; -#X connect 657 2 52 1; -#X connect 657 3 52 2; -#X connect 657 4 484 0; -#X connect 657 4 480 1; -#X connect 657 5 56 0; -#X connect 657 5 480 2; -#X connect 657 6 52 4; -#X connect 657 7 52 3; +#X connect 656 0 44 0; +#X connect 656 0 480 0; +#X connect 656 1 480 3; +#X connect 656 2 52 1; +#X connect 656 3 52 2; +#X connect 656 4 484 0; +#X connect 656 4 480 1; +#X connect 656 5 56 0; +#X connect 656 5 480 2; +#X connect 656 6 52 4; +#X connect 656 7 52 3; +#X connect 657 0 497 0; +#X connect 657 1 497 3; +#X connect 657 4 497 1; +#X connect 657 5 497 2; #X connect 658 0 525 0; #X connect 658 1 525 3; #X connect 658 4 525 1;