Mercurial > hg > weather-synthesis-prototyping
changeset 166:8798e1b549e3
Sword, circumference of arc added
Sword, distance to observer added
Sword, Speed calculation completed
Above would benefit from a number of tests. Works for 180 sweep with constant 90 deg elevation
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Wed, 03 Feb 2016 15:36:20 +0000 |
| parents | 6aaeb2789f99 |
| children | e2b1b7fda168 |
| files | .DS_Store newSwordAuto/centreAngles.pd newSwordAuto/freqCalcCyl3No_D2Mach.pd newSwordAuto/newStrou.pd newSwordAuto/newSwordAuto.pd newSwordAuto/sweepTime.pd |
| diffstat | 6 files changed, 614 insertions(+), 276 deletions(-) [+] |
line wrap: on
line diff
--- a/newSwordAuto/centreAngles.pd Tue Feb 02 10:56:55 2016 +0000 +++ b/newSwordAuto/centreAngles.pd Wed Feb 03 15:36:20 2016 +0000 @@ -1,4 +1,4 @@ -#N canvas 199 166 1376 625 10; +#N canvas 21 76 1376 625 10; #X obj 69 140 f; #X obj 69 97 r GO; #X obj 84 118 r preswingTime; @@ -9,14 +9,13 @@ #X obj 96 301 metro 10; #X obj 96 323 snapshot~; #X floatatom 96 343 5 0 0 0 - - -; -#X obj 177 359 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 6350 1; +#X obj 177 359 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 3175 1; #X obj 231 97 r setUp; #X text 214 78 Start at 0 speed; #X obj 246 118 r presweepAzim; #X obj 231 141 f; #X msg 231 164 \$1; -#X msg 69 163 0 \$1; #X obj 355 42 t f b; #X obj 356 70 delay; #X obj 370 -3 r preswingTime; @@ -74,7 +73,7 @@ the swing circle; #X text 1092 251 Current source Elevation angle; #X obj 1085 304 s~ currentElev; -#X obj 248 265 s~ currentAzim; +#X obj 176 281 s~ currentAzim; #X obj 951 -54 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1; #X obj 951 -1 s GO; @@ -85,7 +84,19 @@ #X obj 658 175 -; #X obj 643 242 +; #X obj 658 219 r postsweepElev; -#X connect 0 0 15 0; +#X obj 443 303 line; +#X obj 505 340 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 3175 1; +#X obj 1042 316 line; +#X obj 1104 353 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 9525 1; +#X floatatom 1121 384 0 0 0 0 - - -; +#X floatatom 508 372 0 0 0 0 - - -; +#X obj 406 361 s currentAzim; +#X obj 999 349 s currentElev; +#X floatatom 405 21 0 0 0 0 - - -; +#X msg 69 163 180 \$1; +#X connect 0 0 87 0; #X connect 1 0 0 0; #X connect 2 0 0 1; #X connect 3 0 7 0; @@ -98,60 +109,73 @@ #X connect 12 0 13 1; #X connect 13 0 14 0; #X connect 14 0 3 0; -#X connect 15 0 3 0; -#X connect 16 0 17 1; -#X connect 16 1 17 0; -#X connect 17 0 22 0; -#X connect 18 0 21 1; -#X connect 19 0 23 1; -#X connect 20 0 21 0; -#X connect 21 0 16 0; -#X connect 22 0 23 0; -#X connect 23 0 25 0; -#X connect 24 0 22 1; -#X connect 25 0 3 0; -#X connect 26 0 13 0; -#X connect 28 0 53 0; -#X connect 29 0 28 0; -#X connect 30 0 53 1; -#X connect 31 0 35 0; +#X connect 14 0 78 0; +#X connect 15 0 16 1; +#X connect 15 1 16 0; +#X connect 16 0 21 0; +#X connect 17 0 20 1; +#X connect 17 0 86 0; +#X connect 18 0 22 1; +#X connect 19 0 20 0; +#X connect 20 0 15 0; +#X connect 21 0 22 0; +#X connect 22 0 24 0; +#X connect 23 0 21 1; +#X connect 24 0 3 0; +#X connect 24 0 78 0; +#X connect 25 0 13 0; +#X connect 27 0 52 0; +#X connect 28 0 27 0; +#X connect 29 0 52 1; +#X connect 30 0 68 0; +#X connect 31 0 32 0; #X connect 32 0 33 0; #X connect 33 0 34 0; #X connect 34 0 35 0; -#X connect 35 0 36 0; -#X connect 35 0 37 0; -#X connect 38 0 40 0; -#X connect 40 0 41 0; -#X connect 41 0 31 0; -#X connect 42 0 43 1; -#X connect 42 1 43 0; -#X connect 43 0 48 0; -#X connect 44 0 47 1; -#X connect 45 0 49 1; -#X connect 46 0 47 0; -#X connect 47 0 42 0; +#X connect 34 0 36 0; +#X connect 37 0 39 0; +#X connect 39 0 40 0; +#X connect 40 0 30 0; +#X connect 40 0 80 0; +#X connect 41 0 42 1; +#X connect 41 1 42 0; +#X connect 42 0 47 0; +#X connect 43 0 46 1; +#X connect 44 0 48 1; +#X connect 45 0 46 0; +#X connect 46 0 41 0; +#X connect 47 0 48 0; #X connect 48 0 49 0; -#X connect 49 0 50 0; -#X connect 50 0 31 0; -#X connect 51 0 40 1; -#X connect 52 0 48 1; -#X connect 53 0 55 0; -#X connect 54 0 28 1; -#X connect 55 0 31 0; -#X connect 56 0 57 1; -#X connect 57 0 59 0; -#X connect 57 0 64 0; -#X connect 58 0 56 0; -#X connect 58 1 57 0; -#X connect 60 0 76 0; -#X connect 61 0 76 1; -#X connect 62 0 58 0; -#X connect 63 0 56 1; -#X connect 64 0 77 0; -#X connect 71 0 72 0; -#X connect 73 0 74 0; -#X connect 75 0 40 0; -#X connect 76 0 64 1; -#X connect 77 0 66 0; -#X connect 77 0 65 0; -#X connect 78 0 77 1; +#X connect 49 0 30 0; +#X connect 49 0 80 0; +#X connect 50 0 39 1; +#X connect 51 0 47 1; +#X connect 52 0 54 0; +#X connect 53 0 27 1; +#X connect 54 0 30 0; +#X connect 54 0 80 0; +#X connect 55 0 56 1; +#X connect 56 0 58 0; +#X connect 56 0 63 0; +#X connect 57 0 55 0; +#X connect 57 1 56 0; +#X connect 59 0 75 0; +#X connect 60 0 75 1; +#X connect 61 0 57 0; +#X connect 62 0 55 1; +#X connect 63 0 76 0; +#X connect 70 0 71 0; +#X connect 72 0 73 0; +#X connect 74 0 39 0; +#X connect 75 0 63 1; +#X connect 76 0 65 0; +#X connect 76 0 64 0; +#X connect 77 0 76 1; +#X connect 78 0 79 0; +#X connect 78 0 84 0; +#X connect 79 0 83 0; +#X connect 80 0 81 0; +#X connect 80 0 85 0; +#X connect 81 0 82 0; +#X connect 87 0 3 0; +#X connect 87 0 78 0;
--- a/newSwordAuto/freqCalcCyl3No_D2Mach.pd Tue Feb 02 10:56:55 2016 +0000 +++ b/newSwordAuto/freqCalcCyl3No_D2Mach.pd Wed Feb 03 15:36:20 2016 +0000 @@ -51,7 +51,7 @@ #X text 523 31 Elevation; #X text 374 32 Distance; #X text 208 32 Diameter; -#X text 103 34 Wind Speed; +#X text 102 54 Wind Speed; #X obj 305 50 inlet; #X floatatom 305 94 5 0 0 0 - - -; #X text 301 31 Length; @@ -1067,14 +1067,19 @@ #X obj 1290 623 r myMet; #X floatatom 1292 679 0 0 0 0 - - -; #X obj 699 309 newStrou; -#X obj 110 52 inlet; -#X obj 110 73 sig~; #X obj 129 663 snapshot~; #X floatatom 129 689 0 0 0 0 - - -; #X obj 87 691 outlet; #X obj 129 638 r myMet; #X obj 32 638 r~ \$0-windSpeed; #X text 114 711 Wind Speed; +#X obj 109 72 inlet~; +#X obj 60 -2 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1 +; +#X obj 60 51 s GO; +#X obj 0 -2 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1 +-1; +#X obj 0 51 s setUp; #X connect 1 0 3 0; #X connect 2 0 24 0; #X connect 2 0 178 0; @@ -1199,8 +1204,9 @@ #X connect 178 0 69 0; #X connect 178 0 6 0; #X connect 179 0 180 0; -#X connect 180 0 15 0; -#X connect 181 0 182 0; -#X connect 181 0 183 0; -#X connect 184 0 181 0; -#X connect 185 0 181 0; +#X connect 179 0 181 0; +#X connect 182 0 179 0; +#X connect 183 0 179 0; +#X connect 185 0 15 0; +#X connect 186 0 187 0; +#X connect 188 0 189 0;
--- a/newSwordAuto/newStrou.pd Tue Feb 02 10:56:55 2016 +0000 +++ b/newSwordAuto/newStrou.pd Wed Feb 03 15:36:20 2016 +0000 @@ -1,8 +1,8 @@ -#N canvas 74 48 718 433 10; +#N canvas 183 221 718 433 10; #X obj 203 48 inlet~; -#X obj 273 202 outlet~; +#X obj 273 233 outlet~; #X text 101 20 Reynolds number coming in; -#X text 211 238 Strouhal Number going out; +#X text 211 257 Strouhal Number going out; #N canvas 385 322 1026 531 eqnSelect 0; #X msg 41 221 0.2684 -1.0356; #X msg 148 221 0.2437 -0.8607; @@ -148,6 +148,7 @@ #X floatatom 99 274 10 0 0 0 - - -; #X obj 99 175 loadbang; #X obj 273 166 +~; +#X obj 273 191 max~ 0; #X connect 0 0 4 0; #X connect 0 0 5 0; #X connect 4 0 16 0; @@ -158,5 +159,6 @@ #X connect 12 0 11 0; #X connect 13 0 12 0; #X connect 15 0 13 0; -#X connect 16 0 1 0; -#X connect 16 0 11 0; +#X connect 16 0 17 0; +#X connect 17 0 1 0; +#X connect 17 0 11 0;
--- a/newSwordAuto/newSwordAuto.pd Tue Feb 02 10:56:55 2016 +0000 +++ b/newSwordAuto/newSwordAuto.pd Wed Feb 03 15:36:20 2016 +0000 @@ -1,5 +1,5 @@ -#N canvas 71 23 1283 702 10; -#X obj 586 149 freqCalcCyl3No_D2Mach; +#N canvas 868 200 654 431 10; +#X obj 587 237 freqCalcCyl3No_D2Mach; #X obj 315 22 loadbang; #X obj 315 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1; @@ -8,19 +8,19 @@ #X obj -259 60 s NoOfSources; #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 0 1; +-1 -1 49 1; #X floatatom -276 455 8 0 0 0 - - -; #X text -24 27 Blade Length; #X text -25 93 Arm Length; #X text -231 37 Number of Sources; #X text -165 433 Top Speed; -#X obj 21 248 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 7700 1; +#X obj 21 251 hsl 100 20 85 95 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 4600 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 0 1; +-262144 -1 -1 7500 1; #X obj -280 601 hsl 100 20 0.0001 0.01 0 0 empty empty empty -2 -8 -0 10 -262144 -1 -1 0 1; +0 10 -262144 -1 -1 4200 1; #X floatatom -282 546 8 0 0 0 - - -; #X floatatom -283 629 8 0 0 0 - - -; #X obj -225 628 s tipThick; @@ -52,35 +52,34 @@ #X obj -109 6 r setUp; #X obj 83 21 loadbang; #X obj 83 45 delay 13; -#X obj 19 326 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; +#X obj 19 326 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144 +-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 -90 90 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7700 1; +#X obj 14 439 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144 +-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 -90 90 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 0 1; +#X obj 12 517 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 9900 1; #X floatatom 9 549 8 0 0 0 - - -; #X obj -49 497 r setUp; #X obj 66 470 s presweepElev; -#X obj 160 492 s postsweepElev; +#X obj 90 547 s postsweepElev; #X text 125 440 pre-sweep elevation; #X text 123 517 post-sweep elevation; #X text 132 249 pre-sweep azimuth; #X text 130 327 post-sweep azimuth; #X obj 73 279 s presweepAzim; -#X obj 166 301 s postsweepAzim; +#X obj 85 358 s postsweepAzim; #X obj -59 115 s start_armLength; #X msg -59 94 0.35; -#X msg 87 225 80; #X obj -274 139 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 5346 1; #X obj -275 233 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 5247 1; +-262144 -1 -1 4950 1; #X obj -275 324 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 5346 1; +-262144 -1 -1 4950 1; #X obj -277 162 s Xobs; #X obj -278 253 s Yobs; #X obj -278 351 s Zobs; @@ -98,17 +97,12 @@ #X msg -227 298 4; #X msg -230 116 4; #X msg 79 416 0; -#X msg 89 307 -60; -#X msg 126 416 50; -#X msg 79 494 -30; #X msg -170 207 1.034; #X msg -127 207 2.034; #X msg -81 209 3; #X msg -208 400 0.5; #X msg -188 111 0.2; #X msg -195 297 0.2; -#X obj 166 277 * -1; -#X obj 160 470 * -1; #X msg -204 491 0.02; #X msg -210 575 0.008; #X msg -141 404 35; @@ -120,18 +114,16 @@ #X obj 11 418 r thisPrE; #X obj 9 496 r thisPoE; #X msg 175 222 10; -#X msg 206 221 0; #X msg 109 492 0; -#X obj 384 23 sweepTime; -#X obj 384 45 centreAngles; -#N canvas 528 427 426 335 thickCalc 0; +#X obj 404 148 sweepTime; +#X obj 404 170 centreAngles; +#N canvas 474 470 426 335 thickCalc 0; #X obj 173 139 r NoOfSources; #X obj 158 115 -; #X obj 158 164 /; #X floatatom 126 147 5 0 0 0 - - -; #X floatatom 94 189 8 0 0 0 - - -; #X obj 173 72 t f b; -#X obj 200 95 delay 9; #X text 58 237 Calculates the difference in thickness between sources ; #X text 59 254 based on the blade tapering in a straight line; @@ -142,13 +134,12 @@ #X connect 1 0 2 0; #X connect 1 0 3 0; #X connect 2 0 4 0; -#X connect 2 0 11 0; +#X connect 2 0 10 0; #X connect 5 0 1 1; -#X connect 5 1 6 0; -#X connect 6 0 1 0; -#X connect 9 0 1 0; -#X connect 10 0 5 0; -#X restore 384 67 pd thickCalc; +#X connect 5 1 1 0; +#X connect 8 0 1 0; +#X connect 9 0 5 0; +#X restore 404 192 pd thickCalc; #N canvas 72 23 1360 722 maxCircCalc 0; #X obj 440 104 +; #X obj 468 128 s length; @@ -277,9 +268,8 @@ #X connect 63 0 66 0; #X connect 67 0 23 1; #X connect 68 0 29 1; -#X restore 383 87 pd maxCircCalc; -#X obj 384 2 sourceSpeed; -#X text 836 -13 Wind Speed; +#X restore 403 212 pd maxCircCalc; +#X obj 421 97 sourceSpeed; #X text 837 5 Diameter; #X text 839 25 Length; #X text 838 48 Distance; @@ -380,7 +370,7 @@ #X connect 41 0 42 0; #X connect 42 0 33 0; #X connect 42 0 29 0; -#X restore 383 132 pd motion; +#X restore 217 57 pd motion; #N canvas 464 138 714 620 speedCalc 0; #X obj -11 22 r azimuth; #X obj 134 18 r elevation; @@ -452,7 +442,7 @@ #X connect 31 1 27 0; #X connect 31 1 32 0; #X connect 32 0 27 0; -#X restore 384 155 pd speedCalc; +#X restore 218 80 pd speedCalc; #X obj 326 541 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X obj 389 541 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X text 386 450 Gain; @@ -545,15 +535,10 @@ #X connect 15 0 14 0; #X connect 17 0 12 0; #X connect 18 0 0 0; -#X restore 383 178 pd PlayCont; -#X msg 715 113 0; -#X msg 685 95 0.5; -#X obj 708 43 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 --1; -#X floatatom 632 262 0 0 0 0 - - -; -#X msg 606 118 4; -#X obj 534 45 r deltaThick; -#N canvas 112 23 1347 721 Distance 1; +#X restore 217 103 pd PlayCont; +#X msg 716 201 0; +#X obj 599 34 r deltaThick; +#N canvas 112 23 1347 721 Distance 0; #X obj 51 47 r Xobs; #X obj 103 47 r Yobs; #X obj 152 47 r Zobs; @@ -634,8 +619,6 @@ #X obj 989 261 outlet; #X obj 327 209 r Yobs; #X obj 440 199 r Xobs; -#X msg 643 29 40; -#X msg 459 56 100; #X connect 0 0 3 0; #X connect 0 0 3 1; #X connect 1 0 4 0; @@ -648,6 +631,8 @@ #X connect 6 0 7 0; #X connect 7 0 8 0; #X connect 8 0 9 0; +#X connect 11 0 14 0; +#X connect 12 0 15 0; #X connect 13 0 27 0; #X connect 14 0 13 0; #X connect 15 0 17 0; @@ -665,6 +650,7 @@ #X connect 26 0 25 1; #X connect 27 0 24 0; #X connect 27 0 47 0; +#X connect 28 0 29 0; #X connect 29 0 35 0; #X connect 30 0 32 0; #X connect 32 0 34 1; @@ -727,24 +713,347 @@ #X connect 75 0 77 0; #X connect 78 0 46 0; #X connect 79 0 48 0; -#X connect 80 0 15 0; -#X connect 81 0 14 0; -#X connect 81 0 29 0; -#X restore 383 198 pd Distance; +#X restore 217 123 pd Distance; #X obj -227 545 s hiltThick; #X obj -58 48 s bladeLen; #X msg -259 37 1; #X obj 315 63 metro 25; +#X obj 716 179 r setUp; +#X text 834 -12 Speed; +#X msg 206 221 100; +#N canvas 151 141 1288 727 positions 0; +#X text 374 215 z coordinate of tip; +#X text 33 243 x coordinate of tip; +#X text 261 55 y coordinate of tip; +#X obj 347 317 r Zobs; +#X obj 261 316 r Yobs; +#X obj 177 314 r Xobs; +#X floatatom 168 267 0 0 0 0 - - -; +#X floatatom 204 213 5 0 0 0 - - -; +#X floatatom 262 268 0 0 0 0 - - -; +#X floatatom 350 270 0 0 0 0 - - -; +#X floatatom 280 102 0 0 0 0 - - -; +#X floatatom 119 115 0 0 0 0 - - -; +#X floatatom 287 505 0 0 0 0 - - -; +#X obj 162 86 r currentAzim; +#X obj 162 121 * 0.01745; +#X obj 162 145 cos; +#X obj 177 167 sin; +#X obj 177 212 *; +#X obj 162 240 *; +#X obj 332 121 * -1; +#X obj 332 100 - 90; +#X obj 332 76 r currentElev; +#X obj 332 169 cos; +#X obj 332 216 *; +#X obj 261 212 *; +#X obj 246 243 *; +#X obj 246 143 sin; +#X obj 332 361 -; +#X obj 332 385 *; +#X obj 162 359 -; +#X obj 246 361 -; +#X obj 246 390 *; +#X obj 231 424 +; +#X obj 231 456 +; +#X obj 231 483 sqrt; +#X obj 231 508 outlet; +#X obj 261 167 sin; +#X obj 192 189 r length; +#X obj 276 188 r length; +#X obj 162 383 *; +#X floatatom 401 141 0 0 0 0 - - -; +#X obj 94 21 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1 +; +#X obj 94 74 s GO; +#X obj 34 21 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1 +-1; +#X obj 34 74 s setUp; +#X obj 246 119 * 0.01745; +#X obj 347 338 t f b; +#X obj 177 336 t f b; +#X obj 261 337 t f b; +#X floatatom 130 336 0 0 0 0 - - -; +#X floatatom 275 361 0 0 0 0 - - -; +#X floatatom 362 360 0 0 0 0 - - -; +#X floatatom 98 382 0 0 0 0 - - -; +#X floatatom 194 391 0 0 0 0 - - -; +#X floatatom 363 385 0 0 0 0 - - -; +#X obj 332 142 * 0.01745; +#X obj 347 193 r length; +#X obj 524 86 r currentElev; +#X obj 524 132 cos; +#X obj 524 110 * 0.01745; +#X floatatom 560 176 0 0 0 0 - - -; +#X obj 524 154 *; +#X obj 550 132 r length; +#X obj 418 477 asin; +#X obj 418 455 /; +#X floatatom 478 522 0 0 0 0 - - -; +#X obj 418 499 * 57.3066; +#X obj 433 430 t f b; +#X obj 418 522 outlet; +#X obj 561 438 sqrt; +#X obj 614 452 /; +#X floatatom 674 519 0 0 0 0 - - -; +#X obj 614 496 * 57.3066; +#X obj 629 427 t f b; +#X obj 614 519 outlet; +#X obj 614 474 acos; +#X connect 3 0 46 0; +#X connect 4 0 48 0; +#X connect 5 0 47 0; +#X connect 5 0 49 0; +#X connect 13 0 14 0; +#X connect 13 0 45 0; +#X connect 13 0 11 0; +#X connect 14 0 15 0; +#X connect 15 0 18 0; +#X connect 16 0 17 0; +#X connect 17 0 18 1; +#X connect 18 0 6 0; +#X connect 18 0 29 0; +#X connect 19 0 40 0; +#X connect 19 0 55 0; +#X connect 20 0 19 0; +#X connect 21 0 10 0; +#X connect 21 0 20 0; +#X connect 22 0 23 0; +#X connect 23 0 9 0; +#X connect 23 0 27 0; +#X connect 24 0 25 1; +#X connect 25 0 8 0; +#X connect 25 0 30 0; +#X connect 26 0 25 0; +#X connect 27 0 28 0; +#X connect 27 0 28 1; +#X connect 27 0 54 0; +#X connect 27 0 64 0; +#X connect 28 0 33 1; +#X connect 29 0 39 0; +#X connect 29 0 39 1; +#X connect 29 0 52 0; +#X connect 30 0 31 0; +#X connect 30 0 31 1; +#X connect 30 0 53 0; +#X connect 31 0 32 1; +#X connect 32 0 33 0; +#X connect 32 0 69 0; +#X connect 33 0 34 0; +#X connect 34 0 35 0; +#X connect 34 0 12 0; +#X connect 34 0 67 0; +#X connect 34 0 73 0; +#X connect 36 0 24 0; +#X connect 37 0 7 0; +#X connect 37 0 17 1; +#X connect 38 0 24 1; +#X connect 39 0 32 0; +#X connect 41 0 42 0; +#X connect 43 0 44 0; +#X connect 45 0 26 0; +#X connect 46 0 27 1; +#X connect 46 0 51 0; +#X connect 46 1 27 0; +#X connect 47 0 29 1; +#X connect 47 1 29 0; +#X connect 48 0 30 1; +#X connect 48 0 50 0; +#X connect 48 1 30 0; +#X connect 55 0 16 0; +#X connect 55 0 22 0; +#X connect 55 0 36 0; +#X connect 56 0 23 1; +#X connect 57 0 59 0; +#X connect 58 0 61 0; +#X connect 59 0 58 0; +#X connect 61 0 60 0; +#X connect 62 0 61 1; +#X connect 63 0 66 0; +#X connect 64 0 63 0; +#X connect 66 0 65 0; +#X connect 66 0 68 0; +#X connect 67 0 64 1; +#X connect 67 1 64 0; +#X connect 69 0 70 0; +#X connect 70 0 75 0; +#X connect 72 0 71 0; +#X connect 72 0 74 0; +#X connect 73 0 70 1; +#X connect 73 1 70 0; +#X connect 75 0 72 0; +#X restore 623 124 pd positions; +#X obj 611 102 r bladelen; +#X msg 432 55 0; +#X msg 461 55 1; +#X obj 432 33 r setUp; +#X obj 599 79 +; +#X obj 614 56 r tipThick; +#N canvas 111 93 1376 765 arcDist 1; +#X obj 109 118 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 +-1; +#X obj 109 171 s GO; +#X obj 49 118 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1 +-1; +#X obj 49 171 s setUp; +#X obj 506 81 * 0.01745; +#X floatatom 570 79 0 0 0 0 - - -; +#X obj 521 152 * 0.01745; +#X floatatom 584 152 0 0 0 0 - - -; +#X obj 506 104 cos; +#X obj 521 173 cos; +#X obj 506 223 *; +#X obj 521 197 t f b; +#X obj 521 272 * 0.01745; +#X obj 521 247 r presweepElev; +#X floatatom 584 272 0 0 0 0 - - -; +#X obj 616 245 * 0.01745; +#X obj 616 220 r postsweepElev; +#X floatatom 680 243 0 0 0 0 - - -; +#X obj 616 266 sin; +#X obj 616 288 t f b; +#X obj 521 296 sin; +#X obj 521 320 *; +#X obj 536 370 * 0.01745; +#X obj 652 355 * 0.01745; +#X floatatom 716 353 0 0 0 0 - - -; +#X floatatom 601 370 0 0 0 0 - - -; +#X obj 536 401 -; +#X obj 536 426 cos; +#X obj 536 446 t f b; +#X obj 521 471 *; +#X obj 652 378 t f b; +#X obj 506 520 +; +#X obj 521 495 t f b; +#X obj 506 543 acos; +#X obj 506 566 *; +#X obj 540 540 r length; +#X obj 921 200 r postsweepElev; +#X obj 506 56 r presweepElev; +#X obj 521 127 r postsweepElev; +#X obj 936 221 r presweepElev; +#X obj 370 304 -; +#X obj 921 243 -; +#X obj 370 349 select 1; +#X msg 370 373 4.24115; +#X obj 491 614 +; +#X obj 506 589 t f b; +#X obj 429 349 select 0; +#X msg 429 373 0; +#X obj 410 435 -; +#X obj 410 458 * 2; +#X floatatom 317 354 5 0 0 0 - - -; +#X obj 370 231 r postsweepAzim; +#X obj 385 253 r presweepAzim; +#X obj 385 275 t f b; +#X floatatom 490 644 0 0 0 0 - - -; +#X floatatom 565 598 0 0 0 0 - - -; +#X obj 335 640 spigot; +#X obj 425 409 t f b b; +#X floatatom 467 695 0 0 0 0 - - -; +#X obj 368 596 * -1; +#X obj 368 617 + 1; +#X obj 394 642 spigot; +#X obj 536 345 r postsweepAzim; +#X obj 652 330 r presweepAzim; +#X obj 370 327 >= 180; +#X obj 419 671 abs; +#X obj 419 697 outlet; +#X floatatom 343 689 5 0 0 0 - - -; +#X connect 0 0 1 0; +#X connect 2 0 3 0; +#X connect 4 0 8 0; +#X connect 6 0 9 0; +#X connect 8 0 10 0; +#X connect 9 0 11 0; +#X connect 10 0 31 0; +#X connect 11 0 10 1; +#X connect 11 1 10 0; +#X connect 12 0 20 0; +#X connect 13 0 14 0; +#X connect 13 0 12 0; +#X connect 15 0 18 0; +#X connect 16 0 17 0; +#X connect 16 0 15 0; +#X connect 18 0 19 0; +#X connect 19 0 21 1; +#X connect 19 1 21 0; +#X connect 20 0 21 0; +#X connect 21 0 29 0; +#X connect 22 0 26 0; +#X connect 23 0 30 0; +#X connect 26 0 27 0; +#X connect 27 0 28 0; +#X connect 28 0 29 1; +#X connect 28 1 29 0; +#X connect 29 0 32 0; +#X connect 30 0 26 1; +#X connect 30 1 26 0; +#X connect 31 0 33 0; +#X connect 32 0 31 1; +#X connect 32 1 31 0; +#X connect 33 0 34 0; +#X connect 34 0 45 0; +#X connect 34 0 55 0; +#X connect 34 0 56 0; +#X connect 35 0 34 1; +#X connect 36 0 41 0; +#X connect 37 0 5 0; +#X connect 37 0 4 0; +#X connect 38 0 7 0; +#X connect 38 0 6 0; +#X connect 39 0 41 1; +#X connect 40 0 64 0; +#X connect 42 0 43 0; +#X connect 43 0 48 0; +#X connect 44 0 54 0; +#X connect 44 0 61 0; +#X connect 45 0 44 1; +#X connect 45 0 57 0; +#X connect 45 1 44 0; +#X connect 46 0 47 0; +#X connect 47 0 48 0; +#X connect 48 0 49 0; +#X connect 49 0 44 0; +#X connect 51 0 40 0; +#X connect 52 0 53 0; +#X connect 53 0 40 1; +#X connect 53 1 40 0; +#X connect 56 0 65 0; +#X connect 56 0 67 0; +#X connect 57 0 48 1; +#X connect 57 2 48 0; +#X connect 59 0 60 0; +#X connect 60 0 56 1; +#X connect 61 0 65 0; +#X connect 61 0 67 0; +#X connect 62 0 22 0; +#X connect 62 0 25 0; +#X connect 63 0 24 0; +#X connect 63 0 23 0; +#X connect 64 0 42 0; +#X connect 64 0 46 0; +#X connect 64 0 50 0; +#X connect 64 0 59 0; +#X connect 64 0 61 1; +#X connect 65 0 58 0; +#X connect 65 0 66 0; +#X restore 425 255 pd arcDist; +#X msg 238 222 0; +#X msg 87 225 45; +#X msg 79 494 120; +#X msg 126 416 60; +#X msg 89 307 270; +#X msg 170 416 90; #X connect 1 0 2 0; -#X connect 2 0 150 0; -#X connect 4 0 148 0; +#X connect 2 0 138 0; +#X connect 4 0 136 0; #X connect 7 0 6 0; #X connect 7 0 8 0; #X connect 13 0 14 0; #X connect 13 0 59 0; -#X connect 13 0 93 0; #X connect 15 0 17 0; -#X connect 15 0 147 0; +#X connect 15 0 135 0; #X connect 16 0 18 0; #X connect 16 0 19 0; #X connect 22 0 23 0; @@ -758,88 +1067,91 @@ #X connect 32 0 16 0; #X connect 33 0 4 0; #X connect 34 0 62 0; -#X connect 35 0 149 0; +#X connect 35 0 137 0; #X connect 36 0 7 0; #X connect 37 0 15 0; #X connect 38 0 16 0; -#X connect 39 0 149 0; +#X connect 39 0 137 0; #X connect 40 0 62 0; #X connect 41 0 4 0; #X connect 42 0 43 0; #X connect 43 0 27 0; #X connect 44 0 45 0; +#X connect 44 0 60 0; #X connect 46 0 44 0; #X connect 47 0 48 0; #X connect 47 0 53 0; -#X connect 47 0 94 0; #X connect 49 0 47 0; #X connect 50 0 51 0; +#X connect 50 0 54 0; #X connect 52 0 50 0; #X connect 62 0 61 0; -#X connect 63 0 13 0; +#X connect 63 0 66 0; +#X connect 63 0 69 0; #X connect 64 0 67 0; #X connect 64 0 70 0; #X connect 65 0 68 0; #X connect 65 0 71 0; -#X connect 66 0 69 0; -#X connect 66 0 72 0; -#X connect 73 0 64 0; -#X connect 74 0 66 0; -#X connect 75 0 65 0; +#X connect 72 0 63 0; +#X connect 73 0 65 0; +#X connect 74 0 64 0; +#X connect 75 0 63 0; #X connect 76 0 64 0; #X connect 77 0 65 0; -#X connect 78 0 66 0; -#X connect 79 0 65 0; -#X connect 80 0 13 0; -#X connect 81 0 66 0; -#X connect 82 0 64 0; -#X connect 83 0 47 0; -#X connect 84 0 44 0; -#X connect 85 0 47 0; -#X connect 86 0 50 0; -#X connect 87 0 65 0; +#X connect 78 0 64 0; +#X connect 79 0 13 0; +#X connect 80 0 65 0; +#X connect 81 0 63 0; +#X connect 82 0 47 0; +#X connect 83 0 64 0; +#X connect 84 0 64 0; +#X connect 85 0 64 0; +#X connect 86 0 7 0; +#X connect 87 0 63 0; #X connect 88 0 65 0; -#X connect 89 0 65 0; -#X connect 90 0 7 0; -#X connect 91 0 64 0; -#X connect 92 0 66 0; -#X connect 93 0 60 0; -#X connect 94 0 54 0; -#X connect 95 0 15 0; -#X connect 96 0 16 0; -#X connect 97 0 7 0; -#X connect 98 0 64 0; -#X connect 99 0 65 0; -#X connect 100 0 66 0; -#X connect 101 0 13 0; -#X connect 103 0 47 0; -#X connect 104 0 50 0; -#X connect 105 0 13 0; -#X connect 106 0 13 0; -#X connect 107 0 50 0; -#X connect 129 0 131 0; -#X connect 130 0 126 0; -#X connect 130 1 127 0; -#X connect 131 0 132 0; -#X connect 132 0 130 0; -#X connect 132 0 138 0; -#X connect 133 0 130 1; -#X connect 134 0 137 0; -#X connect 136 0 132 0; -#X connect 137 0 133 0; -#X connect 140 0 0 10; -#X connect 140 0 0 9; -#X connect 140 0 0 8; -#X connect 140 0 0 7; -#X connect 141 0 0 6; -#X connect 142 0 140 0; -#X connect 142 0 141 0; -#X connect 142 0 144 0; -#X connect 144 0 0 2; -#X connect 145 0 0 1; -#X connect 146 0 0 3; -#X connect 146 1 0 5; -#X connect 146 2 0 0; -#X connect 146 2 143 0; -#X connect 149 0 5 0; -#X connect 150 0 3 0; +#X connect 89 0 15 0; +#X connect 90 0 16 0; +#X connect 91 0 7 0; +#X connect 92 0 63 0; +#X connect 93 0 64 0; +#X connect 94 0 65 0; +#X connect 95 0 13 0; +#X connect 97 0 47 0; +#X connect 98 0 50 0; +#X connect 99 0 13 0; +#X connect 100 0 50 0; +#X connect 105 0 0 0; +#X connect 121 0 123 0; +#X connect 122 0 118 0; +#X connect 122 1 119 0; +#X connect 123 0 124 0; +#X connect 124 0 122 0; +#X connect 124 0 130 0; +#X connect 125 0 122 1; +#X connect 126 0 129 0; +#X connect 128 0 124 0; +#X connect 129 0 125 0; +#X connect 132 0 0 10; +#X connect 132 0 0 9; +#X connect 132 0 0 8; +#X connect 132 0 0 7; +#X connect 133 0 147 0; +#X connect 137 0 5 0; +#X connect 138 0 3 0; +#X connect 139 0 132 0; +#X connect 141 0 13 0; +#X connect 142 0 0 3; +#X connect 143 0 0 2; +#X connect 144 0 105 0; +#X connect 145 0 105 1; +#X connect 146 0 144 0; +#X connect 146 0 145 0; +#X connect 147 0 0 1; +#X connect 148 0 147 1; +#X connect 150 0 13 0; +#X connect 151 0 13 0; +#X connect 152 0 50 0; +#X connect 153 0 47 0; +#X connect 154 0 44 0; +#X connect 155 0 47 0; +#X connect 155 0 50 0;
--- a/newSwordAuto/sweepTime.pd Tue Feb 02 10:56:55 2016 +0000 +++ b/newSwordAuto/sweepTime.pd Wed Feb 03 15:36:20 2016 +0000 @@ -1,8 +1,6 @@ -#N canvas 64 60 1299 777 10; +#N canvas 85 142 1299 777 10; #X obj 658 -89 r presweepElev; #X obj 751 -90 r postsweepElev; -#X obj 199 19 r presweepAzim; -#X floatatom 158 51 5 0 0 0 - - -; #X floatatom 658 -65 5 0 0 0 - - -; #X floatatom 751 -67 5 0 0 0 - - -; #X obj 198 -110 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 @@ -15,37 +13,17 @@ #X floatatom 852 -69 5 0 0 0 - - -; #X obj 968 -90 r bladeLen; #X floatatom 968 -67 5 0 0 0 - - -; -#X obj 214 86 r start_armLength; -#X obj 229 107 r bladeLen; -#X obj 214 131 +; -#X floatatom 232 151 5 0 0 0 - - -; #X text 328 -89 Start calculation with elevation = 0 \, arm length is constant \, acceleration/deceleration is constant.; -#X obj 199 64 * 6.28312; -#X obj 199 42 / 360; -#X floatatom 156 97 5 0 0 0 - - -; -#X obj 199 164 *; -#X floatatom 152 198 5 0 0 0 - - -; #X obj 214 185 r topSpeed; #X obj 214 210 / 2; #X obj 199 293 /; #X obj 199 317 * 1000; #X floatatom 246 346 5 0 0 0 - - -; -#X floatatom 542 40 5 0 0 0 - - -; -#X obj 598 75 r start_armLength; -#X obj 613 96 r bladeLen; -#X obj 598 120 +; -#X floatatom 616 140 5 0 0 0 - - -; -#X obj 583 53 * 6.28312; -#X obj 583 31 / 360; -#X floatatom 540 86 5 0 0 0 - - -; -#X obj 583 153 *; -#X floatatom 536 187 5 0 0 0 - - -; #X obj 598 174 r topSpeed; #X obj 598 199 / 2; #X obj 583 275 /; #X obj 583 299 * 1000; -#X obj 583 -17 r postsweepAzim; #X text 683 304 Time from 0 azimuth to; #X text 686 319 stationary at post sweep; #X text 637 199 Assuming constant acceleration; @@ -55,12 +33,6 @@ #X text 249 211 Assuming constant acceleration; #X text 25 240 Time from pre-sweep azimuth; #X text 26 253 to centre at top speed; -#X text 8 186 Pre sweep Circumference; -#X text 396 167 Post sweep Circumference; -#X text 315 380 Acceleration time; -#X text 692 359 Decceleration time; -#X text 246 130 Full radius; -#X text 648 119 Full radius; #X obj 1037 70 r preswingTime; #X obj 1022 152 +; #X obj 1009 253 delay; @@ -72,65 +44,87 @@ #X obj 1009 276 s myEnd; #X obj 1037 122 t f b; #X floatatom 955 252 5 0 0 0 - - -; -#X obj 582 10 * -1; #X obj 214 233 t f b; -#X obj 241 257 delay 9; #X obj 598 222 t f b; -#X obj 625 246 delay 9; -#X connect 0 0 4 0; -#X connect 1 0 5 0; -#X connect 2 0 3 0; -#X connect 2 0 20 0; +#X text 315 380 Acceleration time ms; +#X text 692 359 Decceleration time ms; +#X text 944 302 Send a bang o signify the swing is over; +#X obj 219 -34 r presweepAzim; +#X obj 199 129 /; +#X obj 313 25 inlet; +#X obj 199 158 *; +#X obj 384 83 +; +#X obj 583 119 /; +#X obj 583 147 *; +#X obj 583 5 r postsweepAzim; +#X obj 376 156 +; +#X floatatom 375 181 5 0 0 0 - - -; +#X floatatom 158 181 5 0 0 0 - - -; +#X floatatom 542 182 5 0 0 0 - - -; +#X floatatom 542 149 5 0 0 0 - - -; +#X msg 204 18 180; +#X obj 204 45 -; +#X obj 219 -9 t f b; +#X obj 583 33 - 180; +#X floatatom 143 130 5 0 0 0 - - -; +#X floatatom 612 59 5 0 0 0 - - -; +#X obj 399 61 t f b; +#X connect 0 0 2 0; +#X connect 1 0 3 0; +#X connect 4 0 5 0; #X connect 6 0 7 0; #X connect 8 0 9 0; #X connect 10 0 11 0; -#X connect 12 0 13 0; -#X connect 14 0 16 0; -#X connect 15 0 16 1; +#X connect 13 0 14 0; +#X connect 14 0 42 0; +#X connect 15 0 16 0; #X connect 16 0 17 0; -#X connect 16 0 22 1; -#X connect 19 0 21 0; -#X connect 19 0 22 0; -#X connect 20 0 19 0; -#X connect 22 0 23 0; -#X connect 22 0 26 0; -#X connect 24 0 25 0; -#X connect 25 0 71 0; -#X connect 26 0 27 0; -#X connect 27 0 28 0; -#X connect 27 0 48 0; -#X connect 30 0 32 0; -#X connect 31 0 32 1; -#X connect 32 0 33 0; -#X connect 32 0 37 1; -#X connect 34 0 36 0; +#X connect 16 0 26 0; +#X connect 18 0 19 0; +#X connect 19 0 43 0; +#X connect 20 0 21 0; +#X connect 21 0 25 0; +#X connect 21 0 27 0; +#X connect 31 0 40 0; +#X connect 32 0 36 1; +#X connect 33 0 39 0; #X connect 34 0 37 0; -#X connect 35 0 34 0; -#X connect 37 0 38 0; +#X connect 34 1 33 0; +#X connect 35 0 36 0; +#X connect 36 0 34 0; +#X connect 37 0 33 1; #X connect 37 0 41 0; -#X connect 39 0 40 0; -#X connect 40 0 73 0; -#X connect 41 0 42 0; -#X connect 42 0 47 0; -#X connect 42 0 49 0; -#X connect 43 0 29 0; -#X connect 43 0 70 0; -#X connect 59 0 68 0; -#X connect 60 0 64 1; -#X connect 61 0 67 0; -#X connect 62 0 65 0; -#X connect 62 1 61 0; -#X connect 63 0 64 0; -#X connect 64 0 62 0; -#X connect 65 0 61 1; -#X connect 65 0 69 0; -#X connect 66 0 60 0; -#X connect 68 0 60 1; -#X connect 68 1 60 0; -#X connect 70 0 35 0; -#X connect 71 0 26 1; -#X connect 71 1 72 0; -#X connect 72 0 26 0; -#X connect 73 0 41 1; -#X connect 73 1 74 0; -#X connect 74 0 41 0; +#X connect 38 0 32 0; +#X connect 40 0 32 1; +#X connect 40 1 32 0; +#X connect 42 0 15 1; +#X connect 42 1 15 0; +#X connect 43 0 20 1; +#X connect 43 1 20 0; +#X connect 47 0 62 0; +#X connect 48 0 50 0; +#X connect 48 0 55 0; +#X connect 49 0 50 1; +#X connect 49 0 53 1; +#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 52 0 53 0; +#X connect 52 0 55 1; +#X connect 52 0 59 0; +#X connect 53 0 58 0; +#X connect 53 0 20 0; +#X connect 54 0 63 0; +#X connect 55 0 56 0; +#X connect 60 0 61 0; +#X connect 61 0 48 0; +#X connect 61 0 64 0; +#X connect 61 0 51 0; +#X connect 62 0 61 1; +#X connect 62 1 60 0; +#X connect 63 0 52 0; +#X connect 63 0 65 0; +#X connect 63 0 66 0; +#X connect 66 0 51 1; +#X connect 66 1 51 0;