# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1497354792 -3600
# Node ID e18dbd26468e80d6fd7630736646b354e4f669e1
# Parent  58abd60897297054507f781025acbc467bb89ff5
Wake quadrupoles directivity updated

diff -r 58abd6089729 -r e18dbd26468e ATT.pd
--- a/ATT.pd	Fri Jun 09 17:19:06 2017 +0100
+++ b/ATT.pd	Tue Jun 13 12:53:12 2017 +0100
@@ -1,18 +1,18 @@
-#N canvas 83 38 1333 826 10;
+#N canvas 232 81 1108 790 10;
 #X obj 26 65 hsl 80 25 0.0005 0.5 1 0 empty empty Diameter 2 15 0 10
--261682 -1 -1 3171 1;
+-261682 -1 -1 4842 1;
 #X floatatom 24 95 0 0 0 0 - - -;
 #X obj 24 322 hsl 80 25 0.01 0.99 0 0 empty empty Panning 2 15 0 10
 -261682 -1 -1 3950 1;
 #X floatatom 21 351 0 0 0 0 - - -;
 #X obj 25 222 hsl 80 25 -90 90 0 0 empty empty Obs_Azimuth 2 15 0 10
--261682 -1 -1 3950 1;
+-261682 -1 -1 3800 1;
 #X floatatom 22 251 0 0 0 0 - - -;
 #X obj 25 272 hsl 80 25 -180 180 0 0 empty empty Obs_Elevation 2 15
-0 10 -261682 -1 -1 5925 1;
+0 10 -261682 -1 -1 3400 1;
 #X floatatom 22 301 0 0 0 0 - - -;
 #X obj 26 171 hsl 80 25 100 1 1 0 empty empty Obs_Distance 2 15 0 10
--261682 -1 -1 4826 1;
+-261682 -1 -1 5522 1;
 #X floatatom 24 200 0 0 0 0 - - -;
 #X obj 157 291 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 220 291 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -41,9 +41,9 @@
 #X connect 10 0 4 1;
 #X restore 316 239 pd opLevels;
 #X obj 24 371 hsl 100 25 0.1 1e+11 1 0 empty empty Gain 2 15 0 10 -203904
--1 -1 0 1;
+-1 -1 400 1;
 #X obj 27 117 hsl 80 25 1 20 0 0 empty empty Length 2 15 0 10 -261682
--1 -1 2495 1;
+-1 -1 1663 1;
 #X floatatom 24 149 0 0 0 0 - - -;
 #X obj -352 309 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 0 1;
@@ -89,14 +89,13 @@
 #X text -266 497 Free Stream Turbulence Intensity (%);
 #X obj -256 455 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 0 1;
-#X obj 59 540 freqCalcCyl4No_D4Mach;
 #X obj -156 162 delwrite~ varwind 3000;
 #X obj -145 116 TUCalc2;
 #X obj -145 140 s blust;
 #X msg -156 65 \$1 50;
 #X obj -156 85 line~;
-#X obj 26 14 hsl 80 25 0.1 50 0 0 empty empty Air_Speed 2 15 0 10 -204800
--1 -1 0 1;
+#X obj 26 14 hsl 80 25 0.1 400 0 0 empty empty Air_Speed 2 15 0 10
+-204800 -1 -1 2000 1;
 #X floatatom 23 43 0 0 0 0 - - -;
 #X text 154 155 Frequency;
 #X floatatom 156 172 0 0 0 0 - - -;
@@ -146,22 +145,23 @@
 #X msg 427 125 24 0.01 15 6 20 700000 0.4 -20;
 #X msg 439 153 17 0.003 10 3 -100 700000 0.8 55;
 #X msg 446 186 28 0.033 7 6 35 700000 0.45 -5;
+#X obj 59 540 freqCalcCyl4No_D4Mach;
 #X connect 0 0 1 0;
-#X connect 0 0 55 0;
+#X connect 0 0 102 0;
 #X connect 2 0 3 0;
-#X connect 2 0 55 5;
+#X connect 2 0 102 5;
 #X connect 4 0 5 0;
-#X connect 4 0 55 3;
+#X connect 4 0 102 3;
 #X connect 6 0 7 0;
-#X connect 6 0 55 4;
+#X connect 6 0 102 4;
 #X connect 8 0 9 0;
-#X connect 8 0 55 2;
+#X connect 8 0 102 2;
 #X connect 12 0 10 0;
 #X connect 12 1 11 0;
 #X connect 13 0 12 0;
 #X connect 13 0 36 0;
 #X connect 14 0 15 0;
-#X connect 14 0 55 1;
+#X connect 14 0 102 1;
 #X connect 16 0 17 0;
 #X connect 18 0 16 0;
 #X connect 19 0 20 0;
@@ -184,43 +184,43 @@
 #X connect 49 0 41 0;
 #X connect 50 0 51 0;
 #X connect 51 0 52 0;
-#X connect 55 0 69 0;
-#X connect 55 1 71 0;
-#X connect 55 2 73 0;
-#X connect 57 0 58 0;
-#X connect 59 0 60 0;
-#X connect 60 0 56 0;
-#X connect 60 0 57 0;
-#X connect 61 0 59 0;
-#X connect 61 0 62 0;
-#X connect 69 0 64 0;
-#X connect 70 0 69 0;
-#X connect 71 0 65 0;
-#X connect 72 0 71 0;
-#X connect 73 0 67 0;
-#X connect 74 0 73 0;
-#X connect 75 0 99 0;
-#X connect 77 0 100 0;
+#X connect 56 0 57 0;
+#X connect 58 0 59 0;
+#X connect 59 0 55 0;
+#X connect 59 0 56 0;
+#X connect 60 0 58 0;
+#X connect 60 0 61 0;
+#X connect 68 0 63 0;
+#X connect 69 0 68 0;
+#X connect 70 0 64 0;
+#X connect 71 0 70 0;
+#X connect 72 0 66 0;
+#X connect 73 0 72 0;
+#X connect 74 0 98 0;
+#X connect 76 0 99 0;
+#X connect 78 0 100 0;
 #X connect 79 0 101 0;
-#X connect 80 0 102 0;
-#X connect 83 0 61 0;
-#X connect 84 0 4 0;
-#X connect 85 0 75 0;
-#X connect 86 0 2 0;
-#X connect 87 0 88 0;
-#X connect 89 0 48 0;
-#X connect 89 1 47 0;
-#X connect 89 2 46 0;
-#X connect 89 3 45 0;
-#X connect 89 4 44 0;
-#X connect 89 5 43 0;
-#X connect 89 6 87 0;
-#X connect 89 7 90 0;
-#X connect 90 0 91 0;
-#X connect 92 0 94 0;
-#X connect 94 0 89 0;
-#X connect 99 0 89 0;
-#X connect 100 0 89 0;
-#X connect 101 0 89 0;
-#X connect 102 0 89 0;
+#X connect 82 0 60 0;
+#X connect 83 0 4 0;
+#X connect 84 0 74 0;
+#X connect 85 0 2 0;
+#X connect 86 0 87 0;
+#X connect 88 0 48 0;
+#X connect 88 1 47 0;
+#X connect 88 2 46 0;
+#X connect 88 3 45 0;
+#X connect 88 4 44 0;
+#X connect 88 5 43 0;
+#X connect 88 6 86 0;
+#X connect 88 7 89 0;
+#X connect 89 0 90 0;
+#X connect 91 0 93 0;
+#X connect 93 0 88 0;
+#X connect 98 0 88 0;
+#X connect 99 0 88 0;
+#X connect 100 0 88 0;
+#X connect 101 0 88 0;
+#X connect 102 0 68 0;
+#X connect 102 1 70 0;
+#X connect 102 2 72 0;
 #X coords 0 -1 1 1 270 430 2 0 0;
diff -r 58abd6089729 -r e18dbd26468e freqCalcCyl4No_D4Mach.pd
--- a/freqCalcCyl4No_D4Mach.pd	Fri Jun 09 17:19:06 2017 +0100
+++ b/freqCalcCyl4No_D4Mach.pd	Tue Jun 13 12:53:12 2017 +0100
@@ -1,4 +1,4 @@
-#N canvas 159 62 1370 784 10;
+#N canvas 55 48 1370 784 10;
 #X text 582 246 Mass Density of Air;
 #X obj 704 247 *~ 1.225;
 #X obj 704 322 /~ 1.81e-05;
@@ -68,7 +68,7 @@
 #X obj 313 142 r~ \$0-str;
 #X obj 331 183 r \$0-leng;
 #X obj 356 241 r \$0-dist;
-#N canvas 83 79 1238 721 GoldfreqGain 1;
+#N canvas 83 79 1238 721 GoldfreqGain 0;
 #N canvas 759 125 181 244 pow6 0;
 #X obj 47 67 *~;
 #X obj 76 67 *~;
@@ -340,7 +340,7 @@
 #X connect 107 0 52 0;
 #X connect 108 0 107 0;
 #X restore 313 307 pd GoldfreqGain;
-#N canvas 344 132 1006 797 GoldnoiseGain 1;
+#N canvas 563 85 1006 797 GoldnoiseGain 1;
 #X text -21037 364 Mass Density of Air \, squared;
 #X obj -20777 459 *;
 #X text -20777 412 Distance;
@@ -375,12 +375,12 @@
 #X obj -20846 137 inlet~;
 #X obj -20807 286 inlet;
 #X obj -20777 433 inlet;
-#X obj -20861 617 outlet~;
-#X text -20858 648 Gain proportional to windspeed to power 8 for spectrum
+#X obj -20861 636 outlet~;
+#X text -20858 667 Gain proportional to windspeed to power 8 for spectrum
 ;
 #X text -20771 287 Diameter;
 #X text -20847 118 Wind speed;
-#X text -21027 627 Calculates wake gain;
+#X text -21027 646 Calculates wake gain;
 #X text -20399 16 Azimuth;
 #X obj -20398 33 inlet;
 #X obj -20342 33 inlet;
@@ -390,7 +390,7 @@
 #X obj -20398 117 s~ \$0-this_azim;
 #X obj -20342 95 s~ \$0-this_elev;
 #X obj -20861 371 *~ 1.225;
-#X obj -20501 232 r~ \$0-this_azim;
+#X obj -20459 466 r~ \$0-this_azim;
 #N canvas 759 125 250 309 pow5 0;
 #X obj 47 67 *~;
 #X obj 76 35 inlet~;
@@ -442,8 +442,7 @@
 #X connect 9 0 2 0;
 #X connect 9 0 3 0;
 #X restore -20670 401 pd pow5;
-#X obj -20624 216 /~ 360;
-#X obj -20624 243 cos~;
+#X obj -20624 264 cos~;
 #X obj -20624 349 *~;
 #X obj -20670 348 sig~ 1;
 #X obj -20670 375 -~;
@@ -455,7 +454,7 @@
 #X obj -20720 502 *~;
 #X obj -20777 530 *~;
 #X obj -20861 574 /~;
-#X obj -20623 186 r~ \$0-this_elev;
+#X obj -20608 173 r~ \$0-this_elev;
 #X obj -20916 137 inlet~;
 #X obj -20916 164 *~;
 #X obj -20828 253 inlet~;
@@ -513,70 +512,130 @@
 #X msg -20777 480 \$1 5;
 #X obj -20398 86 line~;
 #X msg -20398 64 \$1 5;
-#X obj -20501 278 cos~;
-#X obj -20861 595 *~ 1;
-#X obj -20501 255 /~ 360;
-#X obj -20516 299 *~;
+#X obj -20459 512 cos~;
+#X obj -20459 489 /~ 360;
+#X obj -20459 534 *~;
 #X text -20929 530 Sqrt(2*pi);
 #X obj -20609 326 r~ MY_MACH;
 #X text -21045 480 Scaling factor between dipoles;
+#X obj -20861 595 *~;
+#X text -20512 165 Lateral Quadrupole Directionality;
+#X obj -20520 196 sig~ 1;
+#X obj -20505 223 sig~ 0.7;
+#X obj -20490 332 cos~;
+#N canvas 927 234 183 208 pow4 0;
+#X obj 47 67 *~;
+#X obj 76 67 *~;
+#X obj 76 35 inlet~;
+#X obj 47 120 outlet~;
+#X obj 47 93 *~;
+#X connect 0 0 4 0;
+#X connect 1 0 4 1;
+#X connect 2 0 0 0;
+#X connect 2 0 0 1;
+#X connect 2 0 1 1;
+#X connect 2 0 1 0;
+#X connect 4 0 3 0;
+#X restore -20490 356 pd pow4;
+#X obj -20505 378 *~;
+#X obj -20420 393 sin~;
+#X obj -20420 370 *~ 2;
+#X obj -20420 417 *~;
+#X obj -20457 396 +~ 3;
+#X obj -20457 417 /~ 4;
+#X obj -20457 442 *~;
+#X obj -20505 475 -~;
+#X obj -20520 501 +~;
+#X obj -20520 560 *~;
+#X obj -20623 152 sig~ 180;
+#X obj -20623 197 -~;
+#X obj -20475 267 r~ \$0-this_elev;
+#X obj -20490 246 sig~ 180;
+#X obj -20490 288 -~;
+#X obj -20623 226 /~ 360;
+#X obj -20490 309 /~ 360;
 #X obj -20861 483 /~ 10000;
-#X connect 1 0 58 0;
-#X connect 3 0 43 1;
-#X connect 4 0 50 0;
-#X connect 5 0 42 1;
+#X connect 1 0 57 0;
+#X connect 3 0 42 1;
+#X connect 4 0 49 0;
+#X connect 5 0 41 1;
 #X connect 6 0 1 0;
 #X connect 6 0 1 1;
 #X connect 13 0 17 0;
-#X connect 13 0 60 0;
+#X connect 13 0 59 0;
 #X connect 14 0 16 0;
-#X connect 14 0 56 0;
-#X connect 20 0 46 0;
-#X connect 21 0 63 0;
-#X connect 22 0 35 1;
+#X connect 14 0 55 0;
+#X connect 20 0 45 0;
+#X connect 21 0 61 0;
+#X connect 22 0 34 1;
 #X connect 23 0 22 0;
-#X connect 24 0 34 1;
+#X connect 24 0 33 1;
 #X connect 25 0 26 0;
-#X connect 26 0 27 0;
-#X connect 27 0 29 1;
-#X connect 28 0 29 0;
-#X connect 29 0 24 0;
-#X connect 30 0 31 0;
-#X connect 30 0 31 1;
-#X connect 31 0 33 1;
+#X connect 26 0 28 1;
+#X connect 27 0 28 0;
+#X connect 28 0 24 0;
+#X connect 29 0 30 0;
+#X connect 29 0 30 1;
+#X connect 30 0 32 1;
+#X connect 31 0 32 0;
 #X connect 32 0 33 0;
 #X connect 33 0 34 0;
-#X connect 34 0 35 0;
+#X connect 34 0 35 1;
 #X connect 35 0 36 1;
-#X connect 36 0 37 1;
-#X connect 37 0 62 0;
-#X connect 38 0 25 0;
-#X connect 39 0 40 0;
-#X connect 39 0 40 1;
-#X connect 40 0 43 0;
-#X connect 41 0 42 0;
-#X connect 42 0 44 1;
-#X connect 43 0 44 0;
-#X connect 44 0 20 0;
-#X connect 45 0 46 1;
-#X connect 46 0 68 0;
-#X connect 47 0 37 0;
-#X connect 50 0 54 0;
-#X connect 52 0 51 0;
-#X connect 52 0 50 0;
-#X connect 53 0 3 0;
-#X connect 54 0 53 0;
-#X connect 55 0 19 0;
-#X connect 56 0 55 0;
-#X connect 57 0 36 0;
-#X connect 58 0 57 0;
-#X connect 59 0 18 0;
-#X connect 60 0 59 0;
-#X connect 61 0 64 1;
-#X connect 62 0 7 0;
-#X connect 63 0 61 0;
-#X connect 66 0 27 1;
-#X connect 68 0 47 0;
+#X connect 36 0 66 0;
+#X connect 37 0 83 1;
+#X connect 38 0 39 0;
+#X connect 38 0 39 1;
+#X connect 39 0 42 0;
+#X connect 40 0 41 0;
+#X connect 41 0 43 1;
+#X connect 42 0 43 0;
+#X connect 43 0 20 0;
+#X connect 44 0 45 1;
+#X connect 45 0 89 0;
+#X connect 46 0 36 0;
+#X connect 49 0 53 0;
+#X connect 51 0 50 0;
+#X connect 51 0 49 0;
+#X connect 52 0 3 0;
+#X connect 53 0 52 0;
+#X connect 54 0 19 0;
+#X connect 55 0 54 0;
+#X connect 56 0 35 0;
+#X connect 57 0 56 0;
+#X connect 58 0 18 0;
+#X connect 59 0 58 0;
+#X connect 60 0 62 1;
+#X connect 60 0 62 0;
+#X connect 61 0 60 0;
+#X connect 62 0 81 1;
+#X connect 64 0 26 1;
+#X connect 66 0 7 0;
+#X connect 68 0 80 0;
+#X connect 69 0 72 0;
+#X connect 69 0 76 0;
+#X connect 70 0 71 0;
+#X connect 71 0 72 1;
+#X connect 72 0 79 0;
+#X connect 73 0 75 0;
+#X connect 73 0 75 1;
+#X connect 74 0 73 0;
+#X connect 75 0 78 1;
+#X connect 76 0 77 0;
+#X connect 77 0 78 0;
+#X connect 78 0 79 1;
+#X connect 79 0 80 1;
+#X connect 80 0 81 0;
+#X connect 81 0 66 1;
+#X connect 82 0 83 0;
+#X connect 83 0 87 0;
+#X connect 84 0 86 1;
+#X connect 85 0 86 0;
+#X connect 86 0 88 0;
+#X connect 87 0 25 0;
+#X connect 88 0 70 0;
+#X connect 88 0 74 0;
+#X connect 89 0 46 0;
 #X restore 304 573 pd GoldnoiseGain;
 #X text 295 620 Calculates the gain of the wake;
 #X obj 460 80 s \$0-azim;
@@ -773,7 +832,6 @@
 is linear and did not appear to be reliant on current TU values;
 #X text 114 -16 Middle section of Reynolds number - DeltaF/F relationship
 is also linear but depends on TU Value;
-#X obj 461 412 max 0.005;
 #X floatatom 402 435 0 0 0 0 - - -;
 #X obj 707 42 > 243320;
 #X obj 712 97 > 145021;
@@ -783,11 +841,12 @@
 the bandpass filters. Future development may link this to the Turbulence
 Intensity but not enough data available at time of writing to do this.
 ;
+#X obj 461 412 max 5;
 #X connect 0 0 16 0;
 #X connect 1 0 2 0;
 #X connect 1 1 2 1;
 #X connect 2 0 3 0;
-#X connect 2 0 36 0;
+#X connect 2 0 42 0;
 #X connect 4 0 1 0;
 #X connect 7 0 9 0;
 #X connect 8 0 9 0;
@@ -796,8 +855,8 @@
 #X connect 9 0 12 0;
 #X connect 9 0 10 0;
 #X connect 9 0 31 0;
+#X connect 9 0 39 0;
 #X connect 9 0 40 0;
-#X connect 9 0 41 0;
 #X connect 10 0 11 0;
 #X connect 11 0 15 0;
 #X connect 12 0 10 1;
@@ -821,10 +880,10 @@
 #X connect 28 0 30 0;
 #X connect 28 0 4 0;
 #X connect 29 0 28 0;
-#X connect 36 0 5 0;
-#X connect 36 0 37 0;
-#X connect 40 0 22 1;
-#X connect 41 0 11 1;
+#X connect 39 0 22 1;
+#X connect 40 0 11 1;
+#X connect 42 0 5 0;
+#X connect 42 0 36 0;
 #X restore 1189 91 pd StBandwidth;
 #X obj 1189 67 inlet;
 #X obj 1189 114 s \$0-Qval;
@@ -1005,6 +1064,12 @@
 #X connect 80 0 31 1;
 #X connect 81 0 67 0;
 #X restore 837 576 pd Dipoles;
+#X obj 545 548 snapshot~;
+#X obj 545 525 r myMet;
+#X floatatom 545 573 0 0 0 0 - - -;
+#X obj 542 623 snapshot~;
+#X obj 542 600 r myMet;
+#X floatatom 542 648 0 0 0 0 - - -;
 #X connect 1 0 3 0;
 #X connect 2 0 19 0;
 #X connect 2 0 36 0;
@@ -1046,9 +1111,11 @@
 #X connect 66 0 69 0;
 #X connect 67 0 69 2;
 #X connect 68 0 69 5;
+#X connect 69 0 103 0;
 #X connect 69 0 43 0;
 #X connect 69 1 42 0;
 #X connect 70 0 47 0;
+#X connect 70 0 106 0;
 #X connect 74 0 69 6;
 #X connect 75 0 69 7;
 #X connect 76 0 70 7;
@@ -1071,3 +1138,7 @@
 #X connect 96 0 14 0;
 #X connect 96 0 101 0;
 #X connect 101 0 97 0;
+#X connect 103 0 105 0;
+#X connect 104 0 103 0;
+#X connect 106 0 108 0;
+#X connect 107 0 106 0;
diff -r 58abd6089729 -r e18dbd26468e newStrou.pd
--- a/newStrou.pd	Fri Jun 09 17:19:06 2017 +0100
+++ b/newStrou.pd	Tue Jun 13 12:53:12 2017 +0100
@@ -1,4 +1,4 @@
-#N canvas 74 48 718 433 10;
+#N canvas 381 303 718 433 10;
 #X obj 203 48 inlet~;
 #X obj 273 202 outlet~;
 #X text 101 20 Reynolds number coming in;
@@ -60,7 +60,7 @@
 #X text 254 359 St* (I) coefficient;
 #X text 462 361 m (J) coefficient;
 #X msg 794 226 0.576 -175.957;
-#X text 372 240;
+#X text 372 240 comment;
 #X msg 365 223 0.2492 -0.8861;
 #X text 370 240 Linear Int;
 #X connect 0 0 6 0;
@@ -143,21 +143,16 @@
 #X text 359 101 m;
 #X text 376 152 St = St* + m / sqrt(Re);
 #X obj 99 248 snapshot~;
-#X obj 99 223 metro 100;
-#X obj 99 201 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
-1;
-#X floatatom 99 274 10 0 0 0 - - -;
-#X obj 99 175 loadbang;
+#X floatatom 99 274 0 0 0 0 - - -;
 #X obj 273 166 +~;
+#X obj 99 223 r myMet;
 #X connect 0 0 4 0;
 #X connect 0 0 5 0;
-#X connect 4 0 16 0;
+#X connect 4 0 13 0;
 #X connect 4 1 6 0;
 #X connect 5 0 6 1;
-#X connect 6 0 16 1;
-#X connect 11 0 14 0;
-#X connect 12 0 11 0;
-#X connect 13 0 12 0;
-#X connect 15 0 13 0;
-#X connect 16 0 1 0;
-#X connect 16 0 11 0;
+#X connect 6 0 13 1;
+#X connect 11 0 12 0;
+#X connect 13 0 1 0;
+#X connect 13 0 11 0;
+#X connect 14 0 11 0;