Mercurial > hg > weather-synthesis-prototyping
changeset 184:24b8a61996ce
Single model of Andy's added with my wind speed generator. Can be used as a good comparitor to model designed.
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Thu, 18 Feb 2016 07:58:45 +0000 |
| parents | 18d72025b517 |
| children | 7cea8f356221 |
| files | Andy's wind.pd scene demo/freqCalcCyl3No_D3Mach.pd scene demo/testBedD4.pd |
| diffstat | 3 files changed, 267 insertions(+), 176 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Andy's wind.pd Thu Feb 18 07:58:45 2016 +0000 @@ -0,0 +1,89 @@ +#N canvas 204 163 843 553 10; +#X obj 86 -22 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 200 1; +#X obj -23 22 *~ 1; +#X obj -23 48 +~ 1; +#X obj 175 -66 loadbang; +#X msg 175 -46 5; +#X floatatom 124 1 5 0 0 0 - - -; +#X obj 83 -46 r SPEED; +#X obj -23 -8 WindGenD1; +#X msg 138 -45 20; +#X obj 46 1 * 0.5; +#X obj 83 1 * 0.88; +#X obj 541 148 +~ 1000; +#X obj 541 128 *~ 1000; +#X msg 580 172 60; +#X obj 500 216 *~; +#X obj 501 192 vcf~ 1000 60; +#X obj 516 148 *~; +#X obj 500 237 *~ 2; +#X obj 500 285 throw~ l; +#X obj 564 285 throw~ r; +#X obj 344 215 *~; +#X obj 345 145 vcf~ 1000 60; +#X obj 361 193 *~; +#X obj 344 285 throw~ l; +#X obj 408 285 throw~ r; +#X obj 384 103 *~ 400; +#X obj 384 123 +~ 600; +#X obj 344 260 fcpan 0.28; +#X obj 500 260 fcpan 0.64; +#X obj 501 80 r~ white; +#X obj 344 55 r~ white; +#X obj 344 237 *~ 1.2; +#X obj 360 167 +~ 0.12; +#X obj 360 76 vd~ a 500; +#X obj 517 101 vd~ a 900; +#X text 422 316 branches/wires; +#X obj -5 172 dac~; +#X obj -23 70 delwrite~ a 3000; +#X obj -29 113 catch~ l; +#X obj 35 113 catch~ r; +#X obj 36 147 *~ 0.45; +#X obj -28 147 *~ 0.45; +#X obj 360 -38 noise~; +#X obj 360 -16 s~ white; +#X connect 0 0 5 0; +#X connect 0 0 9 0; +#X connect 0 0 10 0; +#X connect 1 0 2 0; +#X connect 2 0 37 0; +#X connect 3 0 4 0; +#X connect 4 0 0 0; +#X connect 6 0 0 0; +#X connect 7 0 1 0; +#X connect 8 0 0 0; +#X connect 9 0 1 1; +#X connect 10 0 2 1; +#X connect 11 0 15 1; +#X connect 12 0 11 0; +#X connect 13 0 15 2; +#X connect 14 0 17 0; +#X connect 15 0 14 0; +#X connect 16 0 14 1; +#X connect 17 0 28 0; +#X connect 20 0 31 0; +#X connect 21 0 20 0; +#X connect 22 0 20 1; +#X connect 25 0 26 0; +#X connect 26 0 21 1; +#X connect 27 0 23 0; +#X connect 27 1 24 0; +#X connect 28 0 18 0; +#X connect 28 1 19 0; +#X connect 29 0 15 0; +#X connect 30 0 21 0; +#X connect 31 0 27 0; +#X connect 32 0 22 0; +#X connect 32 0 22 1; +#X connect 33 0 25 0; +#X connect 33 0 32 0; +#X connect 34 0 12 0; +#X connect 34 0 16 0; +#X connect 34 0 16 1; +#X connect 38 0 41 0; +#X connect 39 0 40 0; +#X connect 40 0 36 1; +#X connect 41 0 36 0; +#X connect 42 0 43 0;
--- a/scene demo/freqCalcCyl3No_D3Mach.pd Thu Feb 18 07:51:01 2016 +0000 +++ b/scene demo/freqCalcCyl3No_D3Mach.pd Thu Feb 18 07:58:45 2016 +0000 @@ -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 573 58 1027 635 StBandwidth 1; +#N canvas 308 58 1027 635 StBandwidth 0; #X obj 23 70 inlet; #X obj 460 365 swap 1; #X obj 460 391 /; @@ -940,11 +940,10 @@ #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 97 95 810 724 linearCalc 1; +#N canvas 106 95 810 724 linearCalc 0; #X obj 240 36 inlet; #X obj 248 579 outlet; #X floatatom 263 126 0 0 0 0 - - -; @@ -1076,51 +1075,53 @@ #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 floatatom 402 435 0 0 0 0 - - -; #X obj 707 42 > 243320; -#X obj 635 126 > 145021; -#X connect 0 0 17 0; +#X obj 712 97 > 145021; +#X obj 635 126 > 193260; +#X obj 252 163 < 193260; +#X connect 0 0 16 0; #X connect 1 0 2 0; #X connect 1 1 2 1; #X connect 2 0 3 0; -#X connect 2 0 37 0; +#X connect 2 0 36 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 23 0; -#X connect 9 0 13 0; +#X connect 9 0 24 0; +#X connect 9 0 22 0; #X connect 9 0 12 0; #X connect 9 0 10 0; -#X connect 9 0 32 0; +#X connect 9 0 31 0; #X connect 9 0 40 0; +#X connect 9 0 41 0; #X connect 10 0 11 0; -#X connect 11 0 16 0; +#X connect 11 0 15 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 13 0 14 0; +#X connect 13 0 4 0; +#X connect 15 0 13 0; +#X connect 16 0 17 0; +#X connect 16 0 20 0; +#X connect 18 0 20 1; #X connect 19 0 21 1; -#X connect 20 0 22 1; -#X connect 21 0 22 0; -#X connect 22 0 33 0; -#X connect 23 0 24 0; -#X connect 24 0 28 0; -#X connect 24 0 27 1; -#X connect 24 0 27 0; -#X connect 25 0 24 1; -#X connect 26 0 30 0; -#X connect 27 0 26 0; -#X connect 28 0 30 1; -#X connect 29 0 31 0; -#X connect 29 0 4 0; -#X connect 30 0 29 0; -#X connect 37 0 5 0; -#X connect 37 0 38 0; -#X connect 40 0 23 1; +#X connect 20 0 21 0; +#X connect 21 0 32 0; +#X connect 22 0 23 0; +#X connect 23 0 27 0; +#X connect 23 0 26 1; +#X connect 23 0 26 0; +#X connect 24 0 23 1; +#X connect 25 0 29 0; +#X connect 26 0 25 0; +#X connect 27 0 29 1; +#X connect 28 0 30 0; +#X connect 28 0 4 0; +#X connect 29 0 28 0; +#X connect 36 0 5 0; +#X connect 36 0 37 0; +#X connect 40 0 22 1; +#X connect 41 0 11 1; #X restore 1189 91 pd StBandwidth; #X obj 1189 67 inlet; #X obj 1189 114 s \$0-Qval; @@ -1129,6 +1130,7 @@ #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;
--- a/scene demo/testBedD4.pd Thu Feb 18 07:51:01 2016 +0000 +++ b/scene demo/testBedD4.pd Thu Feb 18 07:58:45 2016 +0000 @@ -1,36 +1,36 @@ #N canvas 90 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 1947 1; -#X obj -290 33 snapshot~; -#X floatatom -290 60 10 0 0 0 - - -; -#X obj -207 -19 *~ 1; -#X obj -207 7 +~ 1; -#X text -293 78 Wind Speed; -#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 3990 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 +#X obj 249 -64 loadbang; +#X obj -164 205 delwrite~ varwind 3000; +#X obj -54 -46 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 2371 1; +#X obj -246 50 snapshot~; +#X floatatom -246 77 10 0 0 0 - - -; +#X obj -163 -2 *~ 1; +#X obj -163 24 +~ 1; +#X text -249 95 Wind Speed; +#X obj 35 -90 loadbang; +#X msg 35 -70 5; +#X obj 296 26 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 8214 1; +#X floatatom 303 52 8 0 0 0 - - -; +#X obj 364 302 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 6350 1; -#X floatatom 350 314 5 0 0 0 - - -; -#X text 390 12 Diameter; -#X obj 293 167 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144 +#X floatatom 394 331 5 0 0 0 - - -; +#X text 434 29 Diameter; +#X obj 337 184 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144 -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 9349 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 8877 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; -#X obj -170 426 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; -#X text -173 335 Gain; -#X obj -225 306 loadbang; +#X floatatom 365 213 5 0 0 0 - - -; +#X obj 350 239 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 7585 1; +#X floatatom 380 268 5 0 0 0 - - -; +#X obj 323 127 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 7759 1; +#X floatatom 339 156 5 0 0 0 - - -; +#X text 512 303 Pan Value; +#X obj -189 443 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; +#X obj -126 443 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; +#X text -129 352 Gain; +#X obj -181 323 loadbang; #N canvas 555 179 313 396 opLevels 0; #X obj 74 322 dac~; #X obj 30 70 catch~ l; @@ -65,9 +65,9 @@ #X connect 13 0 4 1; #X connect 14 0 0 0; #X connect 15 0 0 1; -#X restore -234 383 pd opLevels; -#X msg -225 329 5; -#X obj -231 354 hsl 100 25 0.1 1e+07 0 0 empty empty empty -2 -8 0 +#X restore -190 400 pd opLevels; +#X msg -181 346 5; +#X obj -187 371 hsl 100 25 0.1 1e+07 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 3960 1; #N canvas 20 383 344 123 machCalc 0; #X text 107 15 Speed of Sound (dry air 20 Degs C); @@ -76,68 +76,68 @@ #X obj 26 9 /~ 343.21; #X connect 1 0 3 0; #X connect 3 0 2 0; -#X restore 49 -50 pd machCalc; -#X obj 378 -138 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1 +#X restore 93 -33 pd machCalc; +#X obj 422 -121 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1 -1; -#X msg 134 150 0; -#X msg 91 268 0.5; -#X obj 205 -57 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +#X msg 178 167 0; +#X msg 135 285 0.5; +#X obj 249 -40 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 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 +#X obj 309 84 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 4011 1; +#X floatatom 331 103 8 0 0 0 - - -; +#X msg 215 67 4; +#X obj -70 374 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; -#X obj -117 311 loadbang; -#X text -52 336 No Of Sources; -#X text 397 51 Length; -#X obj 378 -97 s SET_UP; -#X obj 250 -10 r SET_UP; -#X obj 320 45 r SET_UP; -#X obj 390 84 r SET_UP; -#X obj 378 136 r SET_UP; -#X obj 388 196 r SET_UP; -#X obj 394 254 r SET_UP; -#X text 417 111 Obs Distance; -#X obj 334 343 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 +#X obj -73 328 loadbang; +#X text -8 353 No Of Sources; +#X text 441 68 Length; +#X obj 422 -80 s SET_UP; +#X obj 294 7 r SET_UP; +#X obj 364 62 r SET_UP; +#X obj 434 101 r SET_UP; +#X obj 422 153 r SET_UP; +#X obj 432 213 r SET_UP; +#X obj 438 271 r SET_UP; +#X text 461 128 Obs Distance; +#X obj 378 360 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 6350 1; -#X floatatom 371 372 5 0 0 0 - - -; -#X obj 416 317 r SET_UP; -#X obj 347 403 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 +#X floatatom 415 389 5 0 0 0 - - -; +#X obj 460 334 r SET_UP; +#X obj 391 420 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 6350 1; -#X floatatom 366 430 5 0 0 0 - - -; -#X obj 440 371 r SET_UP; -#X obj 361 455 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 +#X floatatom 410 447 5 0 0 0 - - -; +#X obj 484 388 r SET_UP; +#X obj 405 472 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 6350 1; -#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 obj -253 124 sig~; -#X floatatom -60 -40 5 0 0 0 - - -; -#X msg 237 -38 0; -#X obj -444 231 unpack f f f f f f; -#X obj -339 277 s GAIN; -#X obj -234 283 r GAIN; -#X obj -381 363 s DIST; -#X obj 456 84 r DIST; -#X obj -402 405 s LEN; -#X obj 434 44 r LEN; -#X obj -423 444 s DIA; -#X obj 432 -21 r DIA; -#X obj -444 482 s SPEED; -#X obj -101 -87 r SPEED; -#X msg -117 334 1; -#X floatatom -291 384 8 0 0 0 - - -; -#X msg 163 189 90; -#X text 445 223 Obs Elevation; -#X text 432 167 Obs Azimuth; -#X obj 452 192 r ELEV; -#X obj 485 244 s elev; +#X floatatom 416 494 5 0 0 0 - - -; +#X obj 500 441 r SET_UP; +#X msg 113 343 0; +#X msg 93 397 0; +#X msg 74 450 0; +#X text 541 415 Source Rotation Y; +#X text 557 468 Source Rotation Z; +#X obj -209 141 sig~; +#X floatatom -16 -23 5 0 0 0 - - -; +#X msg 281 -21 0; +#X obj -400 248 unpack f f f f f f; +#X obj -295 294 s GAIN; +#X obj -190 300 r GAIN; +#X obj -337 380 s DIST; +#X obj 500 101 r DIST; +#X obj -358 422 s LEN; +#X obj 478 61 r LEN; +#X obj -379 461 s DIA; +#X obj 476 -4 r DIA; +#X obj -400 499 s SPEED; +#X obj -57 -70 r SPEED; +#X msg -73 351 1; +#X floatatom -247 401 8 0 0 0 - - -; +#X msg 207 206 90; +#X text 489 240 Obs Elevation; +#X text 476 184 Obs Azimuth; +#X obj 496 209 r ELEV; +#X obj 529 261 s elev; #N canvas 634 290 596 443 windDirection 0; #X obj 183 0 inlet~; #X obj 280 52 inlet; @@ -170,61 +170,61 @@ #X connect 13 0 9 0; #X connect 14 0 7 0; #X connect 15 0 3 1; -#X restore -208 86 pd windDirection; -#X obj -55 131 snapshot~; -#X floatatom -55 158 10 0 0 0 - - -; -#X text -58 176 Wind Speed; -#X obj -112 61 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144 +#X restore -164 103 pd windDirection; +#X obj -11 148 snapshot~; +#X floatatom -11 175 10 0 0 0 - - -; +#X text -14 193 Wind Speed; +#X obj -68 78 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; -#X text 482 344 Source Rotation X; -#X msg 155 93 4; -#X obj 26 131 snapshot~; -#X floatatom 26 158 10 0 0 0 - - -; -#X text 23 176 Wind Direction; -#X obj -207 -49 WindGenD1; -#X msg -46 -86 20; -#X obj 574 -86 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +#X text 526 361 Source Rotation X; +#X msg 199 110 4; +#X obj 70 148 snapshot~; +#X floatatom 70 175 10 0 0 0 - - -; +#X text 67 193 Wind Direction; +#X obj -163 -32 WindGenD1; +#X msg -2 -69 20; +#X obj 618 -69 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1; -#X obj 574 -111 loadbang; -#X obj 574 -40 s myMet; -#X obj 26 108 r myMet; -#X obj -55 108 r myMet; -#X obj -290 7 r myMet; -#X msg 114 205 45; -#X msg 192 -6 0.005; -#X obj -360 321 s ELEV; -#X obj -194 117 TUCalc2; -#X msg 172 233 18.435; -#X msg 207 84 12.649; -#X msg 304 -50 0.019; -#X msg 305 -69 0.0254; -#X msg 305 -89 0.0127; -#X obj -138 -40 * 0.5; -#X obj -101 -40 * 0.88; -#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 249 560 freqCalcCyl3No_D3Mach; -#X obj -349 61 s WSPEED; -#X obj 574 -64 metro 100; -#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 -253 101 20; -#X msg 304 -33 0.004; -#X obj 430 489 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144 +#X obj 618 -94 loadbang; +#X obj 618 -23 s myMet; +#X obj 70 125 r myMet; +#X obj -11 125 r myMet; +#X obj -246 24 r myMet; +#X msg 158 222 45; +#X msg 236 11 0.005; +#X obj -316 338 s ELEV; +#X obj -150 134 TUCalc2; +#X msg 216 250 18.435; +#X msg 251 101 12.649; +#X msg 348 -33 0.019; +#X msg 349 -52 0.0254; +#X msg 349 -72 0.0127; +#X obj -94 -23 * 0.5; +#X obj -57 -23 * 0.88; +#X obj -295 275 line \$1 50; +#X obj -316 316 line \$1 50; +#X obj -337 358 line \$1 50; +#X obj -358 401 line \$1 50; +#X obj -379 442 line \$1 50; +#X obj -400 480 line \$1 50; +#X obj 293 577 freqCalcCyl3No_D3Mach; +#X obj -305 78 s WSPEED; +#X obj 618 -47 metro 100; +#X msg 253 183 0; +#X obj -150 158 s blust; +#X obj 416 526 r blust; +#X floatatom -99 156 0 0 0 0 - - -; +#X obj 416 549 * 100; +#X floatatom 434 578 0 0 0 0 - - -; +#X text 464 548 Free Stream Turbulence Intensity (%); +#X msg -209 118 20; +#X msg 348 -16 0.004; +#X obj 474 506 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; -#X msg -444 113 23 0.006 5 4 85 4e+06; -#X msg -416 198 28 0.04 7 6 35 4e+06; -#X msg -435 137 24 0.01 15 6 77 4e+06; -#X msg -423 165 17 0.0015 10 3 -100 4e+06; +#X msg -400 130 23 0.006 5 4 85 4e+06; +#X msg -372 215 28 0.04 7 6 35 4e+06; +#X msg -391 154 24 0.01 15 6 77 4e+06; +#X msg -379 182 17 0.0015 10 3 -100 4e+06; #X connect 0 0 33 0; #X connect 2 0 64 0; #X connect 2 0 111 0;