Mercurial > hg > weather-synthesis-prototyping
changeset 180:158d649c58c1
Sword - Minor adjustments
Aeolian tone - Strouhal Bandwidth calculated and applied. Additional VCF Placed in series to ensure good frequency cut off.
To test but no soundflower......
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Wed, 17 Feb 2016 10:39:19 +0000 |
| parents | 9b4c50eb6faf |
| children | 4c6c8c511a48 |
| files | newSwordAuto/newSwordAuto.pd newSwordAuto/sweepTime.pd scene demo/WindGenD1.pd scene demo/freqCalcCyl3No_D3Mach.pd scene demo/testBedD4.pd |
| diffstat | 5 files changed, 393 insertions(+), 191 deletions(-) [+] |
line wrap: on
line diff
--- a/newSwordAuto/newSwordAuto.pd Sun Feb 14 12:27:55 2016 +0000 +++ b/newSwordAuto/newSwordAuto.pd Wed Feb 17 10:39:19 2016 +0000 @@ -5,18 +5,18 @@ #X obj 315 85 s myMet; #X obj -221 455 s topSpeed; #X obj -273 429 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 4455 1; +-1 -1 4950 1; #X floatatom -276 455 8 0 0 0 - - -; #X text -165 346 Blade Length; #X text -9 37 Arm Length; #X text -165 433 Top Speed; #X obj 21 251 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 3575 1; +-1 -1 1237 1; #X floatatom 18 280 8 0 0 0 - - -; #X obj -279 516 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 1650 1; +-262144 -1 -1 3960 1; #X obj -280 601 hsl 100 20 0.0001 0.01 0 0 empty empty empty -2 -8 -0 10 -262144 -1 -1 4400 1; +0 10 -262144 -1 -1 7900 1; #X floatatom -282 546 8 0 0 0 - - -; #X floatatom -283 629 8 0 0 0 - - -; #X obj -225 628 s tipThick; @@ -29,7 +29,7 @@ 1; #X obj 143 46 metro 200; #X obj 197 22 hsl 100 20 500 30 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 1200 1; +-1 -1 0 1; #X obj 83 73 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1 -1; #X obj 83 150 s setUp; @@ -45,15 +45,15 @@ #X obj 83 21 loadbang; #X obj 83 45 delay 13; #X obj 19 326 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 5775 1; +-1 -1 7975 1; #X floatatom 16 358 8 0 0 0 - - -; #X obj -42 306 r setUp; #X obj 14 439 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 3300 1; +-1 -1 1650 1; #X floatatom 11 471 8 0 0 0 - - -; #X obj -47 419 r setUp; #X obj 12 517 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6600 1; +-1 -1 4675 1; #X floatatom 9 549 8 0 0 0 - - -; #X obj -49 497 r setUp; #X obj 66 470 s presweepElev; @@ -67,9 +67,9 @@ #X obj -43 59 s start_armLength; #X msg -43 38 0.35; #X obj -275 52 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 5148 1; +-1 -1 5049 1; #X obj -276 146 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 4950 1; +-262144 -1 -1 5148 1; #X obj -276 237 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 5049 1; #X obj -278 75 s Xobs; @@ -6715,7 +6715,7 @@ #X restore 219 144 pd sources; #X floatatom 227 52 5 0 0 0 - - -; #X obj -276 345 hsl 100 20 0.1 3 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 3072 1; +-1 -1 1707 1; #X floatatom -319 368 5 0 0 0 - - -; #X obj -324 319 r setUp; #X obj -279 300 r thisLength; @@ -6744,7 +6744,7 @@ #X obj 62 0 r preswing; #X obj 407 368 unpack f f f f f f f f f f f f s; #X obj 596 388 s preswing; -#N canvas 301 296 1054 554 Presets 1; +#N canvas 301 296 1054 554 Presets 0; #X msg 31 46 2 0 1 1 45 0.005 0.0045 130 210 60 60 50 bang; #X obj 31 19 inlet; #X obj 345 14 inlet;
--- a/newSwordAuto/sweepTime.pd Sun Feb 14 12:27:55 2016 +0000 +++ b/newSwordAuto/sweepTime.pd Wed Feb 17 10:39:19 2016 +0000 @@ -69,6 +69,8 @@ #X floatatom 143 130 5 0 0 0 - - -; #X floatatom 612 59 5 0 0 0 - - -; #X obj 399 61 t f b; +#X floatatom 385 121 5 0 0 0 - - -; +#X floatatom 321 54 5 0 0 0 - - -; #X connect 0 0 2 0; #X connect 1 0 3 0; #X connect 4 0 5 0; @@ -106,10 +108,12 @@ #X connect 48 0 55 0; #X connect 49 0 50 1; #X connect 49 0 53 1; +#X connect 49 0 68 0; #X connect 50 0 57 0; #X connect 50 0 15 0; #X connect 51 0 52 1; #X connect 51 0 48 1; +#X connect 51 0 67 0; #X connect 52 0 53 0; #X connect 52 0 55 1; #X connect 52 0 59 0;
--- a/scene demo/WindGenD1.pd Sun Feb 14 12:27:55 2016 +0000 +++ b/scene demo/WindGenD1.pd Wed Feb 17 10:39:19 2016 +0000 @@ -45,29 +45,29 @@ #X connect 18 0 13 0; #X connect 19 0 13 0; #X restore 246 266 pd squall; -#N canvas 300 282 202 229 gust 0; +#N canvas 706 412 202 229 gust 0; #X obj 0 0 noise~; #X obj 0 63 hip~ 0; #X obj 0 106 *~; #X obj 67 44 *~; #X obj 67 21 +~ 0.5; #X obj 67 67 -~ 0.125; -#X obj 0 42 lop~ 0.5; -#X obj 0 21 lop~ 0.5; #X obj 0 84 *~ 50; #X obj 67 0 inlet~; #X obj 0 131 outlet~; -#X connect 0 0 7 0; -#X connect 1 0 8 0; -#X connect 2 0 10 0; +#X obj 0 42 lop~ 1; +#X obj 0 21 lop~ 1; +#X connect 0 0 10 0; +#X connect 1 0 6 0; +#X connect 2 0 8 0; #X connect 3 0 5 0; #X connect 4 0 3 0; #X connect 4 0 3 1; #X connect 5 0 2 1; -#X connect 6 0 1 0; -#X connect 7 0 6 0; -#X connect 8 0 2 0; -#X connect 9 0 4 0; +#X connect 6 0 2 0; +#X connect 7 0 4 0; +#X connect 9 0 1 0; +#X connect 10 0 9 0; #X restore 187 267 pd gust; #X obj 172 381 outlet~; #X obj 172 197 osc~ 0.01; @@ -98,14 +98,11 @@ #X obj 305 18 *~ 3000; #X obj 255 71 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; -#X obj 240 337 -~; #X connect 0 0 2 0; -#X connect 1 0 31 0; #X connect 1 0 6 0; #X connect 2 0 4 0; #X connect 2 0 5 0; #X connect 2 0 1 0; -#X connect 2 0 31 1; #X connect 3 0 1 1; #X connect 4 0 3 1; #X connect 5 0 3 0;
--- a/scene demo/freqCalcCyl3No_D3Mach.pd Sun Feb 14 12:27:55 2016 +0000 +++ b/scene demo/freqCalcCyl3No_D3Mach.pd Wed Feb 17 10:39:19 2016 +0000 @@ -1,4 +1,4 @@ -#N canvas 0 48 1370 784 10; +#N canvas 66 171 1370 784 10; #X text 587 178 Mass Density of Air; #X obj 709 179 *~ 1.225; #X obj 709 254 /~ 1.81e-05; @@ -415,7 +415,7 @@ #X connect 113 0 112 0; #X connect 114 0 100 0; #X restore 313 307 pd GoldfreqGain; -#N canvas 272 58 1006 797 GoldnoiseGain 0; +#N canvas 363 49 1006 797 GoldnoiseGain 0; #X text -21037 364 Mass Density of Air \, squared; #X obj -20777 459 *; #X text -20777 412 Distance; @@ -465,7 +465,7 @@ #X obj -20398 117 s~ \$0-this_azim; #X obj -20342 95 s~ \$0-this_elev; #X obj -20861 371 *~ 1.225; -#X obj -20510 100 r~ \$0-this_azim; +#X obj -20587 239 r~ \$0-this_azim; #N canvas 759 125 250 309 pow5 0; #X obj 47 67 *~; #X obj 76 35 inlet~; @@ -517,10 +517,8 @@ #X connect 9 0 2 0; #X connect 9 0 3 0; #X restore -20670 401 pd pow5; -#X obj -20624 251 /~ 360; -#X obj -20624 278 cos~; -#X obj -20609 300 r SIG_MACH; -#X obj -20609 324 sig~; +#X obj -20624 216 /~ 360; +#X obj -20624 243 cos~; #X obj -20624 349 *~; #X obj -20670 348 sig~ 1; #X obj -20670 375 -~; @@ -532,11 +530,11 @@ #X obj -20720 502 *~; #X obj -20777 530 *~; #X obj -20861 574 /~; -#X obj -20624 229 -~; -#X text -20572 236 Angle goes with the flow in Goldstein hence 90 - +#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 184 sig~ 180; -#X obj -20561 188 r~ \$0-this_elev; +#X obj -20624 149 sig~ 180; +#X obj -20609 172 r~ \$0-this_elev; #X obj -20916 137 inlet~; #X obj -20916 164 *~; #X obj -20828 253 inlet~; @@ -586,7 +584,6 @@ #X connect 16 0 15 0; #X connect 16 0 17 0; #X restore -20766 139 pd aveTimeCal; -#X obj -20861 595 *~ 0.5; #X obj -20846 203 line~; #X msg -20846 181 \$1 5; #X obj -20342 75 line~; @@ -595,60 +592,70 @@ #X msg -20777 480 \$1 5; #X obj -20398 86 line~; #X msg -20398 64 \$1 5; -#X connect 1 0 64 0; -#X connect 3 0 48 1; -#X connect 4 0 55 0; -#X connect 5 0 47 1; +#X obj -20587 285 cos~; +#X obj -20861 595 *~ 1; +#X obj -20587 262 /~ 360; +#X obj -20624 306 *~; +#X obj -20609 326 /~ 343.56; +#X connect 1 0 61 0; +#X connect 3 0 46 1; +#X connect 4 0 53 0; +#X connect 5 0 45 1; #X connect 6 0 1 0; #X connect 6 0 1 1; #X connect 13 0 17 0; +#X connect 13 0 63 0; #X connect 14 0 16 0; -#X connect 14 0 62 0; -#X connect 20 0 51 0; -#X connect 22 0 37 1; +#X connect 14 0 59 0; +#X connect 20 0 49 0; +#X connect 21 0 66 0; +#X connect 22 0 35 1; #X connect 23 0 22 0; -#X connect 24 0 36 1; +#X connect 24 0 34 1; #X connect 25 0 26 0; -#X connect 26 0 29 0; -#X connect 27 0 28 0; -#X connect 28 0 29 1; -#X connect 29 0 31 1; +#X connect 26 0 67 0; +#X connect 27 0 29 1; +#X connect 28 0 29 0; +#X connect 29 0 24 0; #X connect 30 0 31 0; -#X connect 31 0 24 0; +#X connect 30 0 31 1; +#X connect 31 0 33 1; #X connect 32 0 33 0; -#X connect 32 0 33 1; -#X connect 33 0 35 1; +#X connect 33 0 34 0; #X connect 34 0 35 0; -#X connect 35 0 36 0; -#X connect 36 0 37 0; -#X connect 37 0 38 1; -#X connect 38 0 39 1; -#X connect 39 0 58 0; -#X connect 40 0 25 0; -#X connect 42 0 40 0; -#X connect 43 0 40 1; +#X connect 35 0 36 1; +#X connect 36 0 37 1; +#X connect 37 0 65 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 44 0 45 1; -#X connect 45 0 48 0; +#X connect 45 0 47 1; #X connect 46 0 47 0; -#X connect 47 0 49 1; -#X connect 48 0 49 0; -#X connect 49 0 20 0; -#X connect 50 0 51 1; -#X connect 51 0 52 0; -#X connect 52 0 39 0; -#X connect 55 0 60 0; +#X connect 47 0 20 0; +#X connect 48 0 49 1; +#X connect 49 0 50 0; +#X connect 50 0 37 0; +#X connect 53 0 57 0; +#X connect 55 0 54 0; +#X connect 55 0 53 0; +#X connect 56 0 3 0; +#X connect 56 0 68 0; #X connect 57 0 56 0; -#X connect 57 0 55 0; -#X connect 58 0 7 0; -#X connect 59 0 3 0; -#X connect 60 0 59 0; -#X connect 61 0 19 0; -#X connect 62 0 61 0; -#X connect 63 0 38 0; -#X connect 64 0 63 0; -#X connect 65 0 18 0; -#X connect 66 0 65 0; +#X connect 58 0 19 0; +#X connect 59 0 58 0; +#X connect 60 0 36 0; +#X connect 61 0 60 0; +#X connect 62 0 18 0; +#X connect 63 0 62 0; +#X connect 64 0 67 1; +#X connect 65 0 7 0; +#X connect 66 0 64 0; +#X connect 67 0 27 0; +#X connect 68 0 27 1; #X restore 294 552 pd GoldnoiseGain; #X text 285 599 Calculates the gain of the wake; #X obj 467 82 s \$0-azim; @@ -743,21 +750,21 @@ #X obj 210 220 fcpan; #X obj 210 108 vcf~ 3; #X obj 237 198 r \$0-thisPan; -#X obj 210 81 r~ \$0-thisNoise; +#X obj 210 67 r~ \$0-thisNoise; #X obj 480 192 *~; #X obj 480 257 throw~ l; #X obj 507 234 throw~ r; #X obj 480 213 fcpan; #X obj 480 116 vcf~ 3; #X obj 507 191 r \$0-thisPan; -#X obj 480 89 r~ \$0-thisNoise; +#X obj 480 68 r~ \$0-thisNoise; #X obj 750 183 *~; #X obj 750 248 throw~ l; #X obj 777 225 throw~ r; #X obj 750 204 fcpan; #X obj 750 107 vcf~ 3; #X obj 777 182 r \$0-thisPan; -#X obj 750 80 r~ \$0-thisNoise; +#X obj 750 65 r~ \$0-thisNoise; #X obj 636 169 *~ 0.1; #X obj 217 464 *~; #X obj 217 529 throw~ l; @@ -765,25 +772,33 @@ #X obj 217 485 fcpan; #X obj 217 388 vcf~ 3; #X obj 244 463 r \$0-thisPan; -#X obj 217 361 r~ \$0-thisNoise; +#X obj 217 344 r~ \$0-thisNoise; #X obj 491 462 *~; #X obj 491 527 throw~ l; #X obj 518 504 throw~ r; #X obj 491 483 fcpan; #X obj 491 386 vcf~ 3; #X obj 518 461 r \$0-thisPan; -#X obj 491 359 r~ \$0-thisNoise; +#X obj 491 344 r~ \$0-thisNoise; #X text 273 27 Generates the sound associated with the lift dipole. ; #X text 175 312 Generates the sound associated with the drag dipole. ; -#X obj 210 130 *~ 0.5; -#X obj 480 138 *~ 0.5; -#X obj 750 129 *~ 0.5; -#X obj 491 408 *~ 0.5; -#X obj 217 410 *~ 0.5; +#X obj 243 88 r \$0-Qval; +#X obj 513 94 r \$0-Qval; +#X obj 783 86 r \$0-Qval; +#X obj 524 364 r \$0-Qval; +#X obj 250 366 r \$0-Qval; +#X obj 210 158 *~ 1; +#X obj 480 138 *~ 1; +#X obj 750 129 *~ 1; +#X obj 491 408 *~ 1; +#X obj 217 410 *~ 1; +#X floatatom 277 122 5 0 0 0 - - -; +#X obj 210 134 vcf~ 3; #X connect 0 0 2 0; #X connect 0 0 50 1; +#X connect 0 0 95 1; #X connect 1 0 5 1; #X connect 1 0 46 1; #X connect 2 0 5 0; @@ -835,19 +850,19 @@ #X connect 46 0 49 0; #X connect 49 0 47 0; #X connect 49 1 48 0; -#X connect 50 0 84 0; +#X connect 50 0 95 0; #X connect 51 0 49 1; #X connect 52 0 50 0; #X connect 53 0 56 0; #X connect 56 0 54 0; #X connect 56 1 55 0; -#X connect 57 0 85 0; +#X connect 57 0 90 0; #X connect 58 0 56 1; #X connect 59 0 57 0; #X connect 60 0 63 0; #X connect 63 0 61 0; #X connect 63 1 62 0; -#X connect 64 0 86 0; +#X connect 64 0 91 0; #X connect 65 0 63 1; #X connect 66 0 64 0; #X connect 67 0 22 1; @@ -855,20 +870,28 @@ #X connect 68 0 71 0; #X connect 71 0 69 0; #X connect 71 1 70 0; -#X connect 72 0 88 0; +#X connect 72 0 93 0; #X connect 73 0 71 1; #X connect 74 0 72 0; #X connect 75 0 78 0; #X connect 78 0 76 0; #X connect 78 1 77 0; -#X connect 79 0 87 0; +#X connect 79 0 92 0; #X connect 80 0 78 1; #X connect 81 0 79 0; -#X connect 84 0 46 0; -#X connect 85 0 53 0; -#X connect 86 0 60 0; -#X connect 87 0 75 0; -#X connect 88 0 68 0; +#X connect 84 0 50 2; +#X connect 84 0 94 0; +#X connect 84 0 95 2; +#X connect 85 0 57 2; +#X connect 86 0 64 2; +#X connect 87 0 79 2; +#X connect 88 0 72 2; +#X connect 89 0 46 0; +#X connect 90 0 53 0; +#X connect 91 0 60 0; +#X connect 92 0 75 0; +#X connect 93 0 68 0; +#X connect 95 0 89 0; #X restore 649 504 pd Dipoles; #X obj 1088 69 noise~; #X obj 1088 92 s~ \$0-thisNoise; @@ -877,12 +900,176 @@ #X obj 881 424 r myMet; #X obj 881 444 snapshot~; #X floatatom 881 467 0 0 0 0 - - -; +#N canvas 153 144 1027 635 StBandwidth 0; +#X obj 444 142 inlet; +#X obj 460 365 swap 1; +#X obj 460 391 /; +#X floatatom 514 414 0 0 0 0 - - -; +#X obj 460 342 / 100; +#X obj 460 415 outlet; +#X text 437 453 Q value; +#X obj 531 -36 r~ \$0-myRey; +#X obj 477 -36 r myMet; +#X obj 477 -14 snapshot~; +#X obj 203 164 spigot; +#X obj 219 187 spigot; +#X obj 236 140 > 0; +#X obj 252 163 < 145021; +#X obj 219 233 + 0.9797; +#X floatatom 194 270 0 0 0 0 - - -; +#X obj 219 208 * 4.624e-05; +#N canvas 249 105 810 724 linearCalc 0; +#X obj 240 36 inlet; +#X obj 248 579 outlet; +#X floatatom 263 126 0 0 0 0 - - -; +#X obj 240 59 * 38.7462; +#X obj 240 81 + 0.6254; +#X text 223 3 Peak dependant on TU value; +#X obj 339 146 inlet; +#X obj 215 435 < 193260; +#X obj 182 458 spigot; +#X obj 308 457 spigot; +#X obj 338 433 > 193260; +#X obj 125 164 - 7.685; +#X obj 125 187 / 48293; +#X obj 140 210 - 145021; +#X obj 125 255 *; +#X obj 125 278 + 7.685; +#X floatatom 81 327 0 0 0 0 - - -; +#X floatatom 123 486 0 0 0 0 - - -; +#X obj 426 221 - 193260; +#X obj 411 150 swap 2.95; +#X obj 411 174 -; +#X obj 411 197 / 50060; +#X obj 411 267 *; +#X obj 140 232 t f b; +#X obj 411 302 +; +#X obj 370 273 t f b; +#X floatatom 409 328 0 0 0 0 - - -; +#X obj 426 242 t f b; +#X floatatom 336 491 0 0 0 0 - - -; +#X obj 240 102 min 200; +#X text 328 56 Calculates the peak value of DeltaF / F depending on +the TU values. The higher the TU the higher the DeltaF/F value. A limit +of 200 has been made as the value is a % and bandwidth greater than +200% would invlove -ve frequencies; +#X text -9 102 Linear up slope of the second section; +#X text 478 174 Linear down slope of the second section; +#X text 391 391 Peak of the DeltaF / F was found to be at a Reynolds +number of 193260; +#X connect 0 0 3 0; +#X connect 3 0 4 0; +#X connect 4 0 29 0; +#X connect 6 0 10 0; +#X connect 6 0 7 0; +#X connect 6 0 18 0; +#X connect 6 0 13 0; +#X connect 7 0 8 1; +#X connect 8 0 17 0; +#X connect 8 0 1 0; +#X connect 9 0 28 0; +#X connect 9 0 1 0; +#X connect 10 0 9 1; +#X connect 11 0 12 0; +#X connect 12 0 14 0; +#X connect 13 0 23 0; +#X connect 14 0 15 0; +#X connect 15 0 16 0; +#X connect 15 0 8 0; +#X connect 18 0 27 0; +#X connect 19 0 20 0; +#X connect 19 1 20 1; +#X connect 20 0 21 0; +#X connect 21 0 22 0; +#X connect 22 0 24 0; +#X connect 23 0 14 1; +#X connect 23 1 14 0; +#X connect 24 0 26 0; +#X connect 24 0 9 0; +#X connect 25 0 24 1; +#X connect 25 1 24 0; +#X connect 27 0 22 1; +#X connect 27 1 22 0; +#X connect 29 0 2 0; +#X connect 29 0 19 0; +#X connect 29 0 25 0; +#X connect 29 0 11 0; +#X restore 444 164 pd linearCalc; +#X floatatom 384 206 0 0 0 0 - - -; +#X obj 477 188 > 145021; +#X obj 493 211 < 243320; +#X obj 444 212 spigot; +#X obj 460 235 spigot; +#X obj 602 150 spigot; +#X obj 618 173 spigot; +#X obj 635 126 > 243320; +#X obj 651 149 < 1e+06; +#X obj 618 216 * 1.227e-10; +#X obj 618 196 *; +#X obj 690 215 * -8.553e-05; +#X obj 618 261 + 16.5; +#X obj 618 238 +; +#X floatatom 640 291 0 0 0 0 - - -; +#X floatatom 565 18 0 0 0 0 - - -; +#X floatatom 475 260 0 0 0 0 - - -; +#X text -84 298 First section of the Reynolds number - DeltaF/F relationship +is linear and did not appear to be reliant on current TU values; +#X text 565 329 Third section of the Reynolds number - DeltaF/F relationship +is linear and did not appear to be reliant on current TU values; +#X text 114 -16 Middle section of Reynolds number - DeltaF/F relationship +is also linear but depends on TU Value; +#X connect 0 0 17 0; +#X connect 1 0 2 0; +#X connect 1 1 2 1; +#X connect 2 0 3 0; +#X connect 2 0 5 0; +#X connect 4 0 1 0; +#X connect 7 0 9 0; +#X connect 8 0 9 0; +#X connect 9 0 25 0; +#X connect 9 0 26 0; +#X connect 9 0 23 0; +#X connect 9 0 19 0; +#X connect 9 0 20 0; +#X connect 9 0 17 1; +#X connect 9 0 13 0; +#X connect 9 0 12 0; +#X connect 9 0 10 0; +#X connect 9 0 33 0; +#X connect 10 0 11 0; +#X connect 11 0 16 0; +#X connect 12 0 10 1; +#X connect 13 0 11 1; +#X connect 14 0 15 0; +#X connect 14 0 4 0; +#X connect 16 0 14 0; +#X connect 17 0 18 0; +#X connect 17 0 21 0; +#X connect 19 0 21 1; +#X connect 20 0 22 1; +#X connect 21 0 22 0; +#X connect 22 0 4 0; +#X connect 22 0 34 0; +#X connect 23 0 24 0; +#X connect 24 0 28 0; +#X connect 24 0 28 1; +#X connect 24 0 29 0; +#X connect 25 0 23 1; +#X connect 26 0 24 1; +#X connect 27 0 31 0; +#X connect 28 0 27 0; +#X connect 29 0 31 1; +#X connect 30 0 32 0; +#X connect 30 0 4 0; +#X connect 31 0 30 0; +#X restore 1189 91 pd StBandwidth; +#X obj 1189 67 inlet; +#X obj 1189 114 s \$0-Qval; #X connect 1 0 3 0; #X connect 2 0 20 0; #X connect 2 0 42 0; #X connect 3 0 2 0; #X connect 4 0 17 0; -#X connect 4 0 104 0; #X connect 5 0 4 0; #X connect 6 0 11 0; #X connect 6 0 43 0; @@ -905,6 +1092,7 @@ #X connect 39 0 47 0; #X connect 42 0 55 0; #X connect 42 0 5 0; +#X connect 42 0 104 0; #X connect 46 0 44 0; #X connect 46 1 45 0; #X connect 51 0 81 0; @@ -946,3 +1134,5 @@ #X connect 101 0 74 0; #X connect 103 0 104 0; #X connect 104 0 105 0; +#X connect 106 0 108 0; +#X connect 107 0 106 0;
--- a/scene demo/testBedD4.pd Sun Feb 14 12:27:55 2016 +0000 +++ b/scene demo/testBedD4.pd Wed Feb 17 10:39:19 2016 +0000 @@ -1,8 +1,8 @@ -#N canvas 70 46 1333 826 10; +#N canvas 63 57 1333 826 10; #X obj 205 -81 loadbang; #X obj -208 188 delwrite~ varwind 3000; #X obj -98 -63 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 423 1; +-1 -1 1947 1; #X obj -290 33 snapshot~; #X floatatom -290 60 10 0 0 0 - - -; #X obj -207 -19 *~ 1; @@ -10,7 +10,7 @@ #X text -293 78 Wind Speed; #X obj -9 -107 loadbang; #X msg -9 -87 5; -#X obj 255 11 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10 +#X obj 254 9 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10 -262144 -1 -1 3990 1; #X floatatom 261 35 8 0 0 0 - - -; #X obj 327 285 hsl 128 15 0.009 0.9 0 0 empty empty empty -2 -8 0 10 @@ -21,7 +21,7 @@ -1 -1 6350 1; #X floatatom 321 196 5 0 0 0 - - -; #X obj 312 222 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 7937 1; +-262144 -1 -1 9349 1; #X floatatom 336 251 5 0 0 0 - - -; #X obj 281 110 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144 -1 -1 8877 1; @@ -68,7 +68,7 @@ #X restore -234 383 pd opLevels; #X msg -225 329 5; #X obj -231 354 hsl 100 25 0.1 1e+06 1 0 empty empty empty -2 -8 0 -10 -262144 -1 -1 2403 1; +10 -262144 -1 -1 9900 1; #N canvas 20 383 344 123 machCalc 0; #X text 107 15 Speed of Sound (dry air 20 Degs C); #X obj 26 -14 vd~ varwind; @@ -83,8 +83,8 @@ #X msg 91 268 0.5; #X obj 205 -57 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; -#X obj 266 67 hsl 128 15 1 10 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 4233 1; +#X obj 266 67 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 2674 1; #X floatatom 287 86 8 0 0 0 - - -; #X msg 171 50 4; #X obj -114 357 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144 @@ -104,20 +104,19 @@ -262144 -1 -1 6350 1; #X floatatom 380 372 5 0 0 0 - - -; #X obj 425 317 r SET_UP; -#X obj 358 397 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 +#X obj 347 403 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 6350 1; -#X floatatom 377 424 5 0 0 0 - - -; +#X floatatom 366 430 5 0 0 0 - - -; #X obj 440 371 r SET_UP; -#X obj 374 450 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 +#X obj 361 455 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 6350 1; -#X floatatom 385 472 5 0 0 0 - - -; +#X floatatom 372 477 5 0 0 0 - - -; #X obj 456 424 r SET_UP; #X msg 69 326 0; #X msg 49 380 0; #X msg 30 433 0; #X text 497 398 Source Rotation Y; #X text 513 451 Source Rotation Z; -#X msg 209 166 -45; #X obj -253 124 sig~; #X floatatom -60 -40 5 0 0 0 - - -; #X msg 237 -38 0; @@ -179,7 +178,6 @@ -1 -1 0 1; #X text 482 344 Source Rotation X; #X msg 155 93 4; -#X obj -194 141 s \$0-blust; #X obj 26 131 snapshot~; #X floatatom 26 158 10 0 0 0 - - -; #X text 23 176 Wind Direction; @@ -203,67 +201,76 @@ #X msg 307 -89 0.0127; #X obj -138 -40 * 0.5; #X obj -101 -40 * 0.88; -#X msg -416 198 28 0.04 7 6 35 30000; #X obj -339 258 line \$1 50; #X obj -360 299 line \$1 50; #X obj -381 341 line \$1 50; #X obj -402 384 line \$1 50; #X obj -423 425 line \$1 50; #X obj -444 463 line \$1 50; -#X obj 248 517 freqCalcCyl3No_D3Mach; +#X obj 249 560 freqCalcCyl3No_D3Mach; #X obj -349 61 s WSPEED; #X msg -435 137 20 0.01 15 6 77 40000; -#X msg -423 165 17 0.0015 10 3 -160 30000; #X obj 574 -64 metro 100; -#X msg -444 113 23 0.037 5 4 85 40000; -#X msg -253 101 15; -#X msg 306 -33 0.006; +#X msg 209 166 0; +#X obj -194 141 s blust; +#X obj 372 509 r blust; +#X floatatom -143 139 0 0 0 0 - - -; +#X obj 372 532 * 100; +#X floatatom 390 561 0 0 0 0 - - -; +#X text 420 531 Free Stream Turbulence Intensity (%); +#X msg -444 113 23 0.006 5 4 85 40000; +#X msg -423 165 17 0.0015 10 3 -160 40000; +#X msg -416 198 28 0.04 7 6 35 40000; +#X msg -253 101 20; +#X msg 306 -33 0.004; +#X obj 430 489 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 4200 1; #X connect 0 0 33 0; -#X connect 2 0 65 0; -#X connect 2 0 113 0; -#X connect 2 0 114 0; +#X connect 2 0 64 0; +#X connect 2 0 111 0; +#X connect 2 0 112 0; #X connect 3 0 4 0; -#X connect 3 0 123 0; +#X connect 3 0 120 0; #X connect 5 0 6 0; #X connect 6 0 3 0; -#X connect 6 0 85 0; +#X connect 6 0 84 0; #X connect 8 0 9 0; #X connect 9 0 2 0; #X connect 10 0 11 0; -#X connect 10 0 122 0; +#X connect 10 0 119 0; #X connect 12 0 13 0; -#X connect 12 0 122 5; +#X connect 12 0 119 5; #X connect 15 0 16 0; -#X connect 15 0 122 3; +#X connect 15 0 119 3; #X connect 17 0 18 0; -#X connect 17 0 84 0; -#X connect 17 0 122 4; +#X connect 17 0 83 0; +#X connect 17 0 119 4; #X connect 19 0 20 0; -#X connect 19 0 122 2; +#X connect 19 0 119 2; #X connect 25 0 27 0; #X connect 26 0 22 0; #X connect 26 1 23 0; #X connect 27 0 28 0; #X connect 28 0 26 0; -#X connect 28 0 79 0; +#X connect 28 0 78 0; #X connect 30 0 41 0; #X connect 31 0 15 0; #X connect 32 0 12 0; -#X connect 33 0 66 0; -#X connect 33 0 105 0; -#X connect 33 0 91 0; +#X connect 33 0 65 0; +#X connect 33 0 103 0; +#X connect 33 0 90 0; #X connect 33 0 31 0; -#X connect 33 0 104 0; +#X connect 33 0 102 0; #X connect 33 0 32 0; #X connect 33 0 36 0; #X connect 33 0 58 0; #X connect 33 0 59 0; #X connect 33 0 60 0; #X connect 34 0 35 0; -#X connect 34 0 122 1; +#X connect 34 0 119 1; #X connect 36 0 34 0; #X connect 37 0 26 1; -#X connect 38 0 78 0; +#X connect 38 0 77 0; #X connect 42 0 10 0; #X connect 43 0 34 0; #X connect 44 0 19 0; @@ -271,67 +278,71 @@ #X connect 46 0 17 0; #X connect 47 0 12 0; #X connect 49 0 50 0; -#X connect 49 0 122 6; +#X connect 49 0 119 6; #X connect 51 0 49 0; #X connect 52 0 53 0; -#X connect 52 0 122 7; +#X connect 52 0 119 7; #X connect 54 0 52 0; #X connect 55 0 56 0; -#X connect 55 0 122 8; +#X connect 55 0 119 8; #X connect 57 0 55 0; #X connect 58 0 49 0; #X connect 59 0 52 0; #X connect 60 0 55 0; -#X connect 63 0 17 0; -#X connect 64 0 1 0; -#X connect 67 0 121 0; -#X connect 67 1 120 0; -#X connect 67 2 119 0; -#X connect 67 3 118 0; -#X connect 67 4 117 0; -#X connect 67 5 116 0; -#X connect 69 0 28 0; -#X connect 71 0 19 0; -#X connect 73 0 34 0; -#X connect 75 0 10 0; -#X connect 77 0 2 0; -#X connect 78 0 37 0; -#X connect 80 0 17 0; -#X connect 83 0 17 0; +#X connect 66 0 118 0; +#X connect 66 1 117 0; +#X connect 66 2 116 0; +#X connect 66 3 115 0; +#X connect 66 4 114 0; +#X connect 66 5 113 0; +#X connect 68 0 28 0; +#X connect 70 0 19 0; +#X connect 72 0 34 0; +#X connect 74 0 10 0; +#X connect 76 0 2 0; +#X connect 77 0 37 0; +#X connect 79 0 17 0; +#X connect 82 0 17 0; +#X connect 84 0 85 0; +#X connect 84 0 105 0; +#X connect 84 0 1 0; +#X connect 84 1 91 0; #X connect 85 0 86 0; -#X connect 85 0 107 0; -#X connect 85 1 93 0; -#X connect 86 0 87 0; -#X connect 89 0 85 1; -#X connect 91 0 19 0; -#X connect 93 0 94 0; -#X connect 96 0 5 0; -#X connect 97 0 2 0; -#X connect 98 0 126 0; -#X connect 99 0 98 0; -#X connect 101 0 93 0; -#X connect 102 0 86 0; -#X connect 103 0 3 0; -#X connect 104 0 17 0; -#X connect 105 0 10 0; -#X connect 107 0 92 0; -#X connect 108 0 17 0; -#X connect 109 0 19 0; +#X connect 88 0 84 1; +#X connect 90 0 19 0; +#X connect 91 0 92 0; +#X connect 94 0 5 0; +#X connect 95 0 2 0; +#X connect 96 0 122 0; +#X connect 97 0 96 0; +#X connect 99 0 91 0; +#X connect 100 0 85 0; +#X connect 101 0 3 0; +#X connect 102 0 17 0; +#X connect 103 0 10 0; +#X connect 105 0 124 0; +#X connect 105 0 126 0; +#X connect 106 0 17 0; +#X connect 107 0 19 0; +#X connect 108 0 10 0; +#X connect 109 0 10 0; #X connect 110 0 10 0; -#X connect 111 0 10 0; -#X connect 112 0 10 0; -#X connect 113 0 5 1; -#X connect 114 0 6 1; -#X connect 115 0 67 0; -#X connect 116 0 68 0; -#X connect 117 0 106 0; -#X connect 118 0 70 0; -#X connect 119 0 72 0; -#X connect 120 0 74 0; -#X connect 121 0 76 0; -#X connect 124 0 67 0; -#X connect 125 0 67 0; -#X connect 126 0 100 0; -#X connect 127 0 67 0; -#X connect 128 0 64 0; -#X connect 129 0 10 0; +#X connect 111 0 5 1; +#X connect 112 0 6 1; +#X connect 113 0 67 0; +#X connect 114 0 104 0; +#X connect 115 0 69 0; +#X connect 116 0 71 0; +#X connect 117 0 73 0; +#X connect 118 0 75 0; +#X connect 121 0 66 0; +#X connect 122 0 98 0; +#X connect 123 0 17 0; +#X connect 125 0 127 0; +#X connect 127 0 128 0; +#X connect 127 0 119 9; +#X connect 130 0 66 0; +#X connect 131 0 66 0; +#X connect 132 0 66 0; +#X connect 133 0 63 0; +#X connect 134 0 10 0;