# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1473716183 -3600
# Node ID 62b41b2556452dac357d8b6a45608d4b63dd2765
# Parent  88e381980af7f59e89bcf70591d5c667775a8ea7
HarpD2 - minor edits
Propellor - Starting to add rotation noise
CavD1 - Applying Rossiter formula and Avital
WindGenD1 - Evening out gust control
RotationNoiseTest - New patch to work out Gutin's rotational noise equation.

diff -r 88e381980af7 -r 62b41b255645 .DS_Store
Binary file .DS_Store has changed
diff -r 88e381980af7 -r 62b41b255645 MechAeolian/harpD2.pd
--- a/MechAeolian/harpD2.pd	Tue Aug 23 21:15:35 2016 +0100
+++ b/MechAeolian/harpD2.pd	Mon Sep 12 22:36:23 2016 +0100
@@ -26,12 +26,12 @@
 #X connect 7 0 3 1;
 #X restore -194 242 pd opLevels;
 #X obj -191 213 hsl 100 25 0.01 1e+20 1 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 2700 1;
+10 -262144 -1 -1 3700 1;
 #X obj -194 142 r GAIN;
 #X floatatom -251 243 8 0 0 0 - - -;
 #X obj -85 74 delwrite~ varwind 3000;
 #X obj 24 -18 hsl 128 15 0 100 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 268 1;
+-1 -1 577 1;
 #X obj -85 26 *~ 1;
 #X obj -85 48 +~ 1;
 #X obj -85 -76 loadbang;
@@ -68,7 +68,7 @@
 #X obj -158 -13 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 218 -20 hsl 300 35 1 10000 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 14948 1;
+-262144 -1 -1 14217 1;
 #X obj 254 38 s mod;
 #X obj 105 233 r rand2;
 #X obj -242 524 r rand2;
@@ -144,7 +144,7 @@
 #X connect 27 0 0 0;
 #X restore 184 437 pd PlotWrt;
 #X obj -82 -52 hsl 50 30 0 1 0 0 empty empty Gusts 2 8 0 10 -261995
--1 -4032 693 1;
+-1 -4032 445 1;
 #X obj -17 -21 t f b;
 #X obj -18 -43 * 0.75;
 #X floatatom 146 459 0 0 0 0 - - -;
@@ -193,15 +193,15 @@
 #X obj 184 1320 r rand3;
 #X obj 485 1323 r rand3;
 #X obj 639 -8 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3255 1;
+10 -204800 -1 -1 4655 1;
 #X obj 639 14 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 3598 1;
+-1 -1 1898 1;
 #X obj 639 36 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
 -262130 -1 -1 1835 1;
 #X obj 639 58 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 1786 1;
+-1 -1 2786 1;
 #X obj 639 80 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0 10
--261234 -1 -1 4080 1;
+-261234 -1 -1 4380 1;
 #X obj 637 -45 tgl 35 0 empty empty empty 17 7 0 40 -228856 -257985
 -257985 0 1;
 #X floatatom 715 123 0 0 0 0 - - -;
@@ -216,23 +216,23 @@
 #X text 636 123 Current Freq;
 #X text 613 143 Current Harmonic;
 #X obj 1630 242 hsl 100 35 0.01 1e+20 1 0 empty empty Gain 3 16 0 10
--228856 -1 -1 2700 1;
+-228856 -1 -1 3700 1;
 #X obj 1657 286 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 1720 286 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 1630 205 hsl 100 35 1 500 0 0 empty empty Modulation_Index 3
-16 0 10 -203904 -1 -1 1963 1;
+16 0 10 -203904 -1 -1 1563 1;
 #X floatatom 1733 215 0 0 0 0 - - -;
 #X floatatom 1733 250 0 0 0 0 - - -;
 #X obj 798 -10 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3155 1;
+10 -204800 -1 -1 4255 1;
 #X obj 798 12 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 3598 1;
+-1 -1 5898 1;
 #X obj 798 34 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1818 1;
+-262130 -1 -1 1318 1;
 #X obj 798 56 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 1832 1;
+-1 -1 1032 1;
 #X obj 798 78 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0 10
--261234 -1 -1 4080 1;
+-261234 -1 -1 1180 1;
 #X floatatom 874 121 0 0 0 0 - - -;
 #X floatatom 874 142 0 0 0 0 - - -;
 #X floatatom 862 -8 0 0 0 0 - - -;
@@ -245,15 +245,15 @@
 #X text 795 121 Current Freq;
 #X text 772 141 Current Harmonic;
 #X obj 962 -9 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 3255 1;
+10 -204800 -1 -1 4255 1;
 #X obj 962 13 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 3598 1;
+-1 -1 5298 1;
 #X obj 962 35 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 2821 1;
+-262130 -1 -1 1121 1;
 #X obj 962 57 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 1503 1;
+-1 -1 1003 1;
 #X obj 962 79 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0 10
--261234 -1 -1 4780 1;
+-261234 -1 -1 1180 1;
 #X floatatom 1038 122 0 0 0 0 - - -;
 #X floatatom 1038 143 0 0 0 0 - - -;
 #X floatatom 1026 -7 0 0 0 0 - - -;
@@ -266,15 +266,15 @@
 #X text 959 122 Current Freq;
 #X text 936 142 Current Harmonic;
 #X obj 1130 -8 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 2755 1;
+10 -204800 -1 -1 3355 1;
 #X obj 1130 14 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 1130 36 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1047 1;
+-262130 -1 -1 1447 1;
 #X obj 1130 58 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 1073 1;
+-1 -1 973 1;
 #X obj 1130 80 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 4580 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 1206 123 0 0 0 0 - - -;
 #X floatatom 1206 144 0 0 0 0 - - -;
 #X floatatom 1194 -6 0 0 0 0 - - -;
@@ -287,15 +287,15 @@
 #X text 1127 123 Current Freq;
 #X text 1104 143 Current Harmonic;
 #X obj 1308 -8 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 2755 1;
+10 -204800 -1 -1 3355 1;
 #X obj 1308 14 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 1308 36 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1018 1;
+-262130 -1 -1 1318 1;
 #X obj 1308 58 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
 -1 -1 1121 1;
 #X obj 1308 80 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 5080 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 1384 123 0 0 0 0 - - -;
 #X floatatom 1384 144 0 0 0 0 - - -;
 #X floatatom 1372 -6 0 0 0 0 - - -;
@@ -308,15 +308,15 @@
 #X text 1305 123 Current Freq;
 #X text 1282 143 Current Harmonic;
 #X obj 1493 -7 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 2755 1;
+10 -204800 -1 -1 3355 1;
 #X obj 1493 15 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 1493 37 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1097 1;
+-262130 -1 -1 1397 1;
 #X obj 1493 59 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
 -1 -1 1091 1;
 #X obj 1493 81 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 4980 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 1569 124 0 0 0 0 - - -;
 #X floatatom 1569 145 0 0 0 0 - - -;
 #X floatatom 1557 -5 0 0 0 0 - - -;
@@ -329,15 +329,15 @@
 #X text 1490 124 Current Freq;
 #X text 1467 144 Current Harmonic;
 #X obj 1667 -8 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 2755 1;
+10 -204800 -1 -1 3355 1;
 #X obj 1667 14 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 1667 36 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1047 1;
+-262130 -1 -1 1447 1;
 #X obj 1667 58 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 862 1;
+-1 -1 1062 1;
 #X obj 1667 80 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 4580 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 1743 123 0 0 0 0 - - -;
 #X floatatom 1743 144 0 0 0 0 - - -;
 #X floatatom 1731 -6 0 0 0 0 - - -;
@@ -350,15 +350,15 @@
 #X text 1664 123 Current Freq;
 #X text 1641 143 Current Harmonic;
 #X obj 637 236 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 2755 1;
+10 -204800 -1 -1 3355 1;
 #X obj 637 258 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 637 280 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1047 1;
+-262130 -1 -1 1447 1;
 #X obj 637 302 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 786 1;
+-1 -1 1086 1;
 #X obj 637 324 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 4580 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 713 367 0 0 0 0 - - -;
 #X floatatom 713 388 0 0 0 0 - - -;
 #X floatatom 701 238 0 0 0 0 - - -;
@@ -371,15 +371,15 @@
 #X text 634 367 Current Freq;
 #X text 611 387 Current Harmonic;
 #X obj 795 236 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 2755 1;
+10 -204800 -1 -1 3355 1;
 #X obj 795 258 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 795 280 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1059 1;
+-262130 -1 -1 1259 1;
 #X obj 795 302 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 993 1;
+-1 -1 1593 1;
 #X obj 795 324 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 4080 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 871 367 0 0 0 0 - - -;
 #X floatatom 871 388 0 0 0 0 - - -;
 #X floatatom 859 238 0 0 0 0 - - -;
@@ -392,15 +392,15 @@
 #X text 792 367 Current Freq;
 #X text 769 387 Current Harmonic;
 #X obj 965 236 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10 0
-10 -204800 -1 -1 2755 1;
+10 -204800 -1 -1 3355 1;
 #X obj 965 258 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 965 280 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1084 1;
+-262130 -1 -1 1384 1;
 #X obj 965 302 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 893 1;
+-1 -1 1593 1;
 #X obj 965 324 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 4380 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 1041 367 0 0 0 0 - - -;
 #X floatatom 1041 388 0 0 0 0 - - -;
 #X floatatom 1029 238 0 0 0 0 - - -;
@@ -413,15 +413,15 @@
 #X text 962 367 Current Freq;
 #X text 939 387 Current Harmonic;
 #X obj 1129 240 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10
-0 10 -204800 -1 -1 2755 1;
+0 10 -204800 -1 -1 3355 1;
 #X obj 1129 262 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 1129 284 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1000 1;
+-262130 -1 -1 1500 1;
 #X obj 1129 306 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 693 1;
+-1 -1 1593 1;
 #X obj 1129 328 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 4880 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 1205 371 0 0 0 0 - - -;
 #X floatatom 1205 392 0 0 0 0 - - -;
 #X floatatom 1193 242 0 0 0 0 - - -;
@@ -434,15 +434,15 @@
 #X text 1126 371 Current Freq;
 #X text 1103 391 Current Harmonic;
 #X obj 1306 239 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10
-0 10 -204800 -1 -1 2755 1;
+0 10 -204800 -1 -1 3355 1;
 #X obj 1306 261 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 1306 283 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1068 1;
+-262130 -1 -1 1568 1;
 #X obj 1306 305 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
 -1 -1 1563 1;
 #X obj 1306 327 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 4580 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 1382 370 0 0 0 0 - - -;
 #X floatatom 1382 391 0 0 0 0 - - -;
 #X floatatom 1370 241 0 0 0 0 - - -;
@@ -455,15 +455,15 @@
 #X text 1303 370 Current Freq;
 #X text 1280 390 Current Harmonic;
 #X obj 1486 237 hsl 60 20 1e-05 0.01 1 0 empty empty Diameter 3 10
-0 10 -204800 -1 -1 2755 1;
+0 10 -204800 -1 -1 3355 1;
 #X obj 1486 259 hsl 60 20 0 2 0 0 empty empty Length 3 10 0 10 -204786
--1 -1 2598 1;
+-1 -1 1798 1;
 #X obj 1486 281 hsl 60 20 0 10000 0 0 empty empty Mass_Den 3 10 0 10
--262130 -1 -1 1084 1;
+-262130 -1 -1 1384 1;
 #X obj 1486 303 hsl 60 20 0 200 0 0 empty empty Tension 3 10 0 10 -261682
--1 -1 1322 1;
+-1 -1 1622 1;
 #X obj 1486 325 hsl 60 20 1e-06 0.01 0 0 empty empty Damping 3 10 0
-10 -261234 -1 -1 4580 1;
+10 -261234 -1 -1 1180 1;
 #X floatatom 1562 368 0 0 0 0 - - -;
 #X floatatom 1562 389 0 0 0 0 - - -;
 #X floatatom 1550 239 0 0 0 0 - - -;
@@ -488,9 +488,9 @@
 #X obj 1753 675 s rand2;
 #X obj 1772 658 s rand3;
 #X obj 1632 465 hsl 100 35 0 1 0 0 empty empty Gusts 3 16 0 10 -191407
--1 -13330 1400 1;
+-1 -13330 900 1;
 #X obj 1632 502 hsl 100 35 0.1 100 1 0 empty empty Wind_Speed 3 16
-0 10 -232576 -1 -1 4369 1;
+0 10 -232576 -1 -1 5469 1;
 #X obj 673 -45 bng 35 250 50 0 empty empty empty 1 16 0 10 -260097
 -1 -1;
 #X obj 711 -43 tgl 15 0 empty empty empty 17 7 0 10 -262144 -4034 -4034
@@ -531,9 +531,9 @@
 #X obj 832 -48 bng 35 250 50 0 empty empty empty 1 16 0 10 -260097
 -1 -1;
 #X obj 870 -46 tgl 15 0 empty empty empty 17 7 0 10 -262144 -4034 -4034
-1 1;
+0 1;
 #X obj 870 -28 tgl 15 0 empty empty empty 17 7 0 10 -262144 -258113
--258113 0 1;
+-258113 1 1;
 #X text 888 -47 On;
 #X text 888 -29 Off;
 #X obj 959 -46 tgl 35 0 empty empty empty 17 7 0 40 -228856 -257985
@@ -541,9 +541,9 @@
 #X obj 995 -46 bng 35 250 50 0 empty empty empty 1 16 0 10 -260097
 -1 -1;
 #X obj 1033 -44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -4034
--4034 1 1;
+-4034 0 1;
 #X obj 1033 -26 tgl 15 0 empty empty empty 17 7 0 10 -262144 -258113
--258113 0 1;
+-258113 1 1;
 #X text 1051 -45 On;
 #X text 1051 -27 Off;
 #X obj 1127 -45 tgl 35 0 empty empty empty 17 7 0 40 -228856 -257985
diff -r 88e381980af7 -r 62b41b255645 Propellor/Propellor.pd
--- a/Propellor/Propellor.pd	Tue Aug 23 21:15:35 2016 +0100
+++ b/Propellor/Propellor.pd	Mon Sep 12 22:36:23 2016 +0100
@@ -1,10 +1,10 @@
-#N canvas 171 35 1182 795 10;
+#N canvas 171 35 890 677 10;
 #X obj 315 22 loadbang;
 #X obj 315 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 315 85 s myMet;
 #X obj -266 427 hsl 100 20 0 4000 0 0 empty empty RPM 2 10 0 10 -262144
--1 -1 0 1;
+-1 -1 1243 1;
 #X floatatom 76 540 0 0 0 0 - - -;
 #X obj 143 73 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
 -1;
@@ -22,9 +22,9 @@
 #X obj 83 21 loadbang;
 #X obj 83 45 delay 13;
 #X obj -275 52 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4554 1;
+-1 -1 5346 1;
 #X obj -276 146 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5940 1;
+-262144 -1 -1 5544 1;
 #X obj -276 237 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 4999 1;
 #X obj -278 75 s Xobs;
@@ -70,7 +70,7 @@
 #X connect 7 0 3 1;
 #X restore 427 102 pd opLevels;
 #X obj 77 426 hsl 100 25 1000 10000 1 0 empty empty Gain 2 13 0 10
--261682 -1 -66577 0 1;
+-261682 -1 -66577 1700 1;
 #X obj 427 2 r GAIN;
 #X floatatom 370 103 8 0 0 0 - - -;
 #N canvas 361 203 1002 525 sources 0;
@@ -1921,7 +1921,7 @@
 #X restore 292 254 pd sources;
 #X floatatom 227 52 5 0 0 0 - - -;
 #X obj -271 342 hsl 100 20 0.1 3 0 0 empty empty Blade_Length 2 10
-0 10 -262144 -1 -1 4384 1;
+0 10 -262144 -1 -1 2390 1;
 #X floatatom -319 368 5 0 0 0 - - -;
 #X obj -324 319 r setUp;
 #X obj -279 300 r thisLength;
@@ -1930,7 +1930,6 @@
 #X text -168 239 Z Position;
 #X msg -271 321 0.2;
 #X msg -232 322 1;
-#X msg -190 317 2;
 #X obj 83 126 Uzi 20;
 #X obj 62 0 r preswing;
 #X obj -170 100 loadbang;
@@ -1941,23 +1940,7 @@
 #X msg -196 210 0.5;
 #X msg -272 122 0.07;
 #X msg -135 212 2;
-#X obj 584 32 bng 25 250 50 0 empty empty empty 17 7 0 10 -261234 -1
--1;
-#X obj 584 80 s MLB;
 #X msg -228 211 1;
-#X obj 637 33 bng 25 250 50 0 empty empty empty 17 7 0 10 -262130 -1
--1;
-#X obj 637 81 s SWD1;
-#X obj 584 60 uzi 20;
-#X obj 637 61 uzi 20;
-#X obj 584 104 bng 25 250 50 0 empty empty empty 17 7 0 10 -204786
--1 -1;
-#X obj 584 132 uzi 20;
-#X obj 584 152 s SWD2;
-#X obj 634 104 bng 25 250 50 0 empty empty empty 17 7 0 10 -204800
--1 -1;
-#X obj 634 132 uzi 20;
-#X obj 634 152 s PGA;
 #X msg -128 120 0.35;
 #X obj -221 455 s RPM;
 #X msg -181 383 10;
@@ -3819,7 +3802,7 @@
 #N canvas 828 355 542 473 myMotor 0;
 #X obj 170 159 phasor~;
 #X obj 173 116 hsl 64 12 0 1 0 1 empty empty engine-speed -2 6 1 8
--262144 -1 -1 0 1;
+-262144 -1 -1 2482 1;
 #X obj 92 226 *~ 0.25;
 #N canvas 117 396 733 539 fourstroke 0;
 #X obj 51 336 outlet~;
@@ -4048,27 +4031,66 @@
 #X connect 24 0 7 1;
 #X connect 25 0 1 0;
 #X restore 0 328 pd myMotor;
-#X msg -231 29 -4;
 #X msg -78 119 -1;
 #X msg 2 108 5 800;
 #X msg 11 128 35 2000;
-#X msg -171 120 10;
 #X msg -141 404 0;
 #X obj 78 509 hsl 100 20 0 1 0 0 empty empty Engine_Speed 2 10 0 10
--204800 -1 -1 0 1;
+-204800 -1 -1 3900 1;
 #X msg 436 48 1000;
 #X text 51 541 RPM;
 #X floatatom 274 476 0 0 0 0 - - -;
+#X msg -171 120 6;
+#X msg -231 29 4;
+#N canvas 550 226 735 653 rotNoise 1;
+#X obj 178 45 r RPM;
+#X obj 178 68 / 60;
+#X floatatom 229 92 0 0 0 0 - - -;
+#X obj 178 92 * 6.28;
+#X floatatom 229 121 0 0 0 0 - - -;
+#X obj 156 267 *~ 0.6;
+#X obj 108 300 *~;
+#X obj 108 365 throw~ l;
+#X obj 135 342 throw~ r;
+#X obj 108 321 fcpan;
+#X obj 108 224 vcf~ 3;
+#X obj 135 299 r \$0-thisPan;
+#X obj 108 267 *~ 1;
+#X obj 108 245 vcf~ 3;
+#X obj 17 190 *~ 1;
+#X obj 178 137 line~;
+#X msg 178 114 \$1 40;
+#X obj 108 189 noise~;
 #X connect 0 0 1 0;
-#X connect 1 0 83 0;
+#X connect 1 0 2 0;
+#X connect 1 0 3 0;
 #X connect 3 0 4 0;
-#X connect 3 0 79 0;
+#X connect 3 0 16 0;
+#X connect 5 0 6 1;
+#X connect 6 0 9 0;
+#X connect 9 0 7 0;
+#X connect 9 1 8 0;
+#X connect 10 0 13 0;
+#X connect 11 0 9 1;
+#X connect 12 0 6 0;
+#X connect 13 0 12 0;
+#X connect 14 0 10 1;
+#X connect 14 0 13 1;
+#X connect 15 0 14 0;
+#X connect 16 0 15 0;
+#X connect 17 0 10 0;
+#X restore 466 406 pd rotNoise;
+#X msg -190 317 0.8;
+#X connect 0 0 1 0;
+#X connect 1 0 70 0;
+#X connect 3 0 4 0;
+#X connect 3 0 66 0;
 #X connect 5 0 6 0;
 #X connect 7 0 8 0;
 #X connect 8 0 5 0;
 #X connect 9 0 8 1;
 #X connect 9 0 44 0;
-#X connect 10 0 55 0;
+#X connect 10 0 54 0;
 #X connect 12 0 3 0;
 #X connect 13 0 3 0;
 #X connect 14 0 15 0;
@@ -4089,58 +4111,50 @@
 #X connect 32 0 16 0;
 #X connect 33 0 17 0;
 #X connect 34 0 18 0;
-#X connect 38 0 100 0;
+#X connect 38 0 85 0;
 #X connect 39 0 35 0;
 #X connect 39 1 36 0;
 #X connect 40 0 39 0;
 #X connect 40 0 42 0;
-#X connect 40 0 102 0;
+#X connect 40 0 87 0;
 #X connect 41 0 40 0;
 #X connect 45 0 46 0;
-#X connect 45 0 81 0;
+#X connect 45 0 68 0;
 #X connect 47 0 45 0;
 #X connect 48 0 45 0;
 #X connect 52 0 45 0;
 #X connect 53 0 45 0;
-#X connect 54 0 45 0;
-#X connect 55 0 11 0;
-#X connect 56 0 10 0;
-#X connect 57 0 97 0;
-#X connect 58 0 93 0;
-#X connect 59 0 62 0;
-#X connect 60 0 82 0;
-#X connect 61 0 98 0;
-#X connect 62 0 18 0;
-#X connect 63 0 17 0;
+#X connect 54 0 11 0;
+#X connect 55 0 10 0;
+#X connect 56 0 88 0;
+#X connect 57 0 89 0;
+#X connect 58 0 61 0;
+#X connect 59 0 69 0;
+#X connect 60 0 83 0;
+#X connect 61 0 18 0;
+#X connect 62 0 17 0;
+#X connect 63 0 18 0;
 #X connect 64 0 18 0;
-#X connect 65 0 70 0;
-#X connect 67 0 18 0;
-#X connect 68 0 71 0;
-#X connect 70 0 66 0;
-#X connect 71 0 69 0;
+#X connect 65 0 17 0;
+#X connect 67 0 3 0;
+#X connect 69 0 45 0;
+#X connect 70 0 2 0;
+#X connect 71 0 3 0;
 #X connect 72 0 73 0;
 #X connect 73 0 74 0;
-#X connect 75 0 76 0;
-#X connect 76 0 77 0;
+#X connect 74 0 43 0;
+#X connect 74 0 76 0;
+#X connect 75 0 77 0;
+#X connect 76 0 75 0;
 #X connect 78 0 17 0;
-#X connect 80 0 3 0;
-#X connect 82 0 45 0;
-#X connect 83 0 2 0;
-#X connect 84 0 3 0;
-#X connect 85 0 86 0;
-#X connect 86 0 87 0;
-#X connect 87 0 43 0;
-#X connect 87 0 89 0;
-#X connect 88 0 90 0;
-#X connect 89 0 88 0;
-#X connect 91 0 17 0;
-#X connect 92 0 3 0;
-#X connect 93 0 16 0;
-#X connect 94 0 17 0;
-#X connect 95 0 91 0;
-#X connect 96 0 91 0;
-#X connect 97 0 17 0;
-#X connect 98 0 3 0;
-#X connect 99 0 92 0;
-#X connect 100 0 40 0;
+#X connect 79 0 3 0;
+#X connect 80 0 17 0;
+#X connect 81 0 78 0;
+#X connect 82 0 78 0;
+#X connect 83 0 3 0;
+#X connect 84 0 79 0;
+#X connect 85 0 40 0;
+#X connect 88 0 17 0;
+#X connect 89 0 16 0;
+#X connect 91 0 45 0;
 #X coords 0 -1 1 1 150 200 2 50 400;
diff -r 88e381980af7 -r 62b41b255645 Propellor/rotationNoiseTest.pd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Propellor/rotationNoiseTest.pd	Mon Sep 12 22:36:23 2016 +0100
@@ -0,0 +1,462 @@
+#N canvas 12 40 863 723 10;
+#X obj 438 155 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj 501 155 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#N canvas 555 179 313 396 opLevels 0;
+#X obj 83 210 dac~;
+#X obj 30 70 catch~ l;
+#X obj 128 70 catch~ r;
+#X obj 129 104 *~ 0.45;
+#X obj 30 104 *~ 0.45;
+#X obj 30 210 prvu~;
+#X obj 129 211 prvu~;
+#X obj 93 33 inlet;
+#X obj 30 239 outlet;
+#X obj 129 239 outlet;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 6 0;
+#X connect 3 0 0 1;
+#X connect 4 0 5 0;
+#X connect 4 0 0 0;
+#X connect 5 0 8 0;
+#X connect 6 0 9 0;
+#X connect 7 0 4 1;
+#X connect 7 0 3 1;
+#X restore 437 112 pd opLevels;
+#N canvas 75 325 735 653 rotNoise 1;
+#X obj 178 68 / 60;
+#X floatatom 229 92 0 0 0 0 - - -;
+#X obj 178 92 * 6.28;
+#X floatatom 229 121 0 0 0 0 - - -;
+#X obj 108 365 throw~ l;
+#X obj 135 342 throw~ r;
+#X obj 108 321 fcpan;
+#X obj 108 224 vcf~ 3;
+#X obj 247 294 r \$0-thisPan;
+#X obj 108 273 *~ 1;
+#X obj 108 245 vcf~ 3;
+#X obj 17 190 *~ 1;
+#X obj 178 137 line~;
+#X msg 178 114 \$1 40;
+#X obj 108 189 noise~;
+#X obj 108 300 *~ 1;
+#N canvas 706 94 1010 723 GutinGain 1;
+#X floatatom 127 173 0 0 0 0 - - -;
+#X text 215 135 k;
+#X obj 205 33 r~ RPM;
+#X obj 205 54 /~ 60;
+#X obj 190 13 *~;
+#X obj 190 -32 r~ Blad;
+#X obj 205 -7 r~ Har;
+#X obj 190 131 *~;
+#X obj 243 54 r~ Blad;
+#X obj 348 38 r~ Az;
+#X obj 373 103 r~ Len;
+#X obj 127 129 r myMet;
+#X obj 127 151 snapshot~;
+#X obj 369 181 r~ Blad;
+#X obj 384 202 r~ Har;
+#X obj 369 224 *~;
+#X obj 369 248 *~ 2;
+#X obj 348 61 sin~;
+#X obj 348 101 *~;
+#X obj 190 175 s~ k;
+#X obj 363 80 r~ k;
+#X obj 348 272 pow~;
+#X floatatom 400 294 0 0 0 0 - - -;
+#X obj 400 250 r myMet;
+#X obj 400 272 snapshot~;
+#X obj 313 204 r~ k;
+#X obj 313 229 *~;
+#X obj 288 184 r~ Blad;
+#X obj 288 218 *~;
+#X obj 348 315 r~ Az;
+#X obj 348 335 cos~;
+#X obj 348 357 -~ 0.2;
+#X obj 348 380 *~;
+#X obj 298 250 *~;
+#X obj 333 294 *~;
+#X obj 333 402 *~;
+#X floatatom 220 454 0 0 0 0 - - -;
+#X obj 220 410 r myMet;
+#X obj 220 432 snapshot~;
+#X obj 348 125 *~;
+#X obj 580 45 r~ Dist;
+#X obj 580 70 *~;
+#X obj 580 92 *~ 343;
+#X text 633 91 C;
+#X obj 580 120 *~ 1.225;
+#X text 641 122 Air Density;
+#X obj 580 148 *~ 9.87;
+#X text 636 147 pi^2;
+#X obj 616 231 *~;
+#X obj 616 190 r~ Blad;
+#X obj 631 211 r~ Har;
+#X obj 616 252 *~ 2;
+#X obj 595 170 sig~ 2;
+#X obj 595 296 pow~;
+#X obj 580 318 *~;
+#X obj 595 379 *~;
+#X obj 595 338 r~ Blad;
+#X obj 610 359 r~ Har;
+#X obj 623 380 r myMet;
+#X obj 595 400 snapshot~;
+#X floatatom 661 401 0 0 0 0 - - -;
+#N canvas 683 114 385 576 myFactorial 0;
+#X obj 305 33 inlet;
+#X floatatom 331 55 0 0 0 0 - - -;
+#X obj 86 449 outlet;
+#X obj 305 56 s n;
+#X obj 86 32 r n;
+#X obj 86 53 / 2.7183;
+#X obj 86 96 pow;
+#X obj 101 74 r n;
+#X obj 101 144 r n;
+#X obj 101 166 + 0.0333;
+#X obj 116 187 r n;
+#X obj 116 209 *;
+#X obj 116 231 * 4;
+#X obj 116 275 r n;
+#X obj 116 297 *;
+#X obj 131 316 r n;
+#X obj 116 337 *;
+#X obj 116 358 * 8;
+#X obj 101 400 pow 0.166667;
+#X obj 101 254 +;
+#X obj 101 379 +;
+#X obj 86 120 * 1.7725;
+#X obj 86 423 *;
+#X floatatom 143 448 0 0 0 0 - - -;
+#X text 71 506 Based on Ramanujan approximation;
+#X connect 0 0 1 0;
+#X connect 0 0 3 0;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 6 0 21 0;
+#X connect 7 0 6 1;
+#X connect 8 0 9 0;
+#X connect 9 0 19 0;
+#X connect 10 0 11 0;
+#X connect 10 0 11 1;
+#X connect 11 0 12 0;
+#X connect 12 0 19 1;
+#X connect 13 0 14 0;
+#X connect 13 0 14 1;
+#X connect 14 0 16 0;
+#X connect 15 0 16 1;
+#X connect 16 0 17 0;
+#X connect 17 0 20 1;
+#X connect 18 0 22 1;
+#X connect 19 0 20 0;
+#X connect 20 0 18 0;
+#X connect 21 0 22 0;
+#X connect 22 0 23 0;
+#X connect 22 0 2 0;
+#X restore 595 423 pd myFactorial;
+#X floatatom 639 444 0 0 0 0 - - -;
+#X msg 595 445 \$1 20;
+#X obj 595 464 line~;
+#X obj 580 486 *~;
+#X obj 565 510 /~;
+#X floatatom 610 571 0 0 0 0 - - -;
+#X obj 610 527 r myMet;
+#X obj 610 549 snapshot~;
+#X floatatom 847 118 0 0 0 0 - - -;
+#X obj 847 74 r myMet;
+#X obj 847 96 snapshot~;
+#X floatatom 141 289 0 0 0 0 - - -;
+#X obj 141 245 r myMet;
+#X obj 141 267 snapshot~;
+#X floatatom 217 323 0 0 0 0 - - -;
+#X obj 217 279 r myMet;
+#X obj 217 301 snapshot~;
+#X floatatom 245 161 0 0 0 0 - - -;
+#X obj 245 117 r myMet;
+#X obj 245 139 snapshot~;
+#X obj 190 153 /~ 343;
+#X obj 205 75 *~ 6.2831;
+#X floatatom 713 279 0 0 0 0 - - -;
+#X obj 713 235 r myMet;
+#X obj 713 257 snapshot~;
+#X obj 616 273 +~ 4;
+#X floatatom 702 515 0 0 0 0 - - -;
+#X obj 702 471 r myMet;
+#X obj 702 493 snapshot~;
+#X obj 538 592 outlet~;
+#X floatatom 144 409 0 0 0 0 - - -;
+#X obj 144 365 r myMet;
+#X obj 144 387 snapshot~;
+#X obj 348 148 abs~;
+#X floatatom 430 177 0 0 0 0 - - -;
+#X obj 430 133 r myMet;
+#X obj 430 155 snapshot~;
+#X connect 2 0 3 0;
+#X connect 3 0 83 0;
+#X connect 4 0 7 0;
+#X connect 5 0 4 0;
+#X connect 6 0 4 1;
+#X connect 7 0 82 0;
+#X connect 9 0 17 0;
+#X connect 10 0 39 1;
+#X connect 11 0 12 0;
+#X connect 12 0 0 0;
+#X connect 13 0 15 0;
+#X connect 14 0 15 1;
+#X connect 15 0 16 0;
+#X connect 16 0 21 1;
+#X connect 16 0 24 0;
+#X connect 17 0 18 0;
+#X connect 18 0 39 0;
+#X connect 20 0 18 1;
+#X connect 21 0 34 1;
+#X connect 23 0 24 0;
+#X connect 24 0 22 0;
+#X connect 25 0 26 0;
+#X connect 25 0 26 1;
+#X connect 25 0 78 0;
+#X connect 26 0 33 1;
+#X connect 27 0 28 0;
+#X connect 27 0 28 1;
+#X connect 28 0 33 0;
+#X connect 29 0 30 0;
+#X connect 30 0 31 0;
+#X connect 31 0 32 0;
+#X connect 31 0 32 1;
+#X connect 32 0 35 1;
+#X connect 32 0 38 0;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 35 0 66 0;
+#X connect 37 0 38 0;
+#X connect 38 0 36 0;
+#X connect 39 0 94 0;
+#X connect 39 0 95 0;
+#X connect 40 0 41 0;
+#X connect 40 0 41 1;
+#X connect 40 0 72 0;
+#X connect 41 0 42 0;
+#X connect 42 0 44 0;
+#X connect 44 0 46 0;
+#X connect 46 0 54 0;
+#X connect 48 0 51 0;
+#X connect 49 0 48 0;
+#X connect 50 0 48 1;
+#X connect 51 0 87 0;
+#X connect 52 0 53 0;
+#X connect 53 0 54 1;
+#X connect 53 0 86 0;
+#X connect 54 0 65 0;
+#X connect 55 0 59 0;
+#X connect 56 0 55 0;
+#X connect 57 0 55 1;
+#X connect 58 0 59 0;
+#X connect 59 0 60 0;
+#X connect 59 0 61 0;
+#X connect 61 0 62 0;
+#X connect 61 0 63 0;
+#X connect 63 0 64 0;
+#X connect 64 0 65 1;
+#X connect 65 0 66 1;
+#X connect 65 0 90 0;
+#X connect 66 0 69 0;
+#X connect 66 0 91 0;
+#X connect 68 0 69 0;
+#X connect 69 0 67 0;
+#X connect 71 0 72 0;
+#X connect 72 0 70 0;
+#X connect 74 0 75 0;
+#X connect 75 0 73 0;
+#X connect 77 0 78 0;
+#X connect 78 0 76 0;
+#X connect 80 0 81 0;
+#X connect 81 0 79 0;
+#X connect 82 0 19 0;
+#X connect 82 0 12 0;
+#X connect 83 0 7 1;
+#X connect 83 0 81 0;
+#X connect 85 0 86 0;
+#X connect 86 0 84 0;
+#X connect 87 0 53 1;
+#X connect 89 0 90 0;
+#X connect 90 0 88 0;
+#X connect 93 0 94 0;
+#X connect 94 0 92 0;
+#X connect 95 0 98 0;
+#X connect 95 0 21 0;
+#X connect 97 0 98 0;
+#X connect 98 0 96 0;
+#X restore 517 167 pd GutinGain;
+#X obj 178 45 r RPM;
+#X msg 176 294 0.5;
+#X obj 517 194 outlet~;
+#X connect 0 0 1 0;
+#X connect 0 0 2 0;
+#X connect 2 0 3 0;
+#X connect 2 0 13 0;
+#X connect 6 0 4 0;
+#X connect 6 1 5 0;
+#X connect 7 0 10 0;
+#X connect 9 0 15 0;
+#X connect 10 0 9 0;
+#X connect 11 0 7 1;
+#X connect 11 0 10 1;
+#X connect 12 0 11 0;
+#X connect 13 0 12 0;
+#X connect 14 0 7 0;
+#X connect 15 0 6 0;
+#X connect 16 0 19 0;
+#X connect 17 0 0 0;
+#X connect 18 0 6 1;
+#X restore 489 364 pd rotNoise;
+#X obj 436 67 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2300 1;
+#X obj 77 165 hsl 128 15 0 1000 0 0 empty empty RPM 5 8 0 10 -262144
+-1 -1 6071 1;
+#X obj 82 52 hsl 128 15 1 3 0 0 empty empty No_of_Blades 5 8 0 10 -262144
+-1 -1 6800 1;
+#X obj 79 72 i;
+#X floatatom 106 72 0 0 0 0 - - -;
+#X floatatom 118 182 0 0 0 0 - - -;
+#X obj 75 257 hsl 128 15 1 8 0 0 empty empty Harmonic_Number 5 8 0
+10 -262144 -1 -1 1800 1;
+#X obj 72 277 i;
+#X floatatom 96 276 0 0 0 0 - - -;
+#X obj 76 376 hsl 128 15 0 360 0 0 empty empty Azimuth 5 8 0 10 -262144
+-1 -1 12700 1;
+#X floatatom 116 395 0 0 0 0 - - -;
+#X obj 74 479 hsl 128 15 0 2 0 0 empty empty Blade_Radius 5 8 0 10
+-262144 -1 -1 5100 1;
+#X floatatom 123 498 0 0 0 0 - - -;
+#X msg 79 94 \$1 20;
+#X obj 79 113 line~;
+#X obj 79 134 s~ Blad;
+#X msg 74 184 \$1 20;
+#X obj 74 203 line~;
+#X obj 74 223 s~ RPM;
+#X msg 72 298 \$1 20;
+#X obj 72 317 line~;
+#X obj 72 338 s~ Har;
+#X msg 73 416 \$1 20;
+#X obj 73 435 line~;
+#X obj 73 455 s~ Az;
+#X msg 71 496 \$1 20;
+#X obj 71 515 line~;
+#X obj 71 535 s~ Len;
+#X obj 595 4 loadbang;
+#X obj 595 24 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 595 63 s myMet;
+#X obj 74 558 hsl 128 15 0 150 0 0 empty empty Distance 5 8 0 10 -262144
+-1 -1 4100 1;
+#X floatatom 123 577 0 0 0 0 - - -;
+#X msg 71 578 \$1 20;
+#X obj 71 600 line~;
+#X obj 71 621 s~ Dist;
+#X obj 595 42 metro 10;
+#X floatatom 266 608 0 0 0 0 - - -;
+#X obj 266 564 r myMet;
+#X obj 266 586 snapshot~;
+#X msg 172 141 478;
+#X msg 189 348 120;
+#X obj 73 395 / 360;
+#X msg 224 347 50;
+#N canvas 753 58 681 350 PlotWrt 0;
+#X obj 70 303 textfile;
+#X msg 562 196 clear \, rewind;
+#X obj 70 159 snapshot~;
+#X floatatom 77 181 0 0 0 0 - - -;
+#X obj 140 156 snapshot~;
+#X floatatom 148 177 0 0 0 0 - - -;
+#X obj 57 113 inlet~;
+#X obj 128 107 inlet~;
+#X obj 70 134 r myMet;
+#X obj 140 131 r myMet;
+#X obj 213 155 snapshot~;
+#X floatatom 222 177 0 0 0 0 - - -;
+#X obj 213 128 r myMet;
+#X obj 200 105 inlet~;
+#X msg 70 202 add2 \$1;
+#X obj 282 152 snapshot~;
+#X floatatom 290 175 0 0 0 0 - - -;
+#X obj 282 125 r myMet;
+#X obj 269 102 inlet~;
+#X msg 213 198 add2 \$1;
+#X obj 358 155 snapshot~;
+#X floatatom 367 177 0 0 0 0 - - -;
+#X obj 358 128 r myMet;
+#X obj 345 105 inlet~;
+#X msg 358 199 add \$1;
+#X msg 282 196 add2 \$1;
+#X msg 439 197 write rotNoise.txt;
+#X msg 140 198 add \$1;
+#X connect 1 0 0 0;
+#X connect 2 0 3 0;
+#X connect 2 0 14 0;
+#X connect 4 0 5 0;
+#X connect 4 0 27 0;
+#X connect 6 0 2 0;
+#X connect 7 0 4 0;
+#X connect 8 0 2 0;
+#X connect 9 0 4 0;
+#X connect 10 0 11 0;
+#X connect 10 0 19 0;
+#X connect 12 0 10 0;
+#X connect 13 0 10 0;
+#X connect 14 0 0 0;
+#X connect 15 0 16 0;
+#X connect 15 0 25 0;
+#X connect 17 0 15 0;
+#X connect 18 0 15 0;
+#X connect 20 0 21 0;
+#X connect 20 0 24 0;
+#X connect 22 0 20 0;
+#X connect 23 0 20 0;
+#X connect 26 0 0 0;
+#X connect 27 0 0 0;
+#X restore 465 454 pd PlotWrt;
+#X obj 274 353 line;
+#X msg 333 338 0;
+#X msg 272 311 360 5000;
+#X connect 2 0 0 0;
+#X connect 2 1 1 0;
+#X connect 3 0 48 1;
+#X connect 4 0 2 0;
+#X connect 5 0 9 0;
+#X connect 5 0 20 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 7 0 17 0;
+#X connect 10 0 11 0;
+#X connect 11 0 12 0;
+#X connect 11 0 23 0;
+#X connect 13 0 14 0;
+#X connect 13 0 46 0;
+#X connect 15 0 16 0;
+#X connect 15 0 29 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
+#X connect 23 0 24 0;
+#X connect 24 0 25 0;
+#X connect 26 0 27 0;
+#X connect 27 0 28 0;
+#X connect 27 0 48 0;
+#X connect 29 0 30 0;
+#X connect 30 0 31 0;
+#X connect 32 0 33 0;
+#X connect 33 0 40 0;
+#X connect 35 0 36 0;
+#X connect 35 0 37 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 0;
+#X connect 40 0 34 0;
+#X connect 42 0 43 0;
+#X connect 43 0 41 0;
+#X connect 44 0 5 0;
+#X connect 45 0 13 0;
+#X connect 46 0 26 0;
+#X connect 47 0 13 0;
+#X connect 49 0 13 0;
+#X connect 50 0 49 0;
+#X connect 51 0 49 0;
diff -r 88e381980af7 -r 62b41b255645 Shallow Cavity/CavD1.pd
--- a/Shallow Cavity/CavD1.pd	Tue Aug 23 21:15:35 2016 +0100
+++ b/Shallow Cavity/CavD1.pd	Mon Sep 12 22:36:23 2016 +0100
@@ -1,16 +1,9 @@
-#N canvas 130 23 1193 815 10;
-#X obj -127 -66 loadbang;
-#X obj -127 -29 metro 10;
-#X obj -127 -46 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+#N canvas 132 23 1193 815 10;
+#X obj -172 -182 loadbang;
+#X obj -172 -145 metro 10;
+#X obj -172 -162 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
 1 1;
-#X obj -127 -7 s myMet;
-#X obj -48 235 delwrite~ varwind 3000;
-#X obj 62 -16 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
-#X obj -47 28 *~ 1;
-#X obj -47 54 +~ 1;
-#X obj 151 -60 loadbang;
-#X msg 151 -40 5;
+#X obj -172 -123 s myMet;
 #N canvas 20 383 344 123 machCalc 0;
 #X text 107 15 Speed of Sound (dry air 20 Degs C);
 #X obj 26 -14 vd~ varwind;
@@ -18,57 +11,7 @@
 #X obj 26 9 /~ 343.56;
 #X connect 1 0 3 0;
 #X connect 3 0 2 0;
-#X restore 209 -3 pd machCalc;
-#X floatatom 100 7 5 0 0 0 - - -;
-#X obj 59 -40 r SPEED;
-#N canvas 634 290 596 443 windDirection 0;
-#X obj 183 0 inlet~;
-#X obj 280 52 inlet;
-#X obj 280 86 sig~;
-#X obj 185 251 *~;
-#X obj 185 279 outlet~;
-#X obj 246 254 outlet~;
-#X obj 200 195 cos~;
-#X obj 200 135 +~;
-#X obj 200 71 lop~ 1;
-#X obj 246 194 *~ 360;
-#X obj 200 91 lop~ 1;
-#X obj 200 30 noise~;
-#X obj 200 51 lop~ 1;
-#X obj 200 157 /~ 360;
-#X obj 200 113 *~ 800;
-#X obj 200 221 abs~;
-#X connect 0 0 3 0;
-#X connect 1 0 2 0;
-#X connect 2 0 7 1;
-#X connect 3 0 4 0;
-#X connect 6 0 15 0;
-#X connect 7 0 13 0;
-#X connect 8 0 10 0;
-#X connect 9 0 5 0;
-#X connect 10 0 14 0;
-#X connect 11 0 12 0;
-#X connect 12 0 8 0;
-#X connect 13 0 6 0;
-#X connect 13 0 9 0;
-#X connect 14 0 7 0;
-#X connect 15 0 3 1;
-#X restore -48 133 pd windDirection;
-#X obj 105 178 snapshot~;
-#X floatatom 105 205 10 0 0 0 - - -;
-#X text 102 223 Wind Speed;
-#X obj 48 108 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
-#X obj 186 178 snapshot~;
-#X floatatom 186 205 10 0 0 0 - - -;
-#X text 183 223 Wind Direction;
-#X obj -47 -2 WindGenD1;
-#X msg 114 -39 20;
-#X obj 186 155 r myMet;
-#X obj 105 155 r myMet;
-#X obj 22 7 * 0.5;
-#X obj 59 7 * 0.88;
-#X obj 41 314 sig~;
+#X restore -177 -97 pd machCalc;
 #X obj -162 467 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj -99 467 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X text -102 376 Gain;
@@ -97,19 +40,41 @@
 #X restore -163 424 pd opLevels;
 #X msg -154 370 5;
 #X obj -160 395 hsl 100 25 0.1 1e+09 1 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 0 1;
+10 -262144 -1 -1 1682 1;
 #X obj -163 324 r GAIN;
 #X floatatom -220 425 8 0 0 0 - - -;
-#N canvas 146 64 1247 740 cavFreqD1 0;
-#X obj 53 -260 s~ \$0-windSpeed;
-#X obj 53 -280 vd~ varwind;
-#X text 66 -304 Wind Speed;
-#X obj 197 -279 inlet;
-#X obj 415 -281 inlet;
-#X obj 469 -278 inlet;
-#X obj 197 -258 s $-thisLen;
-#X obj 194 -164 sig~ 1;
-#X obj 194 -142 -~ 0.25;
+#X obj 436 -178 hsl 100 25 0.001 10 1 0 empty empty Length 3 13 0 10
+-262144 -1 -1 5200 1;
+#X floatatom 454 -149 0 0 0 0 - - -;
+#X obj 550 -178 hsl 100 25 0.001 10 1 0 empty empty Width 3 13 0 10
+-262144 -1 -1 2600 1;
+#X floatatom 580 -149 0 0 0 0 - - -;
+#X obj 664 -178 hsl 100 25 0.001 10 1 0 empty empty Depth 3 13 0 10
+-262144 -1 -1 7500 1;
+#X floatatom 688 -150 0 0 0 0 - - -;
+#X obj -39 -35 delwrite~ varwind 3000;
+#X obj 70 -127 hsl 128 15 0 100 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 4500 1;
+#X obj -39 -83 *~ 1;
+#X obj -39 -61 +~ 1;
+#X obj -39 -185 loadbang;
+#X floatatom 108 -104 0 0 0 0 - - -;
+#X obj 67 -151 r SPEED;
+#X obj 100 -37 snapshot~;
+#X floatatom 100 -17 0 0 0 0 - - -;
+#X text 97 1 Wind Speed;
+#X msg 122 -150 20;
+#X obj 100 -58 r myMet;
+#X obj 30 -104 * 0.5;
+#X obj 67 -104 * 0.88;
+#X obj -36 -161 hsl 50 30 0 1 0 0 empty empty Gusts 2 8 0 10 -261995
+-1 -4032 4900 1;
+#X obj 29 -130 t f b;
+#X obj 28 -152 * 0.75;
+#X obj 15 -184 r gusts;
+#X obj 156 -149 r underWind;
+#X obj -39 -109 windGenD1;
+#N canvas 353 99 1064 659 rossFreqD1 0;
 #X obj 239 -76 r~ MY_MACH;
 #X obj 224 -97 sig~ 1;
 #X obj 239 -51 *~;
@@ -127,131 +92,267 @@
 #X obj 209 103 r~ \$0-windSpeed;
 #X obj 194 164 /~ 1;
 #X obj 215 144 r $-thisLen;
-#X obj 122 279 r myMet;
-#X obj 122 300 snapshot~;
-#X floatatom 122 324 0 0 0 0 - - -;
-#X obj 297 283 r myMet;
-#X obj 297 305 snapshot~;
-#X floatatom 297 329 0 0 0 0 - - -;
-#X obj 202 279 r myMet;
-#X obj 202 301 snapshot~;
-#X floatatom 202 325 0 0 0 0 - - -;
+#X obj 227 210 r myMet;
+#X obj 227 231 snapshot~;
+#X floatatom 227 255 0 0 0 0 - - -;
 #X text 290 -34 (y-1)/2 -> y = 1.4;
 #X text 254 -144 alpha = 0.25;
-#X text 250 -164 m = 1;
 #X text 277 58 (1/k) -> k = 0.57;
-#X obj 395 284 r myMet;
-#X obj 395 306 snapshot~;
-#X floatatom 395 330 0 0 0 0 - - -;
-#X obj 288 263 *~ 3.6667;
-#X obj 387 265 *~ 5;
-#X obj 473 281 r myMet;
-#X obj 473 303 snapshot~;
-#X floatatom 473 327 0 0 0 0 - - -;
-#X obj 563 280 r myMet;
-#X obj 563 302 snapshot~;
-#X floatatom 563 326 0 0 0 0 - - -;
-#X obj 194 260 *~ 2.3333;
-#X obj 464 261 *~ 6.3333;
-#X obj 553 260 *~ 7.6667;
-#X text 130 347 m = 1;
-#X text 207 351 m = 2;
-#X text 296 351 m = 3;
-#X text 399 352 m = 4;
-#X text 476 352 m = 5;
-#X text 568 349 m = 6;
-#X connect 1 0 0 0;
-#X connect 3 0 6 0;
+#X text 235 278 m = 1;
+#X text 838 -107 alpha = 0.25;
+#X text 834 -127 m = 1;
+#X obj 778 -51 /~;
+#X obj 793 -80 sig~ 1.7544;
+#X obj 778 -5 *~;
+#X obj 793 -26 r~ \$0-windSpeed;
+#X obj 778 35 /~ 1;
+#X obj 799 15 r $-thisLen;
+#X obj 798 61 r myMet;
+#X obj 798 83 snapshot~;
+#X floatatom 798 107 0 0 0 0 - - -;
+#X text 875 -79 (1/k) -> k = 0.57;
+#X text 250 -164 h = 1;
+#X obj 707 -32 r myMet;
+#X obj 707 -10 snapshot~;
+#X floatatom 707 14 0 0 0 0 - - -;
+#X text 755 -160 Victoria Suponitsky;
+#X text 197 -194 A. Rona;
+#X obj 778 -105 -~ 0.25;
+#X obj 194 -142 -~ 0.25;
+#X text 363 -145 Has + alpha in paper but Rossiter has - ???;
+#X obj 778 -127 sig~ 1;
+#X obj 194 -164 sig~ 1;
+#X obj 778 181 outlet~;
+#X connect 0 0 2 0;
+#X connect 0 0 2 1;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 4 1;
+#X connect 4 0 5 0;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 8 0 18 0;
+#X connect 8 0 9 1;
 #X connect 9 0 11 0;
-#X connect 9 0 11 1;
+#X connect 9 0 13 0;
+#X connect 10 0 11 0;
+#X connect 11 0 12 0;
+#X connect 13 0 15 0;
+#X connect 14 0 13 1;
+#X connect 15 0 18 0;
+#X connect 16 0 15 1;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 26 0 28 0;
+#X connect 26 0 38 0;
+#X connect 27 0 26 1;
+#X connect 28 0 30 0;
+#X connect 29 0 28 1;
+#X connect 30 0 33 0;
+#X connect 30 0 47 0;
+#X connect 31 0 30 1;
+#X connect 32 0 33 0;
+#X connect 33 0 34 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 0;
+#X connect 42 0 26 0;
+#X connect 43 0 9 0;
+#X connect 45 0 42 0;
+#X connect 46 0 43 0;
+#X restore 447 -58 pd rossFreqD1;
+#N canvas 397 227 1009 672 cavFreqD1 0;
+#X obj 273 -22 r~ MY_MACH;
+#X obj 258 -43 sig~ 1;
+#X obj 273 3 *~;
+#X obj 273 25 *~ 0.2;
+#X obj 258 48 +~;
+#X obj 258 71 sqrt~;
+#X obj 273 93 r~ MY_MACH;
+#X text 324 20 (y-1)/2 -> y = 1.4;
+#X obj 258 119 /~;
+#X obj 463 -24 hsl 80 20 0 10 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2200 1;
+#X obj 460 1 i;
+#X msg 460 23 \$1 50;
+#X obj 460 44 line~;
+#X floatatom 502 23 0 0 0 0 - - -;
+#X obj 598 -47 hsl 80 20 0 10 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 1600 1;
+#X obj 595 -22 i;
+#X msg 595 0 \$1 50;
+#X obj 595 21 line~;
+#X floatatom 637 0 0 0 0 0 - - -;
+#X obj 741 -41 hsl 80 20 0 10 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2300 1;
+#X obj 738 -16 i;
+#X msg 738 6 \$1 50;
+#X obj 738 27 line~;
+#X floatatom 780 6 0 0 0 0 - - -;
+#X text 549 -24 l;
+#X text 687 -47 m;
+#X text 834 -40 n;
+#X obj 460 68 /~ 2;
+#X obj 460 98 *~;
+#X obj 595 43 /~ 2;
+#X obj 738 48 /~ 2;
+#X obj 610 67 r $-thisLen;
+#X obj 625 133 r $-thisWid;
+#X msg 610 90 \$1 50;
+#X obj 610 111 line~;
+#X msg 625 155 \$1 50;
+#X obj 625 176 line~;
+#X obj 610 199 /~;
+#X obj 595 240 *~;
+#X obj 595 266 *~;
+#X obj 753 71 r $-thisLen;
+#X msg 753 94 \$1 50;
+#X obj 753 115 line~;
+#X msg 768 159 \$1 50;
+#X obj 768 180 line~;
+#X obj 753 203 /~;
+#X obj 738 244 *~;
+#X obj 738 270 *~;
+#X obj 768 137 r $-thisDep;
+#X obj 582 310 +~;
+#X obj 638 341 +~;
+#X obj 638 366 sqrt~;
+#X obj 592 427 *~;
+#X obj 496 414 r myMet;
+#X obj 496 436 snapshot~;
+#X floatatom 496 460 0 0 0 0 - - -;
+#X obj 477 222 r myMet;
+#X obj 477 244 snapshot~;
+#X floatatom 477 268 0 0 0 0 - - -;
+#X obj 592 462 outlet~;
+#X connect 0 0 2 0;
+#X connect 0 0 2 1;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 4 1;
+#X connect 4 0 5 0;
+#X connect 5 0 8 0;
+#X connect 6 0 8 1;
+#X connect 8 0 52 0;
+#X connect 9 0 10 0;
+#X connect 10 0 11 0;
 #X connect 10 0 13 0;
 #X connect 11 0 12 0;
-#X connect 12 0 13 1;
-#X connect 13 0 14 0;
-#X connect 14 0 16 1;
+#X connect 12 0 27 0;
+#X connect 14 0 15 0;
 #X connect 15 0 16 0;
+#X connect 15 0 18 0;
 #X connect 16 0 17 0;
-#X connect 17 0 18 1;
-#X connect 18 0 20 0;
-#X connect 18 0 22 0;
+#X connect 17 0 29 0;
 #X connect 19 0 20 0;
 #X connect 20 0 21 0;
-#X connect 22 0 24 0;
-#X connect 23 0 22 1;
-#X connect 24 0 27 0;
-#X connect 24 0 42 0;
-#X connect 24 0 43 0;
-#X connect 24 0 50 0;
-#X connect 24 0 51 0;
-#X connect 24 0 52 0;
-#X connect 25 0 24 1;
-#X connect 26 0 27 0;
+#X connect 20 0 23 0;
+#X connect 21 0 22 0;
+#X connect 22 0 30 0;
 #X connect 27 0 28 0;
-#X connect 29 0 30 0;
-#X connect 30 0 31 0;
-#X connect 32 0 33 0;
+#X connect 27 0 28 1;
+#X connect 28 0 49 0;
+#X connect 29 0 38 0;
+#X connect 30 0 46 0;
+#X connect 31 0 33 0;
+#X connect 32 0 35 0;
 #X connect 33 0 34 0;
-#X connect 39 0 40 0;
+#X connect 34 0 37 0;
+#X connect 35 0 36 0;
+#X connect 36 0 37 1;
+#X connect 37 0 38 1;
+#X connect 38 0 39 0;
+#X connect 38 0 39 1;
+#X connect 39 0 49 1;
 #X connect 40 0 41 0;
-#X connect 42 0 30 0;
-#X connect 43 0 40 0;
-#X connect 44 0 45 0;
-#X connect 45 0 46 0;
-#X connect 47 0 48 0;
-#X connect 48 0 49 0;
-#X connect 50 0 33 0;
-#X connect 51 0 45 0;
-#X connect 52 0 48 0;
-#X restore 484 385 pd cavFreqD1;
-#X obj 487 165 hsl 100 25 0.001 10 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 1138 1;
-#X floatatom 520 202 0 0 0 0 - - -;
-#X obj 521 229 hsl 100 25 0.1 10 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
-#X floatatom 554 266 0 0 0 0 - - -;
-#X obj 556 293 hsl 100 25 0.1 10 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
-#X floatatom 589 330 0 0 0 0 - - -;
-#X text 599 168 Length;
-#X msg 526 122 3.6576;
-#X msg 41 290 510.54;
+#X connect 41 0 42 0;
+#X connect 42 0 45 0;
+#X connect 43 0 44 0;
+#X connect 44 0 45 1;
+#X connect 45 0 46 1;
+#X connect 46 0 47 0;
+#X connect 46 0 47 1;
+#X connect 47 0 50 1;
+#X connect 48 0 43 0;
+#X connect 49 0 50 0;
+#X connect 50 0 51 0;
+#X connect 51 0 52 1;
+#X connect 52 0 54 0;
+#X connect 52 0 59 0;
+#X connect 53 0 54 0;
+#X connect 54 0 55 0;
+#X connect 56 0 57 0;
+#X connect 57 0 58 0;
+#X restore 325 -58 pd cavFreqD1;
+#X obj 433 -129 s $-thisLen;
+#X obj 661 -128 s $-thisDep;
+#X obj 547 -129 s $-thisWid;
+#X obj -173 -31 s~ \$0-windSpeed;
+#X obj -173 -51 vd~ varwind;
+#X text -160 -75 Wind Speed;
+#X obj 340 -15 snapshot~;
+#X floatatom 340 5 0 0 0 0 - - -;
+#X obj 340 -36 r myMet;
+#X obj 461 -16 snapshot~;
+#X floatatom 461 4 0 0 0 0 - - -;
+#X obj 461 -37 r myMet;
+#X obj 477 83 /;
+#X obj 477 111 * 100;
+#X floatatom 415 136 0 0 0 0 - - -;
+#X obj 341 28 -;
+#X obj 341 49 abs;
+#X obj 477 138 < 5;
+#X obj 477 163 tgl 35 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+1;
 #X connect 0 0 2 0;
 #X connect 1 0 3 0;
 #X connect 2 0 1 0;
-#X connect 5 0 11 0;
-#X connect 5 0 25 0;
-#X connect 5 0 26 0;
-#X connect 6 0 7 0;
-#X connect 7 0 13 0;
-#X connect 8 0 9 0;
+#X connect 8 0 10 0;
 #X connect 9 0 5 0;
-#X connect 12 0 5 0;
-#X connect 13 0 14 0;
-#X connect 13 0 4 0;
-#X connect 13 1 18 0;
+#X connect 9 1 6 0;
+#X connect 10 0 11 0;
+#X connect 11 0 9 0;
+#X connect 11 0 13 0;
+#X connect 12 0 11 0;
 #X connect 14 0 15 0;
-#X connect 17 0 13 1;
+#X connect 14 0 42 0;
+#X connect 16 0 17 0;
+#X connect 16 0 44 0;
 #X connect 18 0 19 0;
-#X connect 21 0 6 0;
-#X connect 22 0 5 0;
-#X connect 23 0 18 0;
-#X connect 24 0 14 0;
-#X connect 25 0 6 1;
-#X connect 26 0 7 1;
-#X connect 31 0 33 0;
-#X connect 32 0 28 0;
-#X connect 32 1 29 0;
-#X connect 33 0 34 0;
-#X connect 34 0 32 0;
+#X connect 18 0 43 0;
+#X connect 21 0 25 0;
+#X connect 21 0 32 0;
+#X connect 21 0 33 0;
+#X connect 22 0 23 0;
+#X connect 23 0 27 0;
+#X connect 23 0 20 0;
+#X connect 24 0 34 0;
+#X connect 26 0 21 0;
+#X connect 27 0 28 0;
+#X connect 30 0 21 0;
+#X connect 31 0 27 0;
+#X connect 32 0 22 1;
+#X connect 33 0 23 1;
 #X connect 34 0 36 0;
-#X connect 35 0 34 0;
-#X connect 38 0 39 0;
-#X connect 38 0 37 0;
-#X connect 40 0 41 0;
-#X connect 40 0 37 1;
-#X connect 42 0 43 0;
-#X connect 42 0 37 2;
-#X connect 45 0 38 0;
-#X connect 46 0 27 0;
+#X connect 34 0 39 0;
+#X connect 35 0 32 1;
+#X connect 35 1 32 0;
+#X connect 36 0 35 0;
+#X connect 37 0 34 0;
+#X connect 38 0 21 0;
+#X connect 39 0 22 0;
+#X connect 40 0 51 0;
+#X connect 41 0 48 0;
+#X connect 46 0 45 0;
+#X connect 48 0 49 0;
+#X connect 49 0 57 0;
+#X connect 50 0 48 0;
+#X connect 51 0 52 0;
+#X connect 52 0 54 1;
+#X connect 52 0 57 1;
+#X connect 53 0 51 0;
+#X connect 54 0 55 0;
+#X connect 54 0 56 0;
+#X connect 55 0 59 0;
+#X connect 57 0 58 0;
+#X connect 58 0 54 0;
+#X connect 59 0 60 0;
diff -r 88e381980af7 -r 62b41b255645 Shallow Cavity/WindGenD1.pd
--- a/Shallow Cavity/WindGenD1.pd	Tue Aug 23 21:15:35 2016 +0100
+++ b/Shallow Cavity/WindGenD1.pd	Mon Sep 12 22:36:23 2016 +0100
@@ -1,73 +1,59 @@
-#N canvas 371 89 460 675 10;
+#N canvas 151 149 630 670 10;
 #X obj 172 219 +~ 1;
-#X obj 172 314 +~;
+#X obj 172 344 +~;
 #X obj 172 241 *~ 0.25;
-#X obj 188 291 +~;
-#N canvas 939 160 373 400 squall 0;
-#X obj 113 208 noise~;
-#X obj 113 271 hip~ 0;
-#X obj 113 229 lop~ 3;
-#X obj 113 250 lop~ 3;
-#X obj 50 274 *~;
+#X obj 187 291 +~;
+#N canvas 883 265 373 400 squall 0;
+#X obj 161 204 noise~;
+#X obj 161 267 hip~ 0;
+#X obj 72 240 *~;
 #X obj 72 318 *~;
-#X obj 50 252 *~ 8;
-#X obj 113 292 *~ 20;
-#X obj 50 188 inlet~;
+#X obj 72 218 *~ 8;
+#X obj 161 288 *~ 20;
+#X obj 72 154 inlet~;
 #X obj 72 342 outlet~;
-#X obj 50 208 max~ 0.42;
-#X obj 50 230 -~ 0.42;
-#X obj 39 107 noise~;
-#X obj 101 182 Snapshot~;
-#X obj 101 133 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
-1;
-#X floatatom 166 206 5 0 0 0 - - -;
-#X obj 39 128 lop~ 100;
-#X obj 100 106 loadbang;
-#X obj 101 156 metro 1000;
-#X obj 39 150 +~ 0.4;
-#X connect 0 0 2 0;
-#X connect 1 0 7 0;
+#X obj 72 174 max~ 0.4;
+#X obj 72 196 -~ 0.4;
+#X obj 161 225 lop~ 5;
+#X obj 161 246 lop~ 5;
+#X connect 0 0 10 0;
+#X connect 1 0 5 0;
 #X connect 2 0 3 0;
-#X connect 3 0 1 0;
-#X connect 4 0 5 0;
-#X connect 5 0 9 0;
-#X connect 6 0 4 0;
-#X connect 6 0 4 1;
-#X connect 7 0 5 1;
-#X connect 8 0 10 0;
+#X connect 3 0 7 0;
+#X connect 4 0 2 0;
+#X connect 4 0 2 1;
+#X connect 5 0 3 1;
+#X connect 6 0 8 0;
+#X connect 8 0 9 0;
+#X connect 9 0 4 0;
 #X connect 10 0 11 0;
-#X connect 11 0 6 0;
-#X connect 12 0 16 0;
-#X connect 13 0 15 0;
-#X connect 14 0 18 0;
-#X connect 16 0 19 0;
-#X connect 17 0 14 0;
-#X connect 18 0 13 0;
-#X connect 19 0 13 0;
+#X connect 11 0 1 0;
 #X restore 246 266 pd squall;
 #N canvas 706 412 202 229 gust 0;
 #X obj 0 0 noise~;
-#X obj 0 63 hip~ 0;
-#X obj 0 106 *~;
+#X obj 0 83 hip~ 0;
+#X obj 0 126 *~;
 #X obj 67 44 *~;
 #X obj 67 21 +~ 0.5;
 #X obj 67 67 -~ 0.125;
-#X obj 0 84 *~ 50;
 #X obj 67 0 inlet~;
-#X obj 0 131 outlet~;
-#X obj 0 42 lop~ 1;
-#X obj 0 21 lop~ 1;
-#X connect 0 0 10 0;
-#X connect 1 0 6 0;
-#X connect 2 0 8 0;
+#X obj 0 151 outlet~;
+#X obj 0 104 *~ 30;
+#X obj 0 21 lop~ 2;
+#X obj 0 42 lop~ 2;
+#X obj 0 63 lop~ 2;
+#X connect 0 0 9 0;
+#X connect 1 0 8 0;
+#X connect 2 0 7 0;
 #X connect 3 0 5 0;
 #X connect 4 0 3 0;
 #X connect 4 0 3 1;
 #X connect 5 0 2 1;
-#X connect 6 0 2 0;
-#X connect 7 0 4 0;
-#X connect 9 0 1 0;
-#X connect 10 0 9 0;
+#X connect 6 0 4 0;
+#X connect 8 0 2 0;
+#X connect 9 0 10 0;
+#X connect 10 0 11 0;
+#X connect 11 0 1 0;
 #X restore 187 267 pd gust;
 #X obj 172 381 outlet~;
 #X obj 172 197 osc~ 0.01;
@@ -78,12 +64,10 @@
 #X obj 172 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X floatatom 225 118 8 0 0 0 - - -;
-#X obj 90 19 lop~ 2000;
 #X obj 90 43 +~ 0.6;
 #X obj 145 172 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 172 20 loadbang;
-#X obj 173 118 * 0.2;
 #X msg 173 145 \$1 10;
 #X obj 172 69 metro 2000;
 #X obj 305 -57 noise~;
@@ -95,38 +79,44 @@
 #X obj 229 -38 loadbang;
 #X floatatom 279 66 5 0 0 0 - - -;
 #X obj 229 11 metro 4000;
-#X obj 305 18 *~ 3000;
 #X obj 255 71 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
+#X obj 214 291 inlet;
+#X obj 173 118 * 0.17;
+#X obj 90 19 lop~ 3000;
+#X obj 305 18 *~ 5000;
+#X obj 187 321 *~ 1;
 #X connect 0 0 2 0;
 #X connect 1 0 6 0;
 #X connect 2 0 4 0;
 #X connect 2 0 5 0;
 #X connect 2 0 1 0;
-#X connect 3 0 1 1;
+#X connect 3 0 32 0;
 #X connect 4 0 3 1;
 #X connect 5 0 3 0;
 #X connect 7 0 0 0;
-#X connect 8 0 14 0;
+#X connect 8 0 30 0;
+#X connect 9 0 10 0;
 #X connect 9 0 7 0;
-#X connect 9 0 10 0;
 #X connect 11 0 13 0;
-#X connect 11 0 18 0;
-#X connect 12 0 20 0;
-#X connect 14 0 15 0;
-#X connect 15 0 11 0;
-#X connect 17 0 12 0;
-#X connect 18 0 19 0;
-#X connect 19 0 9 0;
-#X connect 19 0 16 0;
-#X connect 20 0 11 0;
-#X connect 21 0 22 0;
-#X connect 22 0 23 0;
-#X connect 23 0 29 0;
-#X connect 24 0 20 1;
-#X connect 24 0 27 0;
-#X connect 24 0 30 0;
-#X connect 25 0 28 0;
-#X connect 26 0 25 0;
-#X connect 28 0 24 0;
-#X connect 29 0 24 0;
+#X connect 11 0 29 0;
+#X connect 12 0 18 0;
+#X connect 14 0 11 0;
+#X connect 16 0 12 0;
+#X connect 17 0 9 0;
+#X connect 17 0 15 0;
+#X connect 18 0 11 0;
+#X connect 19 0 20 0;
+#X connect 20 0 21 0;
+#X connect 21 0 31 0;
+#X connect 22 0 18 1;
+#X connect 22 0 25 0;
+#X connect 22 0 27 0;
+#X connect 23 0 26 0;
+#X connect 24 0 23 0;
+#X connect 26 0 22 0;
+#X connect 28 0 32 1;
+#X connect 29 0 17 0;
+#X connect 30 0 14 0;
+#X connect 31 0 22 0;
+#X connect 32 0 1 1;