diff June/Gen2_D1.pd @ 41:52511c74c3f1

Numerous improvements based on physics equation, inc intensity and azimuth angle calculations

--- a/June/Gen2_D1.pd	Fri May 29 15:22:13 2015 +0100
+++ b/June/Gen2_D1.pd	Fri May 29 20:56:56 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 6 90 872 721 10;
+#N canvas 62 23 1169 757 10;
 #N canvas 236 158 426 423 windspeed 0;
 #X obj 3 -19 +~ 1;
 #X obj 3 76 +~;
@@ -67,7 +67,7 @@
 #X connect 5 0 3 1;
 #X connect 6 0 3 0;
 #X connect 8 0 0 0;
-#X restore 250 -76 pd windspeed;
+#X restore 250 -126 pd windspeed;
 #X text 14 5 Light air = 0.56 m/s - 1.39 m/s;
 #X text 14 27 Light Breeze = 1.67 m/s - 3.33 m/s;
 #X text 14 47 Gentle Breeze = 3.61 m/s - 5.56 m/s;
@@ -81,24 +81,23 @@
 #X text 15 207 Storm = 28.89 m/s - 33.06 m/s;
 #X text 16 225 Hurricane = 33.33 -;
 #X text 52 -26 Beaufort Scale Chart;
-#X obj 392 125 thisFreq;
 #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 5400 1;
+-1 -1 600 1;
 #X text 229 438 Gain;
 #X msg 200 383 25;
 #X obj 200 355 loadbang;
 #X obj 250 28 delwrite~ varwind 3000;
-#X obj 351 -78 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 1800 1;
-#X obj 402 -9 snapshot~;
-#X obj 402 -34 metro 100;
-#X obj 402 -56 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj 333 -124 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 7200 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
 1;
-#X floatatom 402 18 10 0 0 0 - - -;
-#X obj 250 -37 *~ 1;
-#X obj 250 -11 +~ 1;
+#X floatatom 293 6 10 0 0 0 - - -;
+#X obj 250 -92 *~ 1;
+#X obj 250 -66 +~ 1;
 #X text 97 264 Equations from Chanaud 2010;
 #X text 10 329 Frequency = (Strouhal Number * Velocity) / Distance
 ;
@@ -106,11 +105,9 @@
 ;
 #X text 9 309 Strouhal Number = 0.198 * (1 - (19.7/ Reynolds Number))
 ;
-#X obj 392 64 vd~ varwind 200;
-#X obj 502 63 hsl 128 15 0.005 0.99 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 2800 1;
-#X floatatom 451 126 15 0 0 0 - - -;
-#N canvas 865 368 293 255 opLevels 1;
+#X obj 392 -23 vd~ varwind 200;
+#X floatatom 414 37 10 0 0 0 - - -;
+#N canvas 865 368 293 255 opLevels 0;
 #X obj 88 129 dac~;
 #X obj 64 70 catch~ l;
 #X obj 128 70 catch~ r;
@@ -134,32 +131,90 @@
 #X connect 7 0 4 1;
 #X connect 8 0 7 0;
 #X restore 45 376 pd opLevels;
-#N canvas 804 128 171 241 makeDia 1;
-#X obj 70 -14 *;
-#X obj 55 14 *;
-#X obj 70 -41 inlet;
-#X obj 55 44 outlet;
-#X connect 0 0 1 1;
-#X connect 0 0 1 0;
-#X connect 1 0 3 0;
-#X connect 2 0 0 0;
-#X connect 2 0 0 1;
-#X restore 437 96 pd makeDia;
-#X connect 0 0 27 0;
-#X connect 17 0 36 0;
-#X connect 19 0 17 0;
-#X connect 20 0 19 0;
-#X connect 22 0 27 1;
-#X connect 22 0 28 1;
-#X connect 23 0 26 0;
+#X text 381 182 Frequency (Hz);
+#X floatatom 392 157 10 0 0 0 - - -;
+#X floatatom 648 14 10 0 0 0 - - -;
+#X text 608 135 Frequency (Hz);
+#X floatatom 619 110 10 0 0 0 - - -;
+#X obj 619 -71 vd~ varwind 2000;
+#X obj 407 14 makeDia;
+#X obj 634 -16 makeDia;
+#X obj 392 125 thisFreq;
+#X obj 496 -60 vsl 20 50 0.005 0.99 0 0 empty empty empty 0 -9 0 10
+-262144 -1 -1 900 1;
+#X obj 522 -60 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 600 1;
+#X obj 465 79 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 1600 1;
+#X floatatom 522 9 5 0 0 0 - - -;
+#X floatatom 487 111 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 1200 1;
+#X obj 771 -73 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 200 1;
+#X obj 709 41 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 3200 1;
+#X floatatom 771 -4 5 0 0 0 - - -;
+#X floatatom 731 73 5 0 0 0 - - -;
+#X obj 619 78 thisFreq;
+#X floatatom 518 369 10 0 0 0 - - -;
+#X text 478 494 Frequency (Hz);
+#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 1100 1;
+#X obj 641 286 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 1700 1;
+#X obj 579 400 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 1900 1;
+#X floatatom 641 355 5 0 0 0 - - -;
+#X floatatom 601 432 5 0 0 0 - - -;
+#X obj 489 437 thisFreq;
+#X msg 456 260 100;
+#X msg 489 260 500;
+#X msg 521 260 1200;
+#X obj 489 288 vd~ varwind \$1;
+#X connect 0 0 26 0;
+#X connect 16 0 34 0;
+#X connect 18 0 16 0;
+#X connect 19 0 18 0;
+#X connect 21 0 26 1;
+#X connect 21 0 27 1;
+#X connect 22 0 25 0;
+#X connect 23 0 22 0;
 #X connect 24 0 23 0;
-#X connect 25 0 24 0;
-#X connect 27 0 28 0;
-#X connect 28 0 21 0;
-#X connect 28 0 23 0;
-#X connect 33 0 14 0;
-#X connect 34 0 37 0;
-#X connect 36 0 15 0;
-#X connect 36 1 16 0;
-#X connect 37 0 14 1;
-#X connect 37 0 35 0;
+#X connect 26 0 27 0;
+#X connect 27 0 20 0;
+#X connect 27 0 22 0;
+#X connect 32 0 43 0;
+#X connect 34 0 14 0;
+#X connect 34 1 15 0;
+#X connect 40 0 54 0;
+#X connect 41 0 33 0;
+#X connect 41 0 43 1;
+#X connect 42 0 37 0;
+#X connect 42 0 54 1;
+#X connect 43 0 36 0;
+#X connect 44 0 41 0;
+#X connect 45 0 43 2;
+#X connect 45 0 47 0;
+#X connect 46 0 43 3;
+#X connect 46 0 48 0;
+#X connect 49 0 42 0;
+#X connect 50 0 52 0;
+#X connect 50 0 54 2;
+#X connect 51 0 53 0;
+#X connect 51 0 54 3;
+#X connect 54 0 39 0;
+#X connect 58 0 55 0;
+#X connect 58 0 64 1;
+#X connect 59 0 58 0;
+#X connect 60 0 62 0;
+#X connect 60 0 64 2;
+#X connect 61 0 63 0;
+#X connect 61 0 64 3;
+#X connect 64 0 57 0;
+#X connect 65 0 68 0;
+#X connect 66 0 68 0;
+#X connect 67 0 68 0;
+#X connect 68 0 64 0;