Mercurial > hg > weather-synthesis-prototyping

changeset 51:d9588eb48a99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to speed calculations and user input
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Mon, 08 Jun 2015 14:51:30 +0100
parents 880946be5a89
children 63e3a102e575
files June/woosh_D1.pd
diffstat 1 files changed, 148 insertions(+), 79 deletions(-) [+]
line wrap: on
line diff
--- a/June/woosh_D1.pd	Mon Jun 08 07:55:35 2015 +0100
+++ b/June/woosh_D1.pd	Mon Jun 08 14:51:30 2015 +0100
@@ -111,7 +111,7 @@
 #X connect 8 0 7 0;
 #X restore 65 396 pd opLevels;
 #X msg 220 403 5;
-#N canvas 966 224 718 592 source1 0;
+#N canvas 739 151 718 592 source1 1;
 #X floatatom 63 122 8 0 0 0 - - -;
 #X obj 121 86 * 40;
 #X obj 130 122 s windSpeed;
@@ -160,6 +160,9 @@
 #X text 57 145 Effective Windspeed;
 #X text 368 40 Pan value;
 #X obj 421 -199 s d4;
+#X obj 52 -237 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X msg 263 -286 70;
 #X connect 1 0 0 0;
 #X connect 1 0 2 0;
 #X connect 4 0 3 0;
@@ -210,8 +213,9 @@
 #X connect 42 0 34 1;
 #X connect 43 0 28 0;
 #X connect 43 1 6 0;
+#X connect 47 0 19 0;
+#X connect 48 0 8 0;
 #X restore 289 173 pd source1;
-#X text 33 -104 100 Sources;
 #N canvas 164 23 1133 790 tenSource 0;
 #X obj 38 139 thisFreq;
 #X obj 122 194 thisFreq;
@@ -307,84 +311,123 @@
 #X connect 21 0 22 0;
 #X restore 545 135 pd tenSource;
 #X msg 546 86 0.1;
-#N canvas 226 111 1200 655 speedCalc 1;
-#X msg 267 131 1;
-#X text 171 128 Sword Length;
-#X text 341 126 Arm Length;
-#X text 443 170 Number of sources;
-#X obj 267 191 +;
-#X obj 306 225 /;
-#X floatatom 197 216 5 0 0 0 - - -;
-#X text 104 205 Total Length;
-#X obj 404 190 /;
-#X floatatom 386 217 5 0 0 0 - - -;
-#X text 424 215 spacing of sources;
-#X text 202 272 Tip Speed;
-#X obj 327 270 swap 1;
-#X obj 327 303 -;
-#X obj 291 290 *;
-#X floatatom 228 337 5 0 0 0 - - -;
-#X obj 328 346 *;
-#X obj 229 435 +;
-#X floatatom 265 471 5 0 0 0 - - -;
-#X msg 266 258 80;
-#X text 485 309 Source Number;
-#X obj 307 3 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X floatatom 366 249 5 0 0 0 - - -;
-#X floatatom 345 327 5 0 0 0 - - -;
-#X floatatom 364 379 5 0 0 0 - - -;
-#X obj 434 319 *;
-#X floatatom 457 362 5 0 0 0 - - -;
-#X obj 317 394 *;
-#X msg 307 136 0.59;
-#X msg 419 147 100;
-#X obj 307 27 t b b;
-#X obj 307 52 t b b b b b b b;
-#X msg 449 293 100;
+#N canvas 12 52 684 554 speedCalc 1;
+#X obj 69 26 inlet;
+#X obj 145 27 inlet;
+#X obj 227 25 inlet;
+#X obj 341 23 inlet;
+#X obj 69 49 s \$0_swLen;
+#X obj 145 49 s \$0_armLen;
+#X obj 341 45 s \$0_tipSpeed;
+#X obj 141 301 r \$0_tipSpeed;
+#X obj 211 437 outlet;
+#X obj 211 414 r \$0_minSpeed;
+#X obj 126 349 s \$0_minSpeed;
+#X obj 310 414 r \$0_deltaSpeed;
+#X obj 388 261 s \$0_deltaSpeed;
+#X obj 310 437 outlet;
+#X obj 84 100 r \$0_swLen;
+#X obj 126 280 /;
+#X msg 307 20 80;
+#X floatatom 80 307 5 0 0 0 - - -;
+#X obj 173 -35 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 99 123 r \$0_armLen;
+#X obj 84 205 +;
+#X obj 99 152 t f b;
+#X floatatom 40 240 5 0 0 0 - - -;
+#X obj 126 207 r \$0_armLen;
+#X obj 126 231 t f b;
+#X obj 126 177 delay 6;
+#X obj 153 256 delay 9;
+#X msg 21 27 1;
+#X obj 227 48 s \$0_sourceTot;
+#X obj 421 202 r \$0_sourceTot;
+#X obj 126 325 *;
+#X floatatom 84 349 5 0 0 0 - - -;
+#X obj 512 119 r \$0_minSpeed;
+#X obj 388 202 -;
+#X obj 388 158 r \$0_tipSpeed;
+#X obj 388 232 /;
+#X obj 512 145 t f b;
+#X floatatom 343 261 5 0 0 0 - - -;
+#X obj 539 170 delay 14;
+#X msg 199 23 100;
+#X msg 111 23 0.5;
 #X connect 0 0 4 0;
-#X connect 0 0 8 0;
-#X connect 4 0 5 1;
-#X connect 4 0 6 0;
-#X connect 5 0 12 0;
-#X connect 5 0 14 1;
-#X connect 5 0 22 0;
-#X connect 8 0 9 0;
-#X connect 8 0 25 0;
-#X connect 12 0 13 0;
-#X connect 12 1 13 1;
-#X connect 13 0 16 0;
-#X connect 13 0 23 0;
-#X connect 14 0 15 0;
-#X connect 14 0 17 0;
-#X connect 16 0 24 0;
-#X connect 16 0 27 1;
-#X connect 17 0 18 0;
-#X connect 19 0 14 0;
-#X connect 19 0 27 0;
-#X connect 21 0 30 0;
-#X connect 25 0 16 1;
-#X connect 25 0 26 0;
-#X connect 27 0 17 1;
-#X connect 28 0 4 1;
-#X connect 28 0 5 0;
-#X connect 29 0 8 1;
+#X connect 1 0 5 0;
+#X connect 2 0 28 0;
+#X connect 3 0 6 0;
+#X connect 7 0 30 1;
+#X connect 9 0 8 0;
+#X connect 11 0 13 0;
+#X connect 14 0 20 0;
+#X connect 15 0 17 0;
+#X connect 15 0 30 0;
+#X connect 16 0 6 0;
+#X connect 18 0 27 0;
+#X connect 18 0 40 0;
+#X connect 18 0 39 0;
+#X connect 18 0 16 0;
+#X connect 19 0 21 0;
+#X connect 20 0 22 0;
+#X connect 20 0 15 1;
+#X connect 21 0 20 1;
+#X connect 21 1 25 0;
+#X connect 23 0 24 0;
+#X connect 24 0 15 0;
+#X connect 24 1 26 0;
+#X connect 25 0 20 0;
+#X connect 26 0 15 0;
+#X connect 27 0 4 0;
+#X connect 29 0 35 1;
+#X connect 30 0 10 0;
 #X connect 30 0 31 0;
-#X connect 30 1 31 0;
-#X connect 31 0 28 0;
-#X connect 31 1 0 0;
-#X connect 31 1 29 0;
-#X connect 31 1 32 0;
-#X connect 31 2 28 0;
-#X connect 31 2 29 0;
-#X connect 31 2 32 0;
-#X connect 31 3 28 0;
-#X connect 31 3 19 0;
-#X connect 31 4 28 0;
-#X connect 31 5 19 0;
-#X connect 31 6 19 0;
-#X connect 32 0 25 1;
-#X restore 557 336 pd speedCalc;
+#X connect 32 0 36 0;
+#X connect 33 0 35 0;
+#X connect 34 0 33 0;
+#X connect 35 0 37 0;
+#X connect 35 0 12 0;
+#X connect 36 0 33 1;
+#X connect 36 1 38 0;
+#X connect 38 0 33 0;
+#X connect 39 0 28 0;
+#X connect 40 0 5 0;
+#X restore 408 499 pd speedCalc;
+#X floatatom 408 524 8 0 0 0 - - -;
+#X floatatom 477 523 8 0 0 0 - - -;
+#X msg 29 -88 1;
+#X msg 24 105 100;
+#X msg 26 12 0.59;
+#X obj 408 404 r bladeLen;
+#X obj 431 427 r armLength;
+#X obj 454 451 r NoOfSources;
+#X obj 477 476 r topSpeed;
+#X obj 29 -41 s bladeLen;
+#X obj 27 57 s armLength;
+#X obj 21 150 s NoOfSources;
+#X obj 75 219 s topSpeed;
+#X msg 60 -88 1.2;
+#X msg 91 -88 1.5;
+#X msg 56 105 50;
+#X msg 89 105 120;
+#X obj 23 193 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2800 1;
+#X floatatom 20 219 8 0 0 0 - - -;
+#X obj -7 -112 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 14 -64 f;
+#X obj 11 33 f;
+#X obj 9 126 f;
+#X floatatom -16 152 5 0 0 0 - - -;
+#X floatatom -14 58 5 0 0 0 - - -;
+#X floatatom -14 -41 5 0 0 0 - - -;
+#X obj -7 -158 r topSpeed;
+#X obj -7 -135 t b;
+#X text 26 -111 Blade Length;
+#X text 25 -5 Arm Length;
+#X text 22 86 Number of Sources;
+#X text 19 173 Top Speed;
 #X connect 0 0 7 0;
 #X connect 2 0 7 1;
 #X connect 2 0 8 1;
@@ -400,4 +443,30 @@
 #X connect 16 0 11 0;
 #X connect 16 1 12 0;
 #X connect 17 0 13 0;
-#X connect 21 0 20 0;
+#X connect 20 0 19 0;
+#X connect 21 0 22 0;
+#X connect 21 1 23 0;
+#X connect 24 0 42 1;
+#X connect 25 0 44 1;
+#X connect 26 0 43 1;
+#X connect 27 0 21 0;
+#X connect 28 0 21 1;
+#X connect 29 0 21 2;
+#X connect 30 0 21 3;
+#X connect 35 0 42 1;
+#X connect 36 0 42 1;
+#X connect 37 0 44 1;
+#X connect 38 0 44 1;
+#X connect 39 0 34 0;
+#X connect 39 0 40 0;
+#X connect 41 0 42 0;
+#X connect 41 0 43 0;
+#X connect 41 0 44 0;
+#X connect 42 0 31 0;
+#X connect 42 0 47 0;
+#X connect 43 0 32 0;
+#X connect 43 0 46 0;
+#X connect 44 0 33 0;
+#X connect 44 0 45 0;
+#X connect 48 0 49 0;
+#X connect 49 0 41 0;