Mercurial > hg > weather-synthesis-prototyping
changeset 182:6ab985b939c2
SceneD1 model tested
Sword Tested
Need to improve TU model in the calculation section
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Wed, 17 Feb 2016 18:43:53 +0000 |
| parents | 4c6c8c511a48 |
| children | 18d72025b517 |
| files | newSwordAuto/freqCalcCyl3No_D3Mach.pd newSwordAuto/newSwordAuto.pd scene demo/SceneD1.pd scene demo/freqCalcCyl3No_D3Mach.pd scene demo/testBedD4.pd |
| diffstat | 5 files changed, 761 insertions(+), 536 deletions(-) [+] |
line wrap: on
line diff
--- a/newSwordAuto/freqCalcCyl3No_D3Mach.pd Wed Feb 17 16:40:48 2016 +0000 +++ b/newSwordAuto/freqCalcCyl3No_D3Mach.pd Wed Feb 17 18:43:53 2016 +0000 @@ -1,4 +1,4 @@ -#N canvas 55 29 1199 685 10; +#N canvas 55 29 1322 694 10; #X text 387 265 Mass Density of Air; #X obj 509 266 *~ 1.225; #X obj 509 296 *~ 1; @@ -320,7 +320,7 @@ #X connect 91 0 15 0; #X connect 92 0 43 1; #X restore 117 312 pd GoldfreqGain; -#N canvas 534 206 861 633 GoldnoiseGain 1; +#N canvas 534 206 861 633 GoldnoiseGain 0; #X text -21029 218 Mass Density of Air \, squared; #X text -20831 411 Distance; #N canvas 759 125 235 275 pow8 0; @@ -521,186 +521,6 @@ #X obj 137 449 r~ \$0-myCor; #X obj 636 81 max 0.01; #X obj 636 104 min 0.99; -#N canvas 93 119 976 679 Dipoles 0; -#X obj 76 62 r~ \$0-myFreq; -#X obj 91 107 r~ \$0-liftDiGain; -#X obj 76 88 osc~; -#X obj 76 261 throw~ l; -#X obj 103 238 throw~ r; -#X obj 76 195 *~; -#X obj 76 216 fcpan; -#X obj 103 195 r \$0-thisPan; -#X obj 353 69 r~ \$0-myFreq; -#X obj 368 154 r~ \$0-liftDiGain; -#X obj 353 114 osc~; -#X obj 353 268 throw~ l; -#X obj 380 245 throw~ r; -#X obj 353 202 *~; -#X obj 353 223 fcpan; -#X obj 380 202 r \$0-thisPan; -#X obj 368 176 *~ 0.6; -#X obj 621 62 r~ \$0-myFreq; -#X obj 636 147 r~ \$0-liftDiGain; -#X obj 621 107 osc~; -#X obj 621 261 throw~ l; -#X obj 648 238 throw~ r; -#X obj 621 195 *~; -#X obj 621 216 fcpan; -#X obj 648 195 r \$0-thisPan; -#X obj 621 86 *~ 5; -#X obj 353 93 *~ 3; -#X obj 72 345 r~ \$0-myFreq; -#X obj 72 399 osc~; -#X obj 72 544 throw~ l; -#X obj 99 521 throw~ r; -#X obj 72 478 *~; -#X obj 72 499 fcpan; -#X obj 99 478 r \$0-thisPan; -#X obj 87 418 r~ \$0-dragDiGain; -#X obj 72 373 *~ 2; -#X obj 351 344 r~ \$0-myFreq; -#X obj 351 398 osc~; -#X obj 351 543 throw~ l; -#X obj 378 520 throw~ r; -#X obj 351 477 *~; -#X obj 351 498 fcpan; -#X obj 378 477 r \$0-thisPan; -#X obj 366 417 r~ \$0-dragDiGain; -#X obj 351 372 *~ 4; -#X obj 366 446 *~ 0.125; -#X obj 210 199 *~; -#X obj 210 264 throw~ l; -#X obj 237 241 throw~ r; -#X obj 210 220 fcpan; -#X obj 210 130 *~ 0.5; -#X obj 210 108 vcf~ 3; -#X obj 237 198 r \$0-thisPan; -#X obj 210 81 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 138 *~ 0.5; -#X obj 480 116 vcf~ 3; -#X obj 507 191 r \$0-thisPan; -#X obj 480 89 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 129 *~ 0.5; -#X obj 750 107 vcf~ 3; -#X obj 777 182 r \$0-thisPan; -#X obj 750 80 r~ \$0-thisNoise; -#X obj 636 169 *~ 0.1; -#X obj 217 464 *~; -#X obj 217 529 throw~ l; -#X obj 244 506 throw~ r; -#X obj 217 485 fcpan; -#X obj 217 410 *~ 0.5; -#X obj 217 388 vcf~ 3; -#X obj 244 463 r \$0-thisPan; -#X obj 217 361 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 408 *~ 0.5; -#X obj 491 386 vcf~ 3; -#X obj 518 461 r \$0-thisPan; -#X obj 491 359 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 connect 0 0 2 0; -#X connect 0 0 51 1; -#X connect 1 0 5 1; -#X connect 1 0 46 1; -#X connect 2 0 5 0; -#X connect 5 0 6 0; -#X connect 6 0 3 0; -#X connect 6 1 4 0; -#X connect 7 0 6 1; -#X connect 8 0 26 0; -#X connect 9 0 16 0; -#X connect 10 0 13 0; -#X connect 13 0 14 0; -#X connect 14 0 11 0; -#X connect 14 1 12 0; -#X connect 15 0 14 1; -#X connect 16 0 13 1; -#X connect 16 0 54 1; -#X connect 17 0 25 0; -#X connect 18 0 70 0; -#X connect 19 0 22 0; -#X connect 22 0 23 0; -#X connect 23 0 20 0; -#X connect 23 1 21 0; -#X connect 24 0 23 1; -#X connect 25 0 19 0; -#X connect 25 0 67 1; -#X connect 26 0 10 0; -#X connect 26 0 59 1; -#X connect 27 0 35 0; -#X connect 28 0 31 0; -#X connect 31 0 32 0; -#X connect 32 0 29 0; -#X connect 32 1 30 0; -#X connect 33 0 32 1; -#X connect 34 0 31 1; -#X connect 34 0 71 1; -#X connect 35 0 28 0; -#X connect 35 0 76 1; -#X connect 36 0 44 0; -#X connect 37 0 40 0; -#X connect 40 0 41 0; -#X connect 41 0 38 0; -#X connect 41 1 39 0; -#X connect 42 0 41 1; -#X connect 43 0 45 0; -#X connect 44 0 37 0; -#X connect 44 0 84 1; -#X connect 45 0 40 1; -#X connect 45 0 79 1; -#X connect 46 0 49 0; -#X connect 49 0 47 0; -#X connect 49 1 48 0; -#X connect 50 0 46 0; -#X connect 51 0 50 0; -#X connect 52 0 49 1; -#X connect 53 0 51 0; -#X connect 54 0 57 0; -#X connect 57 0 55 0; -#X connect 57 1 56 0; -#X connect 58 0 54 0; -#X connect 59 0 58 0; -#X connect 60 0 57 1; -#X connect 61 0 59 0; -#X connect 62 0 65 0; -#X connect 65 0 63 0; -#X connect 65 1 64 0; -#X connect 66 0 62 0; -#X connect 67 0 66 0; -#X connect 68 0 65 1; -#X connect 69 0 67 0; -#X connect 70 0 22 1; -#X connect 70 0 62 1; -#X connect 71 0 74 0; -#X connect 74 0 72 0; -#X connect 74 1 73 0; -#X connect 75 0 71 0; -#X connect 76 0 75 0; -#X connect 77 0 74 1; -#X connect 78 0 76 0; -#X connect 79 0 82 0; -#X connect 82 0 80 0; -#X connect 82 1 81 0; -#X connect 83 0 79 0; -#X connect 84 0 83 0; -#X connect 85 0 82 1; -#X connect 86 0 84 0; -#X restore 449 591 pd Dipoles; #X obj 1066 59 noise~; #X obj 1066 82 s~ \$0-thisNoise; #X obj 777 219 r~ \$0-thisNoise; @@ -719,8 +539,399 @@ #X obj 542 82 s~ \$0-elev; #X obj 169 267 r~ \$0-elev; #X obj 191 532 r~ \$0-elev; +#N canvas 405 141 1027 635 StBandwidth 0; +#X obj 444 142 inlet; +#X obj 460 365 swap 1; +#X obj 460 391 /; +#X floatatom 534 431 0 0 0 0 - - -; +#X obj 460 342 / 100; +#X obj 461 434 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 obj 461 412 max 0.005; +#X floatatom 412 438 0 0 0 0 - - -; +#X connect 0 0 17 0; #X connect 1 0 2 0; -#X connect 2 0 85 0; +#X connect 1 1 2 1; +#X connect 2 0 3 0; +#X connect 2 0 38 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 9 0 16 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 34 0; +#X connect 22 0 4 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 31 0 30 0; +#X connect 38 0 5 0; +#X connect 38 0 39 0; +#X restore 1179 68 pd StBandwidth; +#X obj 1179 44 inlet; +#X obj 1179 91 s \$0-Qval; +#N canvas 991 296 976 679 Dipoles 0; +#X obj 76 62 r~ \$0-myFreq; +#X obj 91 107 r~ \$0-liftDiGain; +#X obj 76 88 osc~; +#X obj 76 261 throw~ l; +#X obj 103 238 throw~ r; +#X obj 76 216 fcpan; +#X obj 103 195 r \$0-thisPan; +#X obj 353 69 r~ \$0-myFreq; +#X obj 368 135 r~ \$0-liftDiGain; +#X obj 353 114 osc~; +#X obj 353 285 throw~ l; +#X obj 380 262 throw~ r; +#X obj 353 180 *~; +#X obj 353 240 fcpan; +#X obj 380 220 r \$0-thisPan; +#X obj 368 157 *~ 0.6; +#X obj 621 62 r~ \$0-myFreq; +#X obj 636 125 r~ \$0-liftDiGain; +#X obj 621 107 osc~; +#X obj 621 280 throw~ l; +#X obj 648 257 throw~ r; +#X obj 621 173 *~; +#X obj 621 235 fcpan; +#X obj 648 214 r \$0-thisPan; +#X obj 621 86 *~ 5; +#X obj 353 93 *~ 3; +#X obj 72 345 r~ \$0-myFreq; +#X obj 72 399 osc~; +#X obj 72 544 throw~ l; +#X obj 99 521 throw~ r; +#X obj 72 443 *~; +#X obj 72 499 fcpan; +#X obj 99 478 r \$0-thisPan; +#X obj 87 418 r~ \$0-dragDiGain; +#X obj 72 373 *~ 2; +#X obj 351 344 r~ \$0-myFreq; +#X obj 351 398 osc~; +#X obj 351 543 throw~ l; +#X obj 378 520 throw~ r; +#X obj 351 436 *~; +#X obj 351 498 fcpan; +#X obj 378 477 r \$0-thisPan; +#X obj 385 392 r~ \$0-dragDiGain; +#X obj 351 372 *~ 4; +#X obj 385 415 *~ 0.125; +#X obj 210 199 *~; +#X obj 210 264 throw~ l; +#X obj 237 241 throw~ r; +#X obj 210 220 fcpan; +#X obj 210 108 vcf~ 3; +#X obj 237 198 r \$0-thisPan; +#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 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 65 r~ \$0-thisNoise; +#X obj 636 147 *~ 0.1; +#X obj 217 464 *~; +#X obj 217 529 throw~ l; +#X obj 244 506 throw~ r; +#X obj 217 485 fcpan; +#X obj 217 388 vcf~ 3; +#X obj 244 463 r \$0-thisPan; +#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 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 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 159 *~ 1; +#X obj 750 154 *~ 1; +#X obj 491 428 *~ 1; +#X obj 217 431 *~ 1; +#X floatatom 277 122 5 0 0 0 - - -; +#X obj 210 134 vcf~ 3; +#X obj 76 145 *~; +#X obj 480 138 vcf~ 3; +#X obj 750 131 vcf~ 3; +#X obj 491 407 vcf~ 3; +#X obj 217 409 vcf~ 3; +#X obj 76 174 *~ 0.01; +#X obj 353 201 *~ 0.01; +#X obj 621 193 *~ 0.01; +#X obj 351 457 *~ 0.01; +#X obj 72 462 *~ 0.01; +#X connect 0 0 2 0; +#X connect 0 0 49 1; +#X connect 0 0 94 1; +#X connect 1 0 45 1; +#X connect 1 0 95 1; +#X connect 2 0 95 0; +#X connect 5 0 3 0; +#X connect 5 1 4 0; +#X connect 6 0 5 1; +#X connect 7 0 25 0; +#X connect 8 0 15 0; +#X connect 9 0 12 0; +#X connect 12 0 101 0; +#X connect 13 0 10 0; +#X connect 13 1 11 0; +#X connect 14 0 13 1; +#X connect 15 0 12 1; +#X connect 15 0 52 1; +#X connect 16 0 24 0; +#X connect 17 0 66 0; +#X connect 18 0 21 0; +#X connect 21 0 102 0; +#X connect 22 0 19 0; +#X connect 22 1 20 0; +#X connect 23 0 22 1; +#X connect 24 0 18 0; +#X connect 24 0 63 1; +#X connect 24 0 97 1; +#X connect 25 0 9 0; +#X connect 25 0 56 1; +#X connect 25 0 96 1; +#X connect 26 0 34 0; +#X connect 27 0 30 0; +#X connect 30 0 104 0; +#X connect 31 0 28 0; +#X connect 31 1 29 0; +#X connect 32 0 31 1; +#X connect 33 0 30 1; +#X connect 33 0 67 1; +#X connect 34 0 27 0; +#X connect 34 0 71 1; +#X connect 34 0 99 1; +#X connect 35 0 43 0; +#X connect 36 0 39 0; +#X connect 39 0 103 0; +#X connect 40 0 37 0; +#X connect 40 1 38 0; +#X connect 41 0 40 1; +#X connect 42 0 44 0; +#X connect 43 0 36 0; +#X connect 43 0 78 1; +#X connect 43 0 98 1; +#X connect 44 0 39 1; +#X connect 44 0 74 1; +#X connect 45 0 48 0; +#X connect 48 0 46 0; +#X connect 48 1 47 0; +#X connect 49 0 94 0; +#X connect 50 0 48 1; +#X connect 51 0 49 0; +#X connect 52 0 55 0; +#X connect 55 0 53 0; +#X connect 55 1 54 0; +#X connect 56 0 96 0; +#X connect 57 0 55 1; +#X connect 58 0 56 0; +#X connect 59 0 62 0; +#X connect 62 0 60 0; +#X connect 62 1 61 0; +#X connect 63 0 97 0; +#X connect 64 0 62 1; +#X connect 65 0 63 0; +#X connect 66 0 21 1; +#X connect 66 0 59 1; +#X connect 67 0 70 0; +#X connect 70 0 68 0; +#X connect 70 1 69 0; +#X connect 71 0 99 0; +#X connect 72 0 70 1; +#X connect 73 0 71 0; +#X connect 74 0 77 0; +#X connect 77 0 75 0; +#X connect 77 1 76 0; +#X connect 78 0 98 0; +#X connect 79 0 77 1; +#X connect 80 0 78 0; +#X connect 83 0 49 2; +#X connect 83 0 93 0; +#X connect 83 0 94 2; +#X connect 84 0 56 2; +#X connect 84 0 96 2; +#X connect 85 0 63 2; +#X connect 85 0 97 2; +#X connect 86 0 78 2; +#X connect 86 0 98 2; +#X connect 87 0 71 2; +#X connect 87 0 99 2; +#X connect 88 0 45 0; +#X connect 89 0 52 0; +#X connect 90 0 59 0; +#X connect 91 0 74 0; +#X connect 92 0 67 0; +#X connect 94 0 88 0; +#X connect 95 0 100 0; +#X connect 96 0 89 0; +#X connect 97 0 90 0; +#X connect 98 0 91 0; +#X connect 99 0 92 0; +#X connect 100 0 5 0; +#X connect 101 0 13 0; +#X connect 102 0 22 0; +#X connect 103 0 40 0; +#X connect 104 0 31 0; +#X restore 764 528 pd Dipoles; +#X connect 1 0 2 0; +#X connect 2 0 84 0; #X connect 3 0 15 0; #X connect 4 0 3 0; #X connect 5 0 9 0; @@ -762,17 +973,19 @@ #X connect 72 0 64 3; #X connect 73 0 74 0; #X connect 74 0 43 0; -#X connect 76 0 77 0; -#X connect 78 0 58 0; -#X connect 80 0 12 0; -#X connect 81 0 82 0; -#X connect 83 0 63 5; -#X connect 84 0 64 2; -#X connect 85 0 17 0; -#X connect 85 0 32 0; -#X connect 86 0 87 0; -#X connect 88 0 63 7; -#X connect 89 0 64 6; -#X connect 90 0 91 0; -#X connect 92 0 63 6; -#X connect 93 0 64 7; +#X connect 75 0 76 0; +#X connect 77 0 58 0; +#X connect 79 0 12 0; +#X connect 80 0 81 0; +#X connect 82 0 63 5; +#X connect 83 0 64 2; +#X connect 84 0 17 0; +#X connect 84 0 32 0; +#X connect 85 0 86 0; +#X connect 87 0 63 7; +#X connect 88 0 64 6; +#X connect 89 0 90 0; +#X connect 91 0 63 6; +#X connect 92 0 64 7; +#X connect 93 0 95 0; +#X connect 94 0 93 0;
--- a/newSwordAuto/newSwordAuto.pd Wed Feb 17 16:40:48 2016 +0000 +++ b/newSwordAuto/newSwordAuto.pd Wed Feb 17 18:43:53 2016 +0000 @@ -4,19 +4,19 @@ 1; #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 4950 1; +#X obj -273 429 hsl 100 20 0 1000 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 346 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 1237 1; +-1 -1 2475 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 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 7900 1; +#X obj -279 516 hsl 100 20 0 0.05 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 2300 1; +#X obj -280 601 hsl 100 20 0.0001 0.03 0 0 empty empty empty -2 -8 +0 10 -262144 -1 -1 1700 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 0 1; +-1 -1 300 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 7975 1; +-1 -1 7425 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 1650 1; +-1 -1 4950 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 4675 1; +-1 -1 4950 1; #X floatatom 9 549 8 0 0 0 - - -; #X obj -49 497 r setUp; #X obj 66 470 s presweepElev; @@ -67,11 +67,11 @@ #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 5049 1; +-1 -1 5346 1; #X obj -276 146 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 4950 1; +#X obj -276 237 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -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; #X obj -279 166 s Yobs; #X obj -279 264 s Zobs; @@ -130,8 +130,8 @@ #X connect 7 0 3 1; #X restore 427 102 pd opLevels; #X msg 436 48 5; -#X obj 430 73 hsl 100 25 0.1 3000 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 165 1; +#X obj 430 73 hsl 100 25 0.1 100000 1 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 9300 1; #X obj 427 2 r GAIN; #X floatatom 370 103 8 0 0 0 - - -; #X obj -227 545 s hiltThick; @@ -145,7 +145,7 @@ #X msg 238 222 80; #X msg -171 120 1; #X msg -196 210 2; -#N canvas 87 92 1277 549 sources 0; +#N canvas 87 92 1277 549 sources 1; #X obj 312 -80 sweepTime; #N canvas 100 23 841 797 arcDist 0; #X obj 118 59 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 @@ -290,7 +290,7 @@ #X connect 61 1 38 0; #X connect 62 0 60 1; #X restore 432 -114 pd arcDist; -#N canvas 563 178 378 516 one_Source 0; +#N canvas 563 178 378 516 one_Source 1; #X msg 227 355 0; #X obj 227 314 r setUp; #N canvas 189 123 896 643 positions 0; @@ -757,6 +757,7 @@ #X connect 0 0 5 9; #X connect 0 0 5 8; #X connect 0 0 5 7; +#X connect 0 0 5 10; #X connect 1 0 0 0; #X connect 1 0 3 0; #X connect 2 0 5 3; @@ -1568,7 +1569,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -1724,30 +1724,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 11 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 193 123 pd one_Source; #N canvas 563 178 378 516 one_Source 0; #X msg 227 355 0; @@ -2057,7 +2059,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -2213,30 +2214,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 10 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 280 123 pd one_Source; #N canvas 563 178 378 516 one_Source 0; #X msg 227 355 0; @@ -2546,7 +2549,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -2702,30 +2704,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 9 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 370 122 pd one_Source; #N canvas 563 178 378 516 one_Source 0; #X msg 227 355 0; @@ -3035,7 +3039,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -3191,30 +3194,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 8 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 456 122 pd one_Source; #N canvas 563 178 378 516 one_Source 0; #X msg 227 355 0; @@ -3524,7 +3529,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -3680,30 +3684,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 7 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 543 122 pd one_Source; #N canvas 563 178 378 516 one_Source 0; #X msg 227 355 0; @@ -4013,7 +4019,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -4169,30 +4174,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 6 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 631 122 pd one_Source; #N canvas 563 178 378 516 one_Source 0; #X msg 227 355 0; @@ -4502,7 +4509,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -4658,30 +4664,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 5 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 717 122 pd one_Source; #N canvas 563 178 378 516 one_Source 0; #X msg 227 355 0; @@ -4991,7 +4999,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -5147,30 +5154,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 4 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 804 122 pd one_Source; #N canvas 563 178 378 516 one_Source 0; #X msg 227 355 0; @@ -5480,7 +5489,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -5636,30 +5644,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 3 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 894 121 pd one_Source; #N canvas 563 178 378 516 one_Source 0; #X msg 227 355 0; @@ -5969,7 +5979,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -6125,32 +6134,34 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 2 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 980 121 pd one_Source; -#N canvas 563 178 378 516 one_Source 0; +#N canvas 563 178 378 516 one_Source 1; #X msg 227 355 0; #X obj 227 314 r setUp; #N canvas 189 123 896 643 positions 0; @@ -6458,7 +6469,6 @@ #X restore 159 291 pd positions; #X msg 200 336 0.5; #X obj 145 165 r bladeLen; -#X obj 118 378 freqCalcCyl3No_D3Mach; #X obj 228 23 loadbang; #N canvas 649 57 311 384 lengthCalc 0; #X obj 151 48 inlet; @@ -6614,30 +6624,32 @@ #X obj 214 251 inlet~; #X obj 228 271 inlet~; #X msg 228 46 1 12; -#X connect 0 0 5 9; -#X connect 0 0 5 8; -#X connect 0 0 5 7; +#X obj 118 378 freqCalcCyl3No_D3Mach; +#X connect 0 0 17 9; +#X connect 0 0 17 8; +#X connect 0 0 17 7; +#X connect 0 0 17 10; #X connect 1 0 0 0; #X connect 1 0 3 0; -#X connect 2 0 5 3; -#X connect 2 1 5 4; -#X connect 2 2 5 5; -#X connect 3 0 5 6; -#X connect 4 0 5 2; -#X connect 6 0 17 0; -#X connect 7 0 2 2; -#X connect 7 0 11 0; -#X connect 8 0 5 1; -#X connect 9 0 17 0; -#X connect 10 0 11 1; -#X connect 11 0 5 0; -#X connect 12 0 2 0; -#X connect 13 0 2 1; -#X connect 14 0 2 3; -#X connect 15 0 2 4; -#X connect 16 0 2 5; -#X connect 17 0 7 0; -#X connect 17 0 8 0; +#X connect 2 0 17 3; +#X connect 2 1 17 4; +#X connect 2 2 17 5; +#X connect 3 0 17 6; +#X connect 4 0 17 2; +#X connect 5 0 16 0; +#X connect 6 0 2 2; +#X connect 6 0 10 0; +#X connect 7 0 17 1; +#X connect 8 0 16 0; +#X connect 9 0 10 1; +#X connect 10 0 17 0; +#X connect 11 0 2 0; +#X connect 12 0 2 1; +#X connect 13 0 2 3; +#X connect 14 0 2 4; +#X connect 15 0 2 5; +#X connect 16 0 6 0; +#X connect 16 0 7 0; #X restore 1067 121 pd one_Source; #X connect 1 0 0 0; #X connect 1 0 2 2; @@ -6715,7 +6727,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 1707 1; +-1 -1 1862 1; #X floatatom -319 368 5 0 0 0 - - -; #X obj -324 319 r setUp; #X obj -279 300 r thisLength; @@ -6744,11 +6756,9 @@ #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 0; -#X msg 31 46 2 0 1 1 45 0.005 0.0045 130 210 60 60 50 bang; +#N canvas 301 296 1054 554 Presets 1; #X obj 31 19 inlet; #X obj 345 14 inlet; -#X msg 666 40 2 0 1 1 45 0.005 0.0045 130 210 60 60 50 bang; #X obj 666 10 inlet; #X obj 400 120 select 1 2 3; #X obj 43 121 r GO; @@ -6760,15 +6770,12 @@ #X obj 83 318 spigot; #X obj 18 384 s GO; #X obj 18 361 onebang 1; -#X msg 83 341 2 0 1 1 45 0.005 0.0045 135 225 120 120 50 bang; #X msg 21 179 bang; #X obj 43 146 delay 200; #X obj 48 277 delay 200; #X obj 13 210 delay 50; #X obj 18 341 delay 50; #X obj 437 517 outlet; -#X msg 78 210 2 0 1 1 45 0.005 0.0045 130 210 60 120 50 bang; -#X msg 345 44 1 2 1 0.6 60 0.012 0.008 90 270 45 90 50 bang; #X obj 476 192 r GO; #X obj 511 258 spigot; #X obj 446 324 s GO; @@ -6777,59 +6784,65 @@ #X obj 446 281 delay 50; #X msg 577 215 0; #X msg 549 214 1; -#X msg 512 281 1 2 1 0.6 50 0.012 0.008 45 290 30 85 50 bang; #X obj 476 217 delay 330; -#X connect 0 0 21 0; -#X connect 1 0 0 0; -#X connect 1 0 5 0; -#X connect 1 0 16 0; -#X connect 2 0 23 0; -#X connect 2 0 5 0; -#X connect 2 0 28 0; -#X connect 4 0 3 0; -#X connect 4 0 5 0; -#X connect 5 0 9 0; -#X connect 5 0 30 0; -#X connect 5 1 8 0; -#X connect 5 1 31 0; -#X connect 5 2 8 0; -#X connect 5 2 30 0; -#X connect 6 0 17 0; -#X connect 7 0 22 0; -#X connect 7 0 19 0; -#X connect 8 0 7 1; -#X connect 8 0 12 1; -#X connect 9 0 7 1; -#X connect 9 0 12 1; -#X connect 11 0 10 0; -#X connect 11 0 18 0; -#X connect 12 0 15 0; -#X connect 12 0 20 0; -#X connect 14 0 13 0; -#X connect 15 0 21 0; -#X connect 16 0 11 1; -#X connect 16 0 14 1; -#X connect 17 0 7 0; -#X connect 18 0 12 0; -#X connect 19 0 11 0; -#X connect 20 0 14 0; +#X msg 31 46 2 0 1 1 45 0.005 0.0045 130 210 60 60 50000 bang; +#X msg 78 210 2 0 1 1 45 0.005 0.0045 130 210 60 120 50000 bang; +#X msg 83 341 2 0 1 1 45 0.005 0.0045 135 225 120 120 50000 bang; +#X msg 345 44 1 2 1 0.6 60 0.012 0.008 90 270 45 90 50000 bang; +#X msg 512 281 1 2 1 0.6 50 0.012 0.008 45 290 30 85 50000 bang; +#X msg 666 40 2 0 1 1 45 0.005 0.0045 130 210 60 60 50000 bang; +#X connect 0 0 28 0; +#X connect 0 0 3 0; +#X connect 0 0 13 0; +#X connect 1 0 31 0; +#X connect 1 0 3 0; +#X connect 1 0 23 0; +#X connect 2 0 33 0; +#X connect 2 0 3 0; +#X connect 3 0 7 0; +#X connect 3 0 25 0; +#X connect 3 1 6 0; +#X connect 3 1 26 0; +#X connect 3 2 6 0; +#X connect 3 2 25 0; +#X connect 4 0 14 0; +#X connect 5 0 29 0; +#X connect 5 0 16 0; +#X connect 6 0 5 1; +#X connect 6 0 10 1; +#X connect 7 0 5 1; +#X connect 7 0 10 1; +#X connect 9 0 8 0; +#X connect 9 0 15 0; +#X connect 10 0 30 0; +#X connect 10 0 17 0; +#X connect 12 0 11 0; +#X connect 13 0 9 1; +#X connect 13 0 12 1; +#X connect 14 0 5 0; +#X connect 15 0 10 0; +#X connect 16 0 9 0; +#X connect 17 0 12 0; +#X connect 19 0 27 0; +#X connect 20 0 24 0; +#X connect 20 0 32 0; #X connect 22 0 21 0; -#X connect 23 0 21 0; -#X connect 24 0 33 0; -#X connect 25 0 29 0; -#X connect 25 0 32 0; -#X connect 27 0 26 0; -#X connect 28 0 27 1; -#X connect 29 0 27 0; -#X connect 30 0 25 1; -#X connect 31 0 25 1; -#X connect 32 0 21 0; -#X connect 33 0 25 0; +#X connect 23 0 22 1; +#X connect 24 0 22 0; +#X connect 25 0 20 1; +#X connect 26 0 20 1; +#X connect 27 0 20 0; +#X connect 28 0 18 0; +#X connect 29 0 18 0; +#X connect 30 0 18 0; +#X connect 31 0 18 0; +#X connect 32 0 18 0; #X restore 458 324 pd Presets; #X msg 458 298 1; #X msg 486 298 2; #X msg 515 297 3; #X obj 527 325 s preswing; +#X msg 383 346 20 23 -2 1.7 280 0.05 0.03 0 360 90 90 0.1 bang; #X connect 0 0 1 0; #X connect 1 0 99 0; #X connect 4 0 3 0; @@ -6940,10 +6953,10 @@ #X connect 138 10 125 0; #X connect 138 11 136 0; #X connect 138 12 139 0; -#X connect 140 0 138 0; #X connect 141 0 140 0; #X connect 141 0 144 0; #X connect 142 0 140 1; #X connect 142 0 144 0; #X connect 143 0 140 2; #X connect 143 0 144 0; +#X connect 145 0 138 0;
--- a/scene demo/SceneD1.pd Wed Feb 17 16:40:48 2016 +0000 +++ b/scene demo/SceneD1.pd Wed Feb 17 18:43:53 2016 +0000 @@ -1,4 +1,4 @@ -#N canvas 116 33 1216 686 10; +#N canvas 37 95 1216 686 10; #X declare -lib mrpeach; #X text 74 65 Light air = 0.56 m/s - 1.39 m/s; #X text 74 87 Light Breeze = 1.67 m/s - 3.33 m/s; @@ -3201,8 +3201,8 @@ #X connect 15 0 0 1; #X restore 307 373 pd opLevels; #X msg 316 319 5; -#X obj 310 344 hsl 100 25 0.1 1e+06 1 0 empty empty empty -2 -8 0 10 --262144 -1 -1 2403 1; +#X obj 310 344 hsl 100 25 0.1 1e+07 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 1803 1; #X obj 427 347 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; #X obj 424 301 loadbang; @@ -3212,7 +3212,7 @@ #X floatatom 250 374 8 0 0 0 - - -; #X obj 367 130 delwrite~ varwind 3000; #X obj 477 -121 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 423 1; +-1 -1 3023 1; #X obj 285 -25 snapshot~; #X floatatom 285 2 10 0 0 0 - - -; #X obj 368 -77 *~ 1;
--- a/scene demo/freqCalcCyl3No_D3Mach.pd Wed Feb 17 16:40:48 2016 +0000 +++ b/scene demo/freqCalcCyl3No_D3Mach.pd Wed Feb 17 18:43:53 2016 +0000 @@ -1,4 +1,4 @@ -#N canvas 66 171 1370 784 10; +#N canvas 36 69 1370 784 10; #X text 587 178 Mass Density of Air; #X obj 709 179 *~ 1.225; #X obj 709 254 /~ 1.81e-05; @@ -697,7 +697,7 @@ #X obj 320 424 r~ \$0-myCor; #X obj 636 81 max 0.01; #X obj 636 104 min 0.99; -#N canvas 93 119 976 679 Dipoles 1; +#N canvas 93 119 976 679 Dipoles 0; #X obj 76 62 r~ \$0-myFreq; #X obj 91 107 r~ \$0-liftDiGain; #X obj 76 88 osc~; @@ -926,7 +926,7 @@ #X obj 881 424 r myMet; #X obj 881 444 snapshot~; #X floatatom 881 467 0 0 0 0 - - -; -#N canvas 405 141 1027 635 StBandwidth 1; +#N canvas 405 141 1027 635 StBandwidth 0; #X obj 444 142 inlet; #X obj 460 365 swap 1; #X obj 460 391 /; @@ -1098,7 +1098,6 @@ #X connect 1 0 3 0; #X connect 2 0 20 0; #X connect 2 0 42 0; -#X connect 2 0 104 0; #X connect 3 0 2 0; #X connect 4 0 17 0; #X connect 5 0 4 0;
--- a/scene demo/testBedD4.pd Wed Feb 17 16:40:48 2016 +0000 +++ b/scene demo/testBedD4.pd Wed Feb 17 18:43:53 2016 +0000 @@ -2,7 +2,7 @@ #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 1439 1; +-1 -1 2032 1; #X obj -290 33 snapshot~; #X floatatom -290 60 10 0 0 0 - - -; #X obj -207 -19 *~ 1; @@ -11,7 +11,7 @@ #X obj -9 -107 loadbang; #X msg -9 -87 5; #X obj 252 9 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10 --262144 -1 -1 903 1; +-262144 -1 -1 5127 1; #X floatatom 259 35 8 0 0 0 - - -; #X obj 320 285 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 6350 1; @@ -21,10 +21,10 @@ -1 -1 6350 1; #X floatatom 321 196 5 0 0 0 - - -; #X obj 306 222 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 2822 1; +-262144 -1 -1 9066 1; #X floatatom 336 251 5 0 0 0 - - -; #X obj 279 110 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144 --1 -1 9670 1; +-1 -1 7759 1; #X floatatom 295 139 5 0 0 0 - - -; #X text 468 286 Pan Value; #X obj -233 426 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; @@ -84,7 +84,7 @@ #X obj 205 -57 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X obj 265 67 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6016 1; +-1 -1 9358 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