# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1432983870 -3600
# Node ID 0440ba3776149296a22945ee80916043a90cd5a0
# Parent  e59cd8e8c166e4dc3870161570e18753c1075592
Drag dipole / self noise added in direction parallel to the flow

diff -r e59cd8e8c166 -r 0440ba377614 June/Gen2_D1.pd
--- a/June/Gen2_D1.pd	Sat May 30 11:17:30 2015 +0100
+++ b/June/Gen2_D1.pd	Sat May 30 12:04:30 2015 +0100
@@ -84,12 +84,12 @@
 #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 6100 1;
+-1 -1 500 1;
 #X text 229 438 Gain;
 #X obj 200 355 loadbang;
 #X obj 250 68 delwrite~ varwind 3000;
 #X obj 333 -124 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4300 1;
+-1 -1 4100 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
@@ -139,17 +139,17 @@
 #X obj 407 14 makeDia;
 #X obj 634 -16 makeDia;
 #X obj 496 -60 vsl 20 50 0.005 0.99 0 0 empty empty empty 0 -9 0 10
--262144 -1 -1 1200 1;
+-262144 -1 -1 1600 1;
 #X obj 521 -32 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
--1 -1 1800 1;
+-1 -1 3600 1;
 #X obj 475 80 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 1700 1;
+-1 -1 3700 1;
 #X floatatom 521 37 5 0 0 0 - - -;
 #X floatatom 497 112 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 900 1;
+-262144 -1 -1 1200 1;
 #X obj 754 -52 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
--1 -1 2600 1;
+-1 -1 3800 1;
 #X obj 709 41 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 3300 1;
 #X floatatom 754 17 5 0 0 0 - - -;
@@ -159,18 +159,17 @@
 #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 1300 1;
+-262144 -1 -1 900 1;
 #X obj 612 303 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
--1 -1 2500 1;
+-1 -1 3100 1;
 #X obj 582 400 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 3400 1;
+-262144 -1 -1 2000 1;
 #X floatatom 612 372 5 0 0 0 - - -;
 #X floatatom 601 432 5 0 0 0 - - -;
 #X msg 456 260 100;
 #X msg 489 260 500;
 #X msg 521 260 1200;
 #X obj 489 288 vd~ varwind \$1;
-#X obj 489 437 thisFreq;
 #X obj 293 -93 loadbang;
 #X msg 200 383 5;
 #X text 477 -80 Diameter;
@@ -183,11 +182,12 @@
 #X text 770 48 Azimuth;
 #X text 639 400 Azimuth;
 #X text 290 24 Wind Speed;
+#X obj 489 437 thisFreq;
 #X obj 392 125 thisFreq;
 #X obj 619 78 thisFreq;
 #X connect 0 0 25 0;
 #X connect 16 0 33 0;
-#X connect 18 0 67 0;
+#X connect 18 0 66 0;
 #X connect 20 0 25 1;
 #X connect 20 0 26 1;
 #X connect 21 0 24 0;
@@ -215,18 +215,18 @@
 #X connect 49 0 51 0;
 #X connect 49 0 79 3;
 #X connect 55 0 52 0;
-#X connect 55 0 65 1;
+#X connect 55 0 77 1;
 #X connect 56 0 55 0;
 #X connect 57 0 59 0;
-#X connect 57 0 65 2;
+#X connect 57 0 77 2;
 #X connect 58 0 60 0;
-#X connect 58 0 65 3;
+#X connect 58 0 77 3;
 #X connect 61 0 64 0;
 #X connect 62 0 64 0;
 #X connect 63 0 64 0;
-#X connect 64 0 65 0;
-#X connect 65 0 54 0;
-#X connect 66 0 23 0;
-#X connect 67 0 16 0;
+#X connect 64 0 77 0;
+#X connect 65 0 23 0;
+#X connect 66 0 16 0;
+#X connect 77 0 54 0;
 #X connect 78 0 35 0;
 #X connect 79 0 38 0;
diff -r e59cd8e8c166 -r 0440ba377614 June/thisFreq.pd
--- a/June/thisFreq.pd	Sat May 30 11:17:30 2015 +0100
+++ b/June/thisFreq.pd	Sat May 30 12:04:30 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 392 84 1223 757 10;
+#N canvas 355 47 1223 757 10;
 #X text 46 -77 Mass Density of Air;
 #X text 237 301 Frequency (Hz);
 #X obj 327 -119 inlet~;
@@ -70,23 +70,31 @@
 #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 487 135 cos;
+#X obj 487 90 / 360;
+#X obj 487 112 * 6.28319;
 #X obj 413 155 *~ 0.27;
 #X obj 139 274 *~;
-#X floatatom 501 161 5 0 0 0 - - -;
-#X obj 501 136 *;
+#X floatatom 487 184 5 0 0 0 - - -;
+#X obj 487 159 *;
 #X text 546 46 Azimuth;
 #X text 490 -49 Distance;
 #X obj 413 130 *~ 1;
 #X text 198 -21 Viscosity;
 #X obj 18 219 *~ 2;
 #X obj 18 246 osc~;
-#X obj 53 246 *~ 0.1;
 #X obj 18 282 *~;
 #X obj 124 310 +~;
 #X obj 336 200 *~ 1e-06;
+#X obj 579 134 cos;
+#X obj 579 89 / 360;
+#X obj 579 111 * 6.28319;
+#X floatatom 579 183 5 0 0 0 - - -;
+#X obj 579 158 *;
+#X obj 524 229 *~ 0.27;
+#X obj 524 204 *~ 1;
+#X obj 447 274 *~ 1e-07;
+#X obj 494 69 + 90;
 #X connect 2 0 6 0;
 #X connect 2 0 19 1;
 #X connect 2 0 26 0;
@@ -124,21 +132,31 @@
 #X connect 34 0 35 0;
 #X connect 35 0 36 1;
 #X connect 36 0 47 0;
-#X connect 37 0 39 0;
+#X connect 36 0 60 0;
+#X connect 37 0 62 0;
+#X connect 37 0 55 0;
 #X connect 38 0 44 0;
 #X connect 38 0 44 1;
 #X connect 39 0 40 0;
 #X connect 40 0 38 0;
-#X connect 41 0 54 0;
-#X connect 42 0 53 1;
+#X connect 41 0 53 0;
+#X connect 42 0 52 1;
 #X connect 44 0 43 0;
 #X connect 44 0 47 1;
 #X connect 47 0 41 0;
 #X connect 49 0 50 0;
-#X connect 50 0 52 0;
-#X connect 51 0 52 1;
-#X connect 52 0 53 0;
-#X connect 53 0 3 0;
-#X connect 53 0 4 0;
-#X connect 54 0 42 1;
-#X connect 54 0 51 0;
+#X connect 50 0 51 0;
+#X connect 51 0 52 0;
+#X connect 52 0 3 0;
+#X connect 52 0 4 0;
+#X connect 53 0 42 1;
+#X connect 54 0 58 0;
+#X connect 54 0 58 1;
+#X connect 55 0 56 0;
+#X connect 56 0 54 0;
+#X connect 58 0 57 0;
+#X connect 58 0 60 1;
+#X connect 59 0 61 0;
+#X connect 60 0 59 0;
+#X connect 61 0 51 1;
+#X connect 62 0 39 0;