# HG changeset patch
# User Roderick Selfridge <r.selfridge@qmul.ac.uk>
# Date 1429458398 -3600
# Node ID 8a8fb9f10895868e5a0f035a11a057d5411d9edf
# Parent  2e73f3e7bb2e404993081e182be80b586c101efe
Wally1 added

diff -r 2e73f3e7bb2e -r 8a8fb9f10895 Wally1.pd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Wally1.pd	Sun Apr 19 16:46:38 2015 +0100
@@ -0,0 +1,243 @@
+#N canvas 399 282 703 290 10;
+#N canvas 177 189 624 513 pro1 0;
+#X obj 230 118 * 1.225;
+#X obj 244 145 *;
+#X obj 244 171 / 1.81e-05;
+#X floatatom 120 237 15 0 0 0 - - -;
+#X obj 244 200 swap 19.7;
+#X obj 244 231 /;
+#X obj 244 262 swap 1;
+#X obj 244 290 -;
+#X obj 244 317 * 0.198;
+#X floatatom 163 462 10 0 0 0 - - -;
+#X obj 244 346 *;
+#X obj 244 377 /;
+#X text 20 234 Reynolds Number;
+#X text 36 87 Wind Speed (m/s);
+#X obj 230 71 +;
+#X floatatom 151 91 5 0 0 0 - - -;
+#X obj 265 37 r baseSpeed;
+#X obj 250 93 s windSpeed;
+#X obj 318 317 r windSpeed;
+#X obj 194 36 r varWind;
+#X obj 329 112 t f b;
+#X text 107 116 Mass Density of Air;
+#X text 90 166 Dynamic Viscosity of Air;
+#X text 59 459 Frequency (Hz);
+#X floatatom 161 342 5 0 0 0 - - -;
+#X text 46 337 Strouhal Number;
+#X obj 329 81 r Diameter1;
+#X obj 318 342 r Diameter1;
+#X obj 244 460 s outFreq1;
+#X obj 120 267 s rey1;
+#X obj 244 403 max 0.1;
+#X obj 244 430 min 21000;
+#N canvas 339 172 428 263 soundGen 0;
+#X obj -89 49 noise~;
+#X obj -75 87 bp~ 1000 10;
+#X obj 37 60 osc~;
+#X obj 37 86 *~ 0.1;
+#X obj -75 203 throw~ L;
+#X obj -24 180 throw~ R;
+#X obj 37 193 throw~ L;
+#X obj 88 173 throw~ R;
+#X obj -44 15 min 20000;
+#X obj -27 59 r qValue2;
+#N canvas 103 204 481 424 thisQ 0;
+#X obj 125 47 < 5000;
+#X floatatom 20 289 8 0 0 0 - - -;
+#X obj 92 72 spigot;
+#X obj 213 43 > 5000;
+#X obj 180 71 spigot;
+#X obj 180 116 spigot;
+#X obj 230 94 < 10000;
+#X obj 92 101 / 5000;
+#X obj 92 181 /;
+#X floatatom 120 326 8 0 0 0 - - -;
+#X obj 180 218 /;
+#X obj 180 245 *;
+#X obj 180 141 / 10000;
+#X obj 180 192 swap 160;
+#X obj 180 166 * 260;
+#X obj 180 272 *;
+#X obj 337 74 spigot;
+#X obj 370 46 > 10000;
+#X obj 337 145 / 300000;
+#X obj 337 115 spigot;
+#X obj 387 93 < 300000;
+#X floatatom 268 363 8 0 0 0 - - -;
+#X obj 92 127 * 300;
+#X obj 92 156 swap 300;
+#X obj 92 205 *;
+#X obj 92 233 *;
+#X obj 337 197 swap 120;
+#X obj 337 224 /;
+#X obj 337 248 *;
+#X obj 337 169 * 5000;
+#X obj 336 334 max 2;
+#X obj 92 262 + 100;
+#X obj 180 297 * 50;
+#X obj 336 307 * 20;
+#X obj 92 21 r rey1;
+#X obj 180 19 r rey1;
+#X obj 337 22 r rey1;
+#X obj 387 68 r rey1;
+#X obj 230 69 r rey1;
+#X obj 92 288 s qValue1;
+#X obj 180 323 s qValue1;
+#X obj 337 359 s qValue1;
+#X connect 0 0 2 1;
+#X connect 2 0 7 0;
+#X connect 3 0 4 1;
+#X connect 4 0 5 0;
+#X connect 5 0 12 0;
+#X connect 6 0 5 1;
+#X connect 7 0 22 0;
+#X connect 8 0 24 0;
+#X connect 8 0 24 1;
+#X connect 10 0 11 0;
+#X connect 10 0 11 1;
+#X connect 11 0 15 0;
+#X connect 11 0 15 1;
+#X connect 12 0 14 0;
+#X connect 13 0 10 0;
+#X connect 13 1 10 1;
+#X connect 14 0 13 0;
+#X connect 15 0 32 0;
+#X connect 16 0 19 0;
+#X connect 17 0 16 1;
+#X connect 18 0 29 0;
+#X connect 19 0 18 0;
+#X connect 20 0 19 1;
+#X connect 22 0 23 0;
+#X connect 23 0 8 0;
+#X connect 23 1 8 1;
+#X connect 24 0 25 0;
+#X connect 24 0 25 1;
+#X connect 25 0 31 0;
+#X connect 26 0 27 0;
+#X connect 26 1 27 1;
+#X connect 27 0 28 0;
+#X connect 27 0 28 1;
+#X connect 28 0 33 0;
+#X connect 29 0 26 0;
+#X connect 30 0 41 0;
+#X connect 31 0 1 0;
+#X connect 31 0 39 0;
+#X connect 32 0 9 0;
+#X connect 32 0 40 0;
+#X connect 33 0 30 0;
+#X connect 33 0 21 0;
+#X connect 34 0 0 0;
+#X connect 34 0 2 0;
+#X connect 35 0 3 0;
+#X connect 35 0 4 0;
+#X connect 36 0 16 0;
+#X connect 36 0 17 0;
+#X connect 37 0 20 0;
+#X connect 38 0 6 0;
+#X restore 53 -12 pd thisQ;
+#X obj 37 145 *~;
+#X obj 88 145 *~;
+#X obj 119 109 / 127;
+#X obj -75 153 *~;
+#X obj -24 153 *~;
+#X obj -132 115 / 127;
+#X obj -44 -16 r outFreq1;
+#X obj -132 87 r gain1;
+#X obj 119 77 r gain1;
+#X obj -75 120 fcpan 0.6;
+#X obj 37 112 fcpan 0.6;
+#X connect 0 0 1 0;
+#X connect 1 0 20 0;
+#X connect 2 0 3 0;
+#X connect 3 0 21 0;
+#X connect 8 0 2 0;
+#X connect 8 0 1 1;
+#X connect 9 0 1 2;
+#X connect 11 0 6 0;
+#X connect 12 0 7 0;
+#X connect 13 0 11 1;
+#X connect 13 0 12 1;
+#X connect 14 0 4 0;
+#X connect 15 0 5 0;
+#X connect 16 0 14 1;
+#X connect 16 0 15 1;
+#X connect 17 0 8 0;
+#X connect 18 0 16 0;
+#X connect 19 0 13 0;
+#X connect 20 0 14 0;
+#X connect 20 1 15 0;
+#X connect 21 0 11 0;
+#X connect 21 1 12 0;
+#X restore 462 63 pd soundGen;
+#X connect 0 0 1 0;
+#X connect 1 0 2 0;
+#X connect 2 0 3 0;
+#X connect 2 0 4 0;
+#X connect 3 0 29 0;
+#X connect 4 0 5 0;
+#X connect 4 1 5 1;
+#X connect 5 0 6 0;
+#X connect 6 0 7 0;
+#X connect 6 1 7 1;
+#X connect 7 0 8 0;
+#X connect 8 0 10 0;
+#X connect 8 0 24 0;
+#X connect 10 0 11 0;
+#X connect 11 0 30 0;
+#X connect 14 0 15 0;
+#X connect 14 0 0 0;
+#X connect 14 0 17 0;
+#X connect 16 0 14 1;
+#X connect 18 0 10 1;
+#X connect 19 0 14 0;
+#X connect 20 0 1 1;
+#X connect 20 1 1 0;
+#X connect 26 0 20 0;
+#X connect 27 0 11 1;
+#X connect 30 0 31 0;
+#X connect 31 0 28 0;
+#X connect 31 0 9 0;
+#X restore 143 18 pd pro1;
+#X obj 391 -162 hsl 128 15 0.01 0.5 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 0 1;
+#X floatatom 317 -95 10 0 0 0 - - -;
+#X text 415 -184 Diameter (m);
+#X obj 388 -130 *;
+#X obj 388 -97 s Diameter1;
+#X text 230 -74 Cylinder1 Diameter (m);
+#X obj 443 -140 r rey1;
+#X floatatom 443 -120 10 0 0 0 - - -;
+#X floatatom 511 -120 10 0 0 0 - - -;
+#X obj 511 -140 r outFreq1;
+#X obj 261 -212 vsl 25 100 0 127 0 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 0 1;
+#X obj 261 -99 s gain1;
+#X obj 34 -54 catch~ L;
+#X obj 55 -29 catch~ R;
+#X obj 34 33 dac~;
+#X obj 111 -170 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 0 1;
+#X obj 111 -28 / 127;
+#X obj 34 1 *~ 0.4;
+#X obj 79 1 *~ 0.4;
+#X text 135 -127 Output Gain;
+#X msg 111 -197 40;
+#X obj 111 -222 loadbang;
+#X connect 1 0 4 0;
+#X connect 1 0 4 1;
+#X connect 4 0 2 0;
+#X connect 4 0 5 0;
+#X connect 7 0 8 0;
+#X connect 10 0 9 0;
+#X connect 11 0 12 0;
+#X connect 13 0 18 0;
+#X connect 14 0 19 0;
+#X connect 16 0 17 0;
+#X connect 17 0 18 1;
+#X connect 17 0 19 1;
+#X connect 18 0 15 0;
+#X connect 19 0 15 1;
+#X connect 21 0 16 0;
+#X connect 22 0 21 0;
diff -r 2e73f3e7bb2e -r 8a8fb9f10895 prototype2.pd
--- a/prototype2.pd	Sun Apr 19 16:21:55 2015 +0100
+++ b/prototype2.pd	Sun Apr 19 16:46:38 2015 +0100
@@ -1,8 +1,8 @@
 #N canvas 21 65 1194 564 10;
 #X obj 979 46 hsl 128 15 0 31 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 1500 1;
+-1 -1 600 1;
 #X obj 408 -11 hsl 128 15 0.01 0.5 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 1700 1;
+-262144 -1 -1 1600 1;
 #X floatatom 334 56 10 0 0 0 - - -;
 #X text 992 27 Wind Speed (m/s);
 #X text 432 -33 Diameter (m);
@@ -949,27 +949,27 @@
 #X floatatom 726 382 10 0 0 0 - - -;
 #X obj 726 362 r outFreq4;
 #X obj 1075 152 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 1000 1;
+-1 -1 4500 1;
 #X obj 1075 294 / 127;
 #X obj 998 323 *~ 0.4;
 #X obj 1043 323 *~ 0.4;
 #X obj 595 342 hsl 128 15 0.01 0.5 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 900 1;
+-262144 -1 -1 4100 1;
 #X obj 195 336 hsl 128 15 0.01 0.5 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 400 1;
+-262144 -1 -1 2400 1;
 #X obj 399 154 hsl 128 15 0.01 0.5 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 3600 1;
+-262144 -1 -1 1300 1;
 #X msg 1092 124 40;
 #X obj 1092 99 loadbang;
-#X text 1027 205 Output Gain;
+#X text 1099 195 Output Gain;
 #X obj 278 -61 vsl 25 100 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 2300 1;
+-1 -1 4500 1;
 #X obj 495 267 vsl 25 100 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 1400 1;
+-1 -1 2800 1;
 #X obj 269 110 vsl 25 100 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 1100 1;
+-1 -1 5600 1;
 #X obj 138 247 vsl 25 100 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 500 1;
+-1 -1 6600 1;
 #X obj 495 380 s gain4;
 #X obj 278 52 s gain1;
 #X obj 269 224 s gain2;