Mercurial > hg > weather-synthesis-prototyping
changeset 41:52511c74c3f1
Numerous improvements based on physics equation, inc intensity and azimuth angle calculations
author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
---|---|
date | Fri, 29 May 2015 20:56:56 +0100 |
parents | ca1ee52af944 |
children | 2e0fde22102e |
files | .DS_Store June/.DS_Store June/Gen2_D1.pd June/thisFreq.pd |
diffstat | 4 files changed, 222 insertions(+), 76 deletions(-) [+] |
line wrap: on
line diff
--- a/June/Gen2_D1.pd Fri May 29 15:22:13 2015 +0100 +++ b/June/Gen2_D1.pd Fri May 29 20:56:56 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas 6 90 872 721 10; +#N canvas 62 23 1169 757 10; #N canvas 236 158 426 423 windspeed 0; #X obj 3 -19 +~ 1; #X obj 3 76 +~; @@ -67,7 +67,7 @@ #X connect 5 0 3 1; #X connect 6 0 3 0; #X connect 8 0 0 0; -#X restore 250 -76 pd windspeed; +#X restore 250 -126 pd windspeed; #X text 14 5 Light air = 0.56 m/s - 1.39 m/s; #X text 14 27 Light Breeze = 1.67 m/s - 3.33 m/s; #X text 14 47 Gentle Breeze = 3.61 m/s - 5.56 m/s; @@ -81,24 +81,23 @@ #X text 15 207 Storm = 28.89 m/s - 33.06 m/s; #X text 16 225 Hurricane = 33.33 -; #X text 52 -26 Beaufort Scale Chart; -#X obj 392 125 thisFreq; #X obj 46 419 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X obj 109 419 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X obj 200 419 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144 --1 -1 5400 1; +-1 -1 600 1; #X text 229 438 Gain; #X msg 200 383 25; #X obj 200 355 loadbang; #X obj 250 28 delwrite~ varwind 3000; -#X obj 351 -78 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 1800 1; -#X obj 402 -9 snapshot~; -#X obj 402 -34 metro 100; -#X obj 402 -56 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +#X obj 333 -124 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 7200 1; +#X obj 293 -21 snapshot~; +#X obj 293 -46 metro 100; +#X obj 293 -68 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1; -#X floatatom 402 18 10 0 0 0 - - -; -#X obj 250 -37 *~ 1; -#X obj 250 -11 +~ 1; +#X floatatom 293 6 10 0 0 0 - - -; +#X obj 250 -92 *~ 1; +#X obj 250 -66 +~ 1; #X text 97 264 Equations from Chanaud 2010; #X text 10 329 Frequency = (Strouhal Number * Velocity) / Distance ; @@ -106,11 +105,9 @@ ; #X text 9 309 Strouhal Number = 0.198 * (1 - (19.7/ Reynolds Number)) ; -#X obj 392 64 vd~ varwind 200; -#X obj 502 63 hsl 128 15 0.005 0.99 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 2800 1; -#X floatatom 451 126 15 0 0 0 - - -; -#N canvas 865 368 293 255 opLevels 1; +#X obj 392 -23 vd~ varwind 200; +#X floatatom 414 37 10 0 0 0 - - -; +#N canvas 865 368 293 255 opLevels 0; #X obj 88 129 dac~; #X obj 64 70 catch~ l; #X obj 128 70 catch~ r; @@ -134,32 +131,90 @@ #X connect 7 0 4 1; #X connect 8 0 7 0; #X restore 45 376 pd opLevels; -#N canvas 804 128 171 241 makeDia 1; -#X obj 70 -14 *; -#X obj 55 14 *; -#X obj 70 -41 inlet; -#X obj 55 44 outlet; -#X connect 0 0 1 1; -#X connect 0 0 1 0; -#X connect 1 0 3 0; -#X connect 2 0 0 0; -#X connect 2 0 0 1; -#X restore 437 96 pd makeDia; -#X connect 0 0 27 0; -#X connect 17 0 36 0; -#X connect 19 0 17 0; -#X connect 20 0 19 0; -#X connect 22 0 27 1; -#X connect 22 0 28 1; -#X connect 23 0 26 0; +#X text 381 182 Frequency (Hz); +#X floatatom 392 157 10 0 0 0 - - -; +#X floatatom 648 14 10 0 0 0 - - -; +#X text 608 135 Frequency (Hz); +#X floatatom 619 110 10 0 0 0 - - -; +#X obj 619 -71 vd~ varwind 2000; +#X obj 407 14 makeDia; +#X obj 634 -16 makeDia; +#X obj 392 125 thisFreq; +#X obj 496 -60 vsl 20 50 0.005 0.99 0 0 empty empty empty 0 -9 0 10 +-262144 -1 -1 900 1; +#X obj 522 -60 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144 +-1 -1 600 1; +#X obj 465 79 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 1600 1; +#X floatatom 522 9 5 0 0 0 - - -; +#X floatatom 487 111 5 0 0 0 - - -; +#X obj 727 -81 vsl 20 50 0.005 0.99 0 0 empty empty empty 0 -9 0 10 +-262144 -1 -1 1200 1; +#X obj 771 -73 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144 +-1 -1 200 1; +#X obj 709 41 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 3200 1; +#X floatatom 771 -4 5 0 0 0 - - -; +#X floatatom 731 73 5 0 0 0 - - -; +#X obj 619 78 thisFreq; +#X floatatom 518 369 10 0 0 0 - - -; +#X text 478 494 Frequency (Hz); +#X floatatom 489 469 10 0 0 0 - - -; +#X obj 504 339 makeDia; +#X obj 587 278 vsl 20 50 0.005 0.99 0 0 empty empty empty 0 -9 0 10 +-262144 -1 -1 1100 1; +#X obj 641 286 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144 +-1 -1 1700 1; +#X obj 579 400 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 1900 1; +#X floatatom 641 355 5 0 0 0 - - -; +#X floatatom 601 432 5 0 0 0 - - -; +#X obj 489 437 thisFreq; +#X msg 456 260 100; +#X msg 489 260 500; +#X msg 521 260 1200; +#X obj 489 288 vd~ varwind \$1; +#X connect 0 0 26 0; +#X connect 16 0 34 0; +#X connect 18 0 16 0; +#X connect 19 0 18 0; +#X connect 21 0 26 1; +#X connect 21 0 27 1; +#X connect 22 0 25 0; +#X connect 23 0 22 0; #X connect 24 0 23 0; -#X connect 25 0 24 0; -#X connect 27 0 28 0; -#X connect 28 0 21 0; -#X connect 28 0 23 0; -#X connect 33 0 14 0; -#X connect 34 0 37 0; -#X connect 36 0 15 0; -#X connect 36 1 16 0; -#X connect 37 0 14 1; -#X connect 37 0 35 0; +#X connect 26 0 27 0; +#X connect 27 0 20 0; +#X connect 27 0 22 0; +#X connect 32 0 43 0; +#X connect 34 0 14 0; +#X connect 34 1 15 0; +#X connect 40 0 54 0; +#X connect 41 0 33 0; +#X connect 41 0 43 1; +#X connect 42 0 37 0; +#X connect 42 0 54 1; +#X connect 43 0 36 0; +#X connect 44 0 41 0; +#X connect 45 0 43 2; +#X connect 45 0 47 0; +#X connect 46 0 43 3; +#X connect 46 0 48 0; +#X connect 49 0 42 0; +#X connect 50 0 52 0; +#X connect 50 0 54 2; +#X connect 51 0 53 0; +#X connect 51 0 54 3; +#X connect 54 0 39 0; +#X connect 58 0 55 0; +#X connect 58 0 64 1; +#X connect 59 0 58 0; +#X connect 60 0 62 0; +#X connect 60 0 64 2; +#X connect 61 0 63 0; +#X connect 61 0 64 3; +#X connect 64 0 57 0; +#X connect 65 0 68 0; +#X connect 66 0 68 0; +#X connect 67 0 68 0; +#X connect 68 0 64 0;
--- a/June/thisFreq.pd Fri May 29 15:22:13 2015 +0100 +++ b/June/thisFreq.pd Fri May 29 20:56:56 2015 +0100 @@ -1,12 +1,10 @@ -#N canvas 516 71 470 555 10; +#N canvas 810 373 1223 757 10; #X text 46 -77 Mass Density of Air; #X text 237 301 Frequency (Hz); -#X obj 168 -139 inlet~; -#X obj 107 275 throw~ l; -#X obj 172 275 throw~ r; +#X obj 327 -119 inlet~; +#X obj 99 345 throw~ l; +#X obj 164 345 throw~ r; #X obj 139 243 osc~; -#X obj 226 -48 s diameter; -#X obj 176 128 r diameter; #X obj 168 -76 *~ 1.225; #X obj 168 -1 /~ 1.81e-05; #X obj 138 102 *~ 0.198; @@ -22,32 +20,125 @@ #X obj 99 42 sig~ 1; #X obj 138 71 -~; #X obj 138 131 *~; -#X obj 91 -98 s~ wind; -#X obj 203 100 r~ wind; #X obj 138 205 clip~ 0 20000; -#X obj 226 -75 inlet; +#X obj 329 -83 inlet; #X obj 327 275 outlet; -#X connect 2 0 8 0; -#X connect 2 0 22 0; +#X obj 247 176 loadbang; +#X text 290 37 Mass Density of Air \, squared; +#X text 550 20 Speed of Sound to power 2; +#N canvas 759 125 286 289 pow6 0; +#X obj 47 67 *~; +#X obj 76 67 *~; +#X obj 76 35 inlet~; +#X obj 47 163 outlet~; +#X obj 136 184 snapshot~; +#X obj 136 159 metro 100; +#X obj 136 137 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X floatatom 136 211 10 0 0 0 - - -; +#X obj 216 210 outlet; +#X obj 136 111 loadbang; +#X obj 106 67 *~; +#X obj 47 93 *~; +#X obj 47 118 *~; +#X connect 0 0 11 0; +#X connect 1 0 11 1; +#X connect 2 0 0 0; +#X connect 2 0 0 1; +#X connect 2 0 1 1; +#X connect 2 0 10 0; +#X connect 2 0 10 1; +#X connect 2 0 1 0; +#X connect 4 0 7 0; +#X connect 4 0 8 0; #X connect 5 0 4 0; -#X connect 5 0 3 0; -#X connect 7 0 12 1; -#X connect 8 0 11 0; -#X connect 9 0 18 1; -#X connect 10 0 21 0; -#X connect 11 0 9 0; -#X connect 12 0 24 0; -#X connect 13 0 16 0; -#X connect 13 0 26 0; -#X connect 14 0 13 0; -#X connect 15 0 14 0; +#X connect 6 0 5 0; +#X connect 9 0 6 0; +#X connect 10 0 12 1; +#X connect 11 0 12 0; +#X connect 12 0 4 0; +#X connect 12 0 3 0; +#X restore 413 -78 pd pow6; +#X text 9 -8 Reynolds Number; +#X text 17 174 Strouhal Number; +#X obj 376 -65 *~; +#X obj 413 -40 *~; +#X obj 413 -6 *~ 1; +#X obj 413 22 *~ 1.50063; +#X obj 491 -29 inlet; +#X obj 491 -4 *; +#X obj 491 21 * 118033; +#X obj 413 57 /~ 1; +#X obj 501 43 inlet; +#X obj 501 112 cos; +#X obj 501 67 / 360; +#X obj 501 89 * 6.28319; +#X obj 413 155 *~ 0.27; +#X obj 139 285 *~; +#X obj 441 260 snapshot~; +#X obj 441 235 metro 100; +#X obj 441 213 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X floatatom 441 287 10 0 0 0 - - -; +#X obj 521 286 outlet; +#X obj 441 187 loadbang; +#X floatatom 501 161 5 0 0 0 - - -; +#X obj 501 136 *; +#X text 546 46 Azimuth; +#X text 490 -49 Distance; +#X obj 336 200 *~ 1e-05; +#X obj 413 130 *~ 1; +#X connect 2 0 6 0; +#X connect 2 0 19 1; +#X connect 2 0 26 0; +#X connect 5 0 42 0; +#X connect 6 0 9 0; +#X connect 7 0 16 1; +#X connect 8 0 19 0; +#X connect 9 0 7 0; +#X connect 10 0 20 0; +#X connect 10 0 29 0; +#X connect 10 0 29 1; +#X connect 11 0 14 0; +#X connect 11 0 22 0; +#X connect 12 0 11 0; +#X connect 13 0 12 0; +#X connect 15 0 16 0; +#X connect 16 0 18 1; #X connect 17 0 18 0; -#X connect 18 0 20 1; -#X connect 19 0 20 0; -#X connect 20 0 10 0; -#X connect 21 0 12 0; -#X connect 23 0 21 1; -#X connect 24 0 5 0; -#X connect 24 0 13 0; -#X connect 25 0 11 1; -#X connect 25 0 6 0; +#X connect 18 0 8 0; +#X connect 19 0 10 0; +#X connect 20 0 5 0; +#X connect 20 0 11 0; +#X connect 21 0 9 1; +#X connect 21 0 10 1; +#X connect 21 0 31 1; +#X connect 23 0 13 0; +#X connect 26 0 30 0; +#X connect 29 0 30 1; +#X connect 30 0 31 0; +#X connect 31 0 32 0; +#X connect 32 0 36 0; +#X connect 33 0 34 0; +#X connect 33 0 34 1; +#X connect 34 0 35 0; +#X connect 35 0 36 1; +#X connect 36 0 54 0; +#X connect 37 0 39 0; +#X connect 38 0 50 0; +#X connect 38 0 50 1; +#X connect 39 0 40 0; +#X connect 40 0 38 0; +#X connect 41 0 53 0; +#X connect 42 0 3 0; +#X connect 42 0 4 0; +#X connect 43 0 46 0; +#X connect 43 0 47 0; +#X connect 44 0 43 0; +#X connect 45 0 44 0; +#X connect 48 0 45 0; +#X connect 50 0 49 0; +#X connect 50 0 54 1; +#X connect 53 0 42 1; +#X connect 53 0 43 0; +#X connect 54 0 41 0;