# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1434732474 -3600
# Node ID eb08e5c84f21d3d43fa89287225e0f92eb34fca7
# Parent  4c0bb6e558663d16839f4c9e0463e6bfd343357f
Prop_D1 edited, inc. freq3DChord

diff -r 4c0bb6e55866 -r eb08e5c84f21 .DS_Store
Binary file .DS_Store has changed
diff -r 4c0bb6e55866 -r eb08e5c84f21 June/.DS_Store
Binary file June/.DS_Store has changed
diff -r 4c0bb6e55866 -r eb08e5c84f21 June/freq3DChord.pd
--- a/June/freq3DChord.pd	Fri Jun 19 11:21:10 2015 +0100
+++ b/June/freq3DChord.pd	Fri Jun 19 17:47:54 2015 +0100
@@ -1,297 +1,333 @@
-#N canvas 289 53 1236 817 10;
-#X text 181 156 Mass Density of Air;
+#N canvas 62 41 1321 796 10;
+#X text 49 202 Mass Density of Air;
 #X text 115 130 Frequency (Hz);
-#X obj 170 644 throw~ l;
-#X obj 197 625 throw~ r;
-#X obj 274 476 osc~;
-#X obj 303 157 *~ 1.225;
-#X obj 303 232 /~ 1.81e-05;
-#X obj 273 335 *~ 0.198;
-#X obj 303 187 *~ 1;
-#X obj 273 395 /~ 1;
+#X obj 142 641 throw~ l;
+#X obj 169 622 throw~ r;
+#X obj 142 522 osc~;
+#X obj 171 203 *~ 1.225;
+#X obj 171 278 /~ 1.81e-05;
+#X obj 141 381 *~ 0.198;
+#X obj 171 233 *~ 1;
+#X obj 141 441 /~ 1;
 #X obj 125 79 snapshot~;
 #X obj 125 32 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X floatatom 125 105 10 0 0 0 - - -;
-#X obj 234 251 sig~ 19.7;
-#X obj 288 275 /~;
-#X obj 234 275 sig~ 1;
-#X obj 273 304 -~;
-#X obj 273 364 *~;
-#X obj 273 421 clip~ 0 20000;
+#X obj 102 297 sig~ 19.7;
+#X obj 156 321 /~;
+#X obj 102 321 sig~ 1;
+#X obj 141 350 -~;
+#X obj 141 410 *~;
+#X obj 141 467 clip~ 0 20000;
 #X obj 175 -110 inlet;
 #X obj 205 104 outlet;
 #X obj 125 6 loadbang;
-#X text 365 33 Mass Density of Air \, squared;
-#X text 662 18 Speed of Sound to power 2;
-#N canvas 759 125 286 289 pow6 0;
+#X text 665 42 Mass Density of Air \, squared;
+#X text 962 27 Speed of Sound to power 2;
+#N canvas 713 191 156 220 pow6 0;
 #X obj 47 67 *~;
 #X obj 76 67 *~;
 #X obj 76 35 inlet~;
 #X obj 47 163 outlet~;
-#X obj 136 184 snapshot~;
-#X obj 136 159 metro 100;
-#X obj 136 137 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
-1;
-#X floatatom 136 211 10 0 0 0 - - -;
-#X obj 216 210 outlet;
-#X obj 136 111 loadbang;
 #X obj 106 67 *~;
 #X obj 47 93 *~;
 #X obj 47 118 *~;
-#X connect 0 0 11 0;
-#X connect 1 0 11 1;
+#X connect 0 0 5 0;
+#X connect 1 0 5 1;
 #X connect 2 0 0 0;
 #X connect 2 0 0 1;
 #X connect 2 0 1 1;
-#X connect 2 0 10 0;
-#X connect 2 0 10 1;
+#X connect 2 0 4 0;
+#X connect 2 0 4 1;
 #X connect 2 0 1 0;
-#X connect 4 0 7 0;
-#X connect 4 0 8 0;
-#X connect 5 0 4 0;
-#X connect 6 0 5 0;
-#X connect 9 0 6 0;
-#X connect 10 0 12 1;
-#X connect 11 0 12 0;
-#X connect 12 0 4 0;
-#X connect 12 0 3 0;
-#X restore 548 -64 pd pow6;
-#X text 144 225 Reynolds Number;
-#X text 152 407 Strouhal Number;
-#X obj 511 -51 *~;
-#X obj 548 -26 *~;
-#X obj 548 8 *~ 1;
-#X obj 548 36 *~ 1.50063;
-#X obj 626 -15 inlet;
-#X obj 626 10 *;
-#X obj 626 35 * 118033;
-#X obj 548 71 /~ 1;
-#X obj 569 139 inlet;
-#X obj 569 239 cos;
-#X obj 569 194 / 360;
-#X obj 548 344 *~ 0.27;
-#X obj 274 507 *~;
-#X floatatom 586 291 5 0 0 0 - - -;
-#X obj 569 263 *;
-#X text 572 116 Azimuth;
-#X text 625 -35 Distance;
-#X obj 548 319 *~ 1;
-#X text 333 212 Viscosity;
-#X obj 76 454 *~ 2;
-#X obj 76 481 osc~;
-#X obj 76 517 *~;
-#X obj 170 557 +~;
-#X obj 548 369 *~ 1e-06;
-#X obj 678 239 cos;
-#X obj 678 194 / 360;
-#X floatatom 705 290 5 0 0 0 - - -;
-#X obj 678 263 *;
-#X obj 657 343 *~ 0.27;
-#X obj 657 319 *~ 1;
+#X connect 4 0 6 1;
+#X connect 5 0 6 0;
+#X connect 6 0 3 0;
+#X restore 848 -55 pd pow6;
+#X text 12 271 Reynolds Number;
+#X text 20 453 Strouhal Number;
+#X obj 811 -42 *~;
+#X obj 848 -17 *~;
+#X obj 848 17 *~ 1;
+#X obj 848 45 *~ 1.50063;
+#X obj 869 148 inlet;
+#X obj 869 248 cos;
+#X obj 869 203 / 360;
+#X obj 848 420 *~ 0.27;
+#X obj 142 553 *~;
+#X floatatom 886 300 5 0 0 0 - - -;
+#X obj 869 272 *;
+#X text 925 -26 Distance;
+#X obj 848 328 *~ 1;
+#X text 201 258 Viscosity;
+#X obj 848 445 *~ 1e-06;
+#X obj 1114 238 cos;
+#X obj 1114 193 / 360;
+#X floatatom 1141 289 5 0 0 0 - - -;
+#X obj 1114 262 *;
+#X obj 1093 421 *~ 0.27;
+#X obj 1093 294 *~ 1;
 #X obj 175 -87 s \$0-diameter;
-#X obj 364 156 r \$0-diameter;
-#X obj 374 351 r \$0-diameter;
-#X obj 617 -58 r \$0-diameter;
+#X obj 232 202 r \$0-diameter;
+#X obj 242 397 r \$0-diameter;
+#X obj 917 -49 r \$0-diameter;
 #X obj 53 -85 s~ \$0-windSpeed;
-#X obj 548 -90 r~ \$0-windSpeed;
-#X obj 329 334 r~ \$0-windSpeed;
-#X obj 303 129 r~ \$0-windSpeed;
-#X obj 207 433 s~ \$0_str;
-#X obj 481 -89 r~ \$0_str;
-#X obj 565 100 s~ \$0-a;
-#X obj 632 293 r~ \$0-a;
-#X obj 657 393 s~ \$0_dragDiGain;
-#X obj 109 481 r~ \$0_dragDiGain;
-#X obj 286 447 s~ \$0-myFreq;
-#X obj 76 427 r~ \$0-myFreq;
+#X obj 848 -81 r~ \$0-windSpeed;
+#X obj 197 380 r~ \$0-windSpeed;
+#X obj 171 175 r~ \$0-windSpeed;
+#X obj 75 479 s~ \$0_str;
+#X obj 781 -80 r~ \$0_str;
+#X obj 865 109 s~ \$0-a;
+#X obj 1092 96 r~ \$0-a;
+#X obj 1093 471 s~ \$0_dragDiGain;
+#X obj 154 493 s~ \$0-myFreq;
 #X obj 39 54 r~ \$0-myFreq;
-#X obj 548 393 s~ \$0_liftDiGain;
-#X obj 312 477 r~ \$0_liftDiGain;
-#X obj 887 20 r~ \$0-myFreq;
-#X obj 853 -4 noise~;
-#X obj 930 204 throw~ l;
-#X obj 957 183 throw~ r;
-#X obj 945 60 r~ \$0_liftDiGain;
-#X obj 930 111 *~;
-#X obj 544 541 snapshot~;
-#X obj 544 516 metro 100;
-#X obj 544 494 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj 848 469 s~ \$0_liftDiGain;
+#X obj 180 523 r~ \$0_liftDiGain;
+#X obj 451 24 r~ \$0-myFreq;
+#X obj 417 0 noise~;
+#X obj 494 201 throw~ l;
+#X obj 521 180 throw~ r;
+#X obj 509 57 r~ \$0_liftDiGain;
+#X obj 494 108 *~;
+#X obj 268 -5 snapshot~;
+#X obj 268 -30 metro 100;
+#X obj 268 -52 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
-#X floatatom 544 567 10 0 0 0 - - -;
-#X obj 544 468 loadbang;
-#X obj 458 516 r~ \$0-myRey;
-#X obj 316 256 s~ \$0-myRey;
-#X obj 1068 21 snapshot~;
-#X floatatom 1068 47 10 0 0 0 - - -;
-#X obj 1068 -52 loadbang;
-#X obj 1068 -27 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
-1 1;
-#X obj 979 -81 r~ \$0-myRey;
-#X obj 905 320 r~ \$0-myFreq;
-#X obj 871 295 noise~;
-#X obj 948 509 throw~ l;
-#X obj 975 486 throw~ r;
-#X obj 948 417 *~;
-#X obj 1086 329 snapshot~;
-#X floatatom 1086 355 10 0 0 0 - - -;
-#X obj 1086 256 loadbang;
-#X obj 1086 281 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
-1 1;
-#X obj 997 227 r~ \$0-myRey;
-#X obj 963 369 r~ \$0_dragDiGain;
-#X obj 905 346 *~ 2;
-#X text 529 589 Reynolds Number;
-#X obj 853 63 vcf~ 1000 10;
-#X obj 871 371 vcf~ 1000 10;
+#X floatatom 268 21 10 0 0 0 - - -;
+#X obj 268 -78 loadbang;
+#X obj 182 -30 r~ \$0-myRey;
+#X obj 184 302 s~ \$0-myRey;
+#X obj 543 15 snapshot~;
+#X floatatom 543 36 10 0 0 0 - - -;
+#X obj 481 -56 loadbang;
+#X obj 481 -31 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 543 -84 r~ \$0-myRey;
+#X obj 474 338 r~ \$0-myFreq;
+#X obj 440 313 noise~;
+#X obj 517 527 throw~ l;
+#X obj 544 504 throw~ r;
+#X obj 517 435 *~;
+#X obj 555 341 snapshot~;
+#X floatatom 555 364 10 0 0 0 - - -;
+#X obj 499 250 loadbang;
+#X obj 499 275 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 555 240 r~ \$0-myRey;
+#X obj 532 387 r~ \$0_dragDiGain;
+#X obj 474 364 *~ 2;
+#X text 253 43 Reynolds Number;
+#X obj 417 60 vcf~ 1000 10;
+#X obj 440 389 vcf~ 1000 10;
 #X obj 53 -108 inlet~;
-#X floatatom 642 153 5 0 0 0 - - -;
-#X obj 170 600 fcpan;
-#X obj 489 170 s \$0-b;
-#X obj 213 550 r \$0-b;
-#X obj 213 572 / 180;
-#X obj 930 160 fcpan;
-#X obj 957 112 r \$0-b;
-#X obj 957 134 / 180;
-#X obj 948 461 fcpan;
-#X obj 975 416 r \$0-b;
-#X obj 975 438 / 180;
-#X obj 569 216 * 6.28319;
-#X obj 678 216 * 6.28319;
-#X obj 945 84 *~ 1;
-#X obj 963 392 *~ 1;
-#X obj 997 302 clip~ 2 400;
-#X obj 979 -6 clip~ 2 400;
-#X obj 997 251 *~ -0.003;
-#X obj 979 -57 *~ -0.003;
-#X obj 979 -32 +~ 20;
-#X obj 997 276 +~ 20;
-#X obj 569 172 + 90;
-#X floatatom 591 11 5 0 0 0 - - -;
-#X obj 1068 -4 metro 10;
-#X obj 1086 304 metro 10;
+#X floatatom 905 181 5 0 0 0 - - -;
+#X obj 142 597 fcpan;
+#X obj 789 205 s \$0-b;
+#X obj 185 547 r \$0-b;
+#X obj 185 569 / 180;
+#X obj 494 157 fcpan;
+#X obj 521 109 r \$0-b;
+#X obj 521 131 / 180;
+#X obj 517 479 fcpan;
+#X obj 544 434 r \$0-b;
+#X obj 544 456 / 180;
+#X obj 869 225 * 6.28319;
+#X obj 1114 215 * 6.28319;
+#X obj 509 81 *~ 1;
+#X obj 532 410 *~ 1;
+#X obj 555 315 clip~ 2 400;
+#X obj 543 -9 clip~ 2 400;
+#X obj 543 -35 +~ 20;
+#X obj 555 289 +~ 20;
+#X obj 481 -8 metro 10;
+#X obj 499 298 metro 10;
 #X obj 125 54 metro 10;
-#X obj 657 368 *~ 1e-08;
-#X connect 4 0 39 0;
+#X obj 321 637 throw~ l;
+#X obj 348 618 throw~ r;
+#X obj 321 492 *~ 2;
+#X obj 321 519 osc~;
+#X obj 321 555 *~;
+#X obj 354 519 r~ \$0_dragDiGain;
+#X obj 321 465 r~ \$0-myFreq;
+#X obj 321 593 fcpan;
+#X obj 364 543 r \$0-b;
+#X obj 364 565 / 180;
+#X text 310 441 Drag Dipole Calculation;
+#X text 237 157 Lift Dipole Calculation;
+#X text 597 107 Lift Dipole Spectrum;
+#X text 603 446 Drag Dipole Spectrum;
+#X obj 947 216 inlet;
+#X obj 947 316 cos;
+#X obj 947 271 / 360;
+#X floatatom 964 368 5 0 0 0 - - -;
+#X obj 947 340 *;
+#X obj 848 395 *~ 1;
+#X floatatom 983 249 5 0 0 0 - - -;
+#X obj 947 293 * 6.28319;
+#X obj 947 249 + 90;
+#X obj 1025 247 s \$0-c;
+#X text 950 193 Elevation Angle;
+#X text 872 130 Azimuth Angle;
+#X obj 1114 135 r \$0-b;
+#X obj 1093 396 *~ 1;
+#X obj 1186 309 cos;
+#X obj 1186 264 / 360;
+#X floatatom 1213 360 5 0 0 0 - - -;
+#X obj 1186 333 *;
+#X obj 1186 286 * 6.28319;
+#X obj 1186 240 r \$0-c;
+#X text 1192 216 Elevation Angle;
+#X text 1116 74 Azimuth Angle;
+#X obj 926 -6 inlet~;
+#X obj 926 19 *~;
+#X obj 926 44 *~ 118033;
+#X obj 848 80 /~;
+#X obj 1093 446 *~ 1e-09;
+#X obj 789 183 + 90;
+#X obj 543 -60 *~ -0.0003;
+#X obj 555 264 *~ -0.0003;
+#X connect 4 0 35 0;
 #X connect 5 0 8 0;
 #X connect 6 0 14 1;
-#X connect 6 0 88 0;
+#X connect 6 0 77 0;
 #X connect 7 0 17 0;
 #X connect 8 0 6 0;
 #X connect 9 0 18 0;
-#X connect 9 0 65 0;
+#X connect 9 0 56 0;
 #X connect 10 0 12 0;
 #X connect 10 0 20 0;
-#X connect 11 0 135 0;
+#X connect 11 0 120 0;
 #X connect 13 0 14 0;
 #X connect 14 0 16 1;
 #X connect 15 0 16 0;
 #X connect 16 0 7 0;
 #X connect 17 0 9 0;
 #X connect 18 0 4 0;
-#X connect 18 0 71 0;
-#X connect 19 0 57 0;
+#X connect 18 0 61 0;
+#X connect 19 0 48 0;
 #X connect 21 0 11 0;
 #X connect 24 0 28 0;
 #X connect 27 0 28 1;
 #X connect 28 0 29 0;
 #X connect 29 0 30 0;
-#X connect 30 0 34 0;
-#X connect 31 0 32 0;
-#X connect 31 0 32 1;
-#X connect 31 0 132 0;
-#X connect 32 0 33 0;
-#X connect 33 0 34 1;
-#X connect 34 0 44 0;
-#X connect 34 0 67 0;
-#X connect 35 0 110 0;
-#X connect 35 0 52 0;
-#X connect 35 0 112 0;
-#X connect 35 0 131 0;
-#X connect 36 0 41 0;
-#X connect 36 0 41 1;
-#X connect 37 0 121 0;
-#X connect 38 0 50 0;
-#X connect 39 0 49 1;
-#X connect 41 0 40 0;
-#X connect 41 0 44 1;
-#X connect 44 0 38 0;
-#X connect 46 0 47 0;
-#X connect 47 0 48 0;
-#X connect 48 0 49 0;
-#X connect 49 0 111 0;
-#X connect 50 0 74 0;
-#X connect 51 0 54 0;
-#X connect 51 0 54 1;
-#X connect 52 0 122 0;
-#X connect 54 0 53 0;
-#X connect 54 0 56 1;
-#X connect 55 0 136 0;
-#X connect 56 0 55 0;
-#X connect 58 0 8 1;
-#X connect 59 0 9 1;
-#X connect 60 0 29 1;
-#X connect 62 0 24 0;
-#X connect 63 0 17 1;
-#X connect 64 0 5 0;
-#X connect 66 0 27 1;
-#X connect 66 0 27 0;
-#X connect 68 0 56 0;
-#X connect 70 0 48 1;
-#X connect 72 0 46 0;
-#X connect 73 0 10 0;
-#X connect 75 0 39 1;
-#X connect 76 0 107 1;
-#X connect 77 0 107 0;
-#X connect 80 0 123 0;
-#X connect 81 0 115 0;
-#X connect 82 0 85 0;
-#X connect 83 0 82 0;
-#X connect 84 0 83 0;
-#X connect 86 0 84 0;
-#X connect 87 0 82 0;
-#X connect 89 0 90 0;
-#X connect 89 0 107 2;
-#X connect 91 0 92 0;
-#X connect 92 0 133 0;
-#X connect 93 0 128 0;
-#X connect 94 0 105 0;
-#X connect 95 0 108 0;
-#X connect 98 0 118 0;
-#X connect 99 0 100 0;
-#X connect 99 0 108 2;
-#X connect 101 0 102 0;
-#X connect 102 0 134 0;
-#X connect 103 0 127 0;
-#X connect 104 0 124 0;
-#X connect 105 0 108 1;
-#X connect 107 0 81 0;
-#X connect 108 0 98 0;
-#X connect 109 0 61 0;
-#X connect 111 0 2 0;
-#X connect 111 1 3 0;
-#X connect 113 0 114 0;
-#X connect 114 0 111 1;
+#X connect 30 0 160 0;
+#X connect 31 0 99 0;
+#X connect 31 0 33 0;
+#X connect 31 0 162 0;
+#X connect 32 0 37 0;
+#X connect 32 0 37 1;
+#X connect 33 0 110 0;
+#X connect 34 0 41 0;
+#X connect 35 0 100 0;
+#X connect 37 0 36 0;
+#X connect 37 0 39 1;
+#X connect 39 0 140 0;
+#X connect 41 0 63 0;
+#X connect 42 0 45 0;
+#X connect 42 0 45 1;
+#X connect 43 0 111 0;
+#X connect 45 0 44 0;
+#X connect 45 0 47 1;
+#X connect 46 0 161 0;
+#X connect 47 0 148 0;
+#X connect 49 0 8 1;
+#X connect 50 0 9 1;
+#X connect 51 0 29 1;
+#X connect 53 0 24 0;
+#X connect 54 0 17 1;
+#X connect 55 0 5 0;
+#X connect 57 0 27 1;
+#X connect 57 0 27 0;
+#X connect 59 0 47 0;
+#X connect 62 0 10 0;
+#X connect 64 0 35 1;
+#X connect 65 0 96 1;
+#X connect 66 0 96 0;
+#X connect 69 0 112 0;
+#X connect 70 0 104 0;
+#X connect 71 0 74 0;
+#X connect 72 0 71 0;
+#X connect 73 0 72 0;
+#X connect 75 0 73 0;
+#X connect 76 0 71 0;
+#X connect 78 0 79 0;
+#X connect 78 0 96 2;
+#X connect 80 0 81 0;
+#X connect 81 0 118 0;
+#X connect 82 0 163 0;
+#X connect 83 0 94 0;
+#X connect 84 0 97 0;
+#X connect 87 0 107 0;
+#X connect 88 0 89 0;
+#X connect 88 0 97 2;
+#X connect 90 0 91 0;
+#X connect 91 0 119 0;
+#X connect 92 0 164 0;
+#X connect 93 0 113 0;
+#X connect 94 0 97 1;
+#X connect 96 0 70 0;
+#X connect 97 0 87 0;
+#X connect 98 0 52 0;
+#X connect 100 0 2 0;
+#X connect 100 1 3 0;
+#X connect 102 0 103 0;
+#X connect 103 0 100 1;
+#X connect 104 0 67 0;
+#X connect 104 1 68 0;
+#X connect 105 0 106 0;
+#X connect 106 0 104 1;
+#X connect 107 0 85 0;
+#X connect 107 1 86 0;
+#X connect 108 0 109 0;
+#X connect 109 0 107 1;
+#X connect 110 0 32 0;
+#X connect 111 0 42 0;
+#X connect 112 0 70 1;
+#X connect 113 0 87 1;
+#X connect 114 0 88 0;
 #X connect 115 0 78 0;
-#X connect 115 1 79 0;
-#X connect 116 0 117 0;
-#X connect 117 0 115 1;
-#X connect 118 0 96 0;
-#X connect 118 1 97 0;
-#X connect 119 0 120 0;
-#X connect 120 0 118 1;
-#X connect 121 0 36 0;
-#X connect 122 0 51 0;
-#X connect 123 0 81 1;
-#X connect 124 0 98 1;
-#X connect 125 0 99 0;
-#X connect 126 0 89 0;
-#X connect 127 0 130 0;
-#X connect 128 0 129 0;
-#X connect 129 0 126 0;
-#X connect 130 0 125 0;
-#X connect 131 0 37 0;
-#X connect 133 0 89 0;
-#X connect 134 0 99 0;
-#X connect 135 0 10 0;
-#X connect 136 0 69 0;
+#X connect 116 0 115 0;
+#X connect 117 0 114 0;
+#X connect 118 0 78 0;
+#X connect 119 0 88 0;
+#X connect 120 0 10 0;
+#X connect 123 0 124 0;
+#X connect 124 0 125 0;
+#X connect 125 0 128 0;
+#X connect 126 0 125 1;
+#X connect 127 0 123 0;
+#X connect 128 0 121 0;
+#X connect 128 1 122 0;
+#X connect 129 0 130 0;
+#X connect 130 0 128 1;
+#X connect 135 0 141 0;
+#X connect 135 0 143 0;
+#X connect 135 0 144 0;
+#X connect 136 0 139 0;
+#X connect 136 0 139 1;
+#X connect 137 0 142 0;
+#X connect 139 0 138 0;
+#X connect 139 0 140 1;
+#X connect 140 0 34 0;
+#X connect 142 0 136 0;
+#X connect 143 0 137 0;
+#X connect 147 0 43 0;
+#X connect 148 0 46 0;
+#X connect 149 0 152 0;
+#X connect 149 0 152 1;
+#X connect 150 0 153 0;
+#X connect 152 0 151 0;
+#X connect 152 0 148 1;
+#X connect 153 0 149 0;
+#X connect 154 0 150 0;
+#X connect 157 0 158 0;
+#X connect 157 0 158 1;
+#X connect 158 0 159 0;
+#X connect 159 0 160 1;
+#X connect 160 0 39 0;
+#X connect 160 0 58 0;
+#X connect 161 0 60 0;
+#X connect 162 0 101 0;
+#X connect 163 0 116 0;
+#X connect 164 0 117 0;
diff -r 4c0bb6e55866 -r eb08e5c84f21 June/prop_D1.pd
--- a/June/prop_D1.pd	Fri Jun 19 11:21:10 2015 +0100
+++ b/June/prop_D1.pd	Fri Jun 19 17:47:54 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 366 23 1105 841 10;
+#N canvas 136 56 1105 841 10;
 #X obj 377 -124 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 440 -124 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X text 437 -215 Gain;
@@ -245,9 +245,6 @@
 #X floatatom -6 154 8 0 0 0 - - -;
 #X obj 49 153 s sweepAngle;
 #X text -8 103 Sweep Angle;
-#X obj 300 79 r sweepAngle;
-#X obj 213 35 r bladeLen;
-#X obj 256 58 r armLength;
 #X obj 200 288 s firstSpeed;
 #X obj 295 287 s deltaSpeed;
 #X floatatom 156 130 8 0 0 0 - - -;
@@ -285,14 +282,12 @@
 #X obj 42 241 s hiltThick;
 #X floatatom -12 310 8 0 0 0 - - -;
 #X obj 46 309 s tipThick;
-#X text -13 194 Hilt Thickness;
 #X text -12 264 Tip Thickness;
 #X obj 205 -81 r hiltThick;
 #X obj 274 -59 r tipThick;
 #X obj 204 -190 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
 -1;
 #X obj 204 -137 s GO;
-#X obj 699 -99 tenSource;
 #X obj -9 356 hsl 100 20 100 1 1 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 5900 1;
 #X obj -12 424 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
@@ -301,10 +296,6 @@
 #X text -13 334 Distance to Observer;
 #X floatatom -15 452 8 0 0 0 - - -;
 #X text -15 406 Angle to Observer;
-#X obj 750 -121 r distance;
-#X obj 724 -147 r angle;
-#X obj 699 -197 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
 #X obj 204 -236 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
 0 1;
 #X obj 204 -217 metro 200;
@@ -322,81 +313,18 @@
 #X obj -63 259 r setUp;
 #X obj -64 335 r setUp;
 #X obj -66 402 r setUp;
-#X obj 699 -225 r setUp;
 #X obj 47 383 s obsDistance;
-#X obj 44 453 s obsAngle;
-#N canvas 425 384 490 446 circumferCalc 0;
-#X obj 266 13 inlet;
-#X floatatom 200 168 5 0 0 0 - - -;
-#X obj 80 13 inlet;
-#X obj 170 13 inlet;
-#X obj 82 142 +;
-#X obj 151 168 / 360;
-#X floatatom 29 164 5 0 0 0 - - -;
-#X obj 82 167 * 3.14159;
-#X obj 82 215 *;
-#X floatatom 22 239 8 0 0 0 - - -;
-#X obj 82 191 * 2;
-#X obj 80 36 s \$0_bladeLen;
-#X obj 170 36 s \$0_armLength;
-#X obj 266 36 s \$0_sweepAngle;
-#X obj 82 95 r \$0_bladeLen;
-#X obj 97 119 r \$0_armLength;
-#X obj 151 144 r \$0_sweepAngle;
-#X floatatom 411 184 5 0 0 0 - - -;
-#X obj 362 184 / 360;
-#X floatatom 305 160 5 0 0 0 - - -;
-#X obj 293 183 * 3.14159;
-#X obj 293 231 *;
-#X floatatom 237 259 8 0 0 0 - - -;
-#X obj 293 207 * 2;
-#X obj 293 135 r \$0_armLength;
-#X obj 362 160 r \$0_sweepAngle;
-#X obj 293 259 s \$0_minCirc;
-#X obj 97 396 r \$0_minCirc;
-#X obj 97 418 outlet;
-#X obj 97 275 r \$0_minCirc;
-#X floatatom 23 335 8 0 0 0 - - -;
-#X obj 82 301 -;
-#X obj 82 337 /;
-#X obj 112 313 r NoOfSources;
-#X floatatom 20 366 8 0 0 0 - - -;
-#X obj 82 363 s \$0_deltaCirc;
-#X obj 186 396 r \$0_deltaCirc;
-#X obj 186 418 outlet;
-#X obj 95 242 s maxCirc;
-#X connect 0 0 13 0;
-#X connect 2 0 11 0;
-#X connect 3 0 12 0;
-#X connect 4 0 6 0;
-#X connect 4 0 7 0;
-#X connect 5 0 8 1;
-#X connect 7 0 10 0;
-#X connect 8 0 9 0;
-#X connect 8 0 31 0;
-#X connect 8 0 38 0;
-#X connect 10 0 8 0;
-#X connect 14 0 4 0;
-#X connect 15 0 4 1;
-#X connect 16 0 5 0;
-#X connect 16 0 1 0;
-#X connect 18 0 21 1;
-#X connect 20 0 23 0;
-#X connect 21 0 22 0;
-#X connect 21 0 26 0;
-#X connect 23 0 21 0;
-#X connect 24 0 20 0;
-#X connect 24 0 19 0;
-#X connect 25 0 18 0;
-#X connect 25 0 17 0;
-#X connect 27 0 28 0;
-#X connect 29 0 31 1;
-#X connect 31 0 30 0;
-#X connect 31 0 32 0;
-#X connect 32 0 34 0;
-#X connect 32 0 35 0;
-#X connect 33 0 32 1;
-#X connect 36 0 37 0;
+#X obj 40 451 s obsAngle;
+#N canvas 447 270 208 198 circumferCalc 1;
+#X obj 84 45 inlet;
+#X obj 84 69 * 3.14159;
+#X floatatom 26 120 8 0 0 0 - - -;
+#X obj 84 93 * 2;
+#X obj 84 118 outlet;
+#X connect 0 0 1 0;
+#X connect 1 0 3 0;
+#X connect 3 0 2 0;
+#X connect 3 0 4 0;
 #X restore 213 103 pd circumferCalc;
 #X obj 213 129 s circumMin;
 #X obj 306 128 s deltaCircum;
@@ -522,79 +450,126 @@
 #X connect 56 0 31 1;
 #X restore 263 -108 pd angleCalc;
 #X obj 379 -196 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 1090 1;
-#X obj 882 -113 r distance;
-#X obj 856 -139 r angle;
-#X obj 831 -189 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 831 -217 r setUp;
-#X obj 744 35 r distance;
-#X obj 718 9 r angle;
-#X obj 693 -41 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 693 -69 r setUp;
-#X msg 699 -164 10;
-#X msg 831 -156 9;
-#X msg 693 -8 8;
-#X obj 877 39 r distance;
-#X obj 851 13 r angle;
-#X obj 826 -37 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 826 -65 r setUp;
-#X msg 826 -3 7;
-#X obj 744 190 r distance;
-#X obj 718 164 r angle;
-#X obj 693 114 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 693 86 r setUp;
-#X msg 693 147 6;
-#X obj 831 -91 tenSource;
-#X obj 693 57 tenSource;
-#X obj 826 61 tenSource;
-#X obj 693 212 tenSource;
-#X obj 697 373 tenSource;
-#X obj 748 351 r distance;
-#X obj 722 325 r angle;
-#X obj 697 275 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 697 247 r setUp;
-#X obj 880 359 r distance;
-#X obj 854 333 r angle;
-#X obj 829 283 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 829 255 r setUp;
-#X obj 742 507 r distance;
-#X obj 716 481 r angle;
-#X obj 691 431 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 691 403 r setUp;
-#X obj 883 203 r distance;
-#X obj 857 177 r angle;
-#X obj 832 127 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 832 99 r setUp;
-#X obj 829 381 tenSource;
-#X obj 691 529 tenSource;
-#X obj 832 225 tenSource;
-#X msg 832 160 5;
-#X msg 697 308 4;
-#X msg 829 316 3;
-#X msg 691 464 2;
-#X obj 875 511 r distance;
-#X obj 849 485 r angle;
-#X obj 824 435 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 824 407 r setUp;
-#X obj 824 533 tenSource;
-#X msg 824 469 1;
+-1 -1 690 1;
+#X obj 652 -128 freqCalcWoo;
+#X obj 652 -179 r \$0_thisGroup;
+#X obj 778 -101 *;
+#X obj 793 -126 r deltaThick;
+#X obj 778 -190 r \$0_thisGroup;
+#X obj 778 -147 +;
+#X obj 763 -215 r hiltThick;
+#X obj 763 -76 -;
+#X floatatom 774 -50 8 0 0 0 - - -;
+#X obj 793 -169 r \$0_s0;
+#X obj 715 -151 r \$0_s0;
+#N canvas 1051 49 396 632 obsPosition 0;
+#X obj -49 337 r obsDistance;
+#X obj 113 149 r obsAngle;
+#X obj -44 29 inlet;
+#X obj 188 108 r bladeLen;
+#X obj 203 214 r armLength;
+#X obj -44 52 s \$0_sourceNo;
+#X obj 202 129 r NoOfSources;
+#X obj 188 239 +;
+#X obj 188 149 /;
+#X obj 188 193 *;
+#X obj 203 170 r \$0_sourceNo;
+#X floatatom 61 53 5 0 0 0 - - -;
+#X obj 98 204 / 360;
+#X obj 98 226 * 6.28319;
+#X floatatom 40 277 8 0 0 0 - - -;
+#X obj 98 277 *;
+#X floatatom 41 339 8 0 0 0 - - -;
+#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj 98 127 r currentAngle;
+#X floatatom 55 147 5 0 0 0 - - -;
+#X floatatom 20 397 8 0 0 0 - - -;
+#X obj 98 339 t f b;
+#X obj 98 172 +;
+#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 0 1;
+#X floatatom 124 63 5 0 0 0 - - -;
+#X obj 83 370 +;
+#X obj 98 251 cos;
+#X obj 98 314 * -1;
+#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom -23 203 5 0 0 0 - - -;
+#X obj 83 412 outlet;
+#X floatatom 54 205 5 0 0 0 - - -;
+#X obj 146 205 outlet;
+#X connect 0 0 25 0;
+#X connect 1 0 22 1;
+#X connect 2 0 5 0;
+#X connect 2 0 11 0;
+#X connect 3 0 8 0;
+#X connect 4 0 7 1;
+#X connect 6 0 8 1;
+#X connect 7 0 15 1;
+#X connect 8 0 9 0;
+#X connect 9 0 7 0;
+#X connect 10 0 9 1;
+#X connect 12 0 13 0;
+#X connect 13 0 26 0;
+#X connect 15 0 27 0;
+#X connect 18 0 19 0;
+#X connect 18 0 22 0;
+#X connect 19 0 28 0;
+#X connect 21 0 25 1;
+#X connect 21 1 25 0;
+#X connect 22 0 12 0;
+#X connect 22 0 31 0;
+#X connect 22 0 32 0;
+#X connect 23 0 24 0;
+#X connect 25 0 17 0;
+#X connect 25 0 20 0;
+#X connect 25 0 30 0;
+#X connect 26 0 14 0;
+#X connect 26 0 15 0;
+#X connect 27 0 21 0;
+#X connect 27 0 16 0;
+#X connect 28 0 29 0;
+#X connect 28 0 22 0;
+#X restore 677 -43 pd obsPosition;
+#X obj 525 417 freq3DChord;
+#X obj 690 274 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 7400 1;
+#X obj 693 335 hsl 100 20 100 1 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 3400 1;
+#X obj 694 393 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 4800 1;
+#X text 699 245 Azimuth Angle;
+#X text 776 371 Elevation Angle;
+#X text 756 311 Distance;
+#X floatatom 712 427 5 0 0 0 - - -;
+#X floatatom 701 369 5 0 0 0 - - -;
+#X floatatom 715 307 5 0 0 0 - - -;
+#X text -13 194 Start Thickness;
+#X obj 525 345 freqCalc3dCh;
+#X obj 544 176 hsl 100 20 0.5 10 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2300 1;
+#X floatatom 504 202 5 0 0 0 - - -;
+#X obj 694 198 hsl 100 20 0.001 0.1 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 1500 1;
+#X floatatom 723 223 5 0 0 0 - - -;
+#X text 553 154 Blade Radius;
+#X text 697 176 Chord Thickness;
+#X obj 693 133 hsl 100 20 0 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 200 1;
+#X floatatom 723 158 5 0 0 0 - - -;
+#X text 697 111 Chord Pitch;
+#X text 538 -238 Vertical propellor;
+#X obj 213 35 r bladeRadius;
+#X obj 541 202 s bladeRadius;
 #X connect 3 0 5 0;
 #X connect 4 0 0 0;
 #X connect 4 1 1 0;
-#X connect 5 0 94 0;
+#X connect 5 0 85 0;
 #X connect 7 0 8 0;
-#X connect 7 0 44 0;
+#X connect 7 0 41 0;
 #X connect 7 1 9 0;
-#X connect 7 1 45 0;
+#X connect 7 1 42 0;
 #X connect 10 0 27 1;
 #X connect 11 0 29 1;
 #X connect 12 0 28 1;
@@ -616,87 +591,54 @@
 #X connect 29 0 30 0;
 #X connect 37 0 38 0;
 #X connect 37 0 39 0;
-#X connect 41 0 90 2;
-#X connect 42 0 90 0;
-#X connect 43 0 90 1;
-#X connect 48 0 49 0;
+#X connect 45 0 46 0;
+#X connect 45 0 47 0;
 #X connect 48 0 50 0;
-#X connect 51 0 53 0;
-#X connect 51 0 54 0;
-#X connect 52 0 55 0;
-#X connect 52 0 56 0;
-#X connect 59 0 48 0;
-#X connect 60 0 48 1;
-#X connect 61 0 62 0;
-#X connect 64 0 66 0;
-#X connect 64 0 88 0;
-#X connect 65 0 68 0;
-#X connect 65 0 89 0;
-#X connect 70 0 63 2;
-#X connect 71 0 63 1;
-#X connect 72 0 103 0;
-#X connect 73 0 74 0;
-#X connect 74 0 61 0;
-#X connect 75 0 74 1;
-#X connect 76 0 77 0;
-#X connect 78 0 27 0;
-#X connect 79 0 28 0;
-#X connect 80 0 29 0;
-#X connect 81 0 25 0;
-#X connect 82 0 37 0;
-#X connect 83 0 51 0;
-#X connect 84 0 52 0;
-#X connect 85 0 64 0;
-#X connect 86 0 65 0;
-#X connect 87 0 72 0;
-#X connect 90 0 46 0;
+#X connect 48 0 51 0;
+#X connect 49 0 52 0;
+#X connect 49 0 53 0;
+#X connect 55 0 45 0;
+#X connect 56 0 45 1;
+#X connect 57 0 58 0;
+#X connect 59 0 61 0;
+#X connect 59 0 79 0;
+#X connect 60 0 63 0;
+#X connect 60 0 80 0;
+#X connect 65 0 66 0;
+#X connect 66 0 57 0;
+#X connect 67 0 66 1;
+#X connect 68 0 69 0;
+#X connect 70 0 27 0;
+#X connect 71 0 28 0;
+#X connect 72 0 29 0;
+#X connect 73 0 25 0;
+#X connect 74 0 37 0;
+#X connect 75 0 48 0;
+#X connect 76 0 49 0;
+#X connect 77 0 59 0;
+#X connect 78 0 60 0;
+#X connect 81 0 43 0;
+#X connect 81 0 82 0;
+#X connect 85 0 4 0;
+#X connect 87 0 86 0;
+#X connect 88 0 93 1;
+#X connect 89 0 88 1;
 #X connect 90 0 91 0;
-#X connect 90 1 47 0;
-#X connect 90 1 92 0;
-#X connect 94 0 4 0;
-#X connect 95 0 116 2;
-#X connect 96 0 116 1;
-#X connect 97 0 104 0;
-#X connect 98 0 97 0;
-#X connect 99 0 117 2;
-#X connect 100 0 117 1;
+#X connect 91 0 88 0;
+#X connect 91 0 97 0;
+#X connect 92 0 93 0;
+#X connect 93 0 94 0;
+#X connect 95 0 91 1;
+#X connect 96 0 86 1;
+#X connect 99 0 98 2;
+#X connect 99 0 107 0;
+#X connect 100 0 98 3;
+#X connect 100 0 106 0;
+#X connect 101 0 98 4;
 #X connect 101 0 105 0;
-#X connect 102 0 101 0;
-#X connect 103 0 63 0;
-#X connect 104 0 116 0;
-#X connect 105 0 117 0;
-#X connect 106 0 118 2;
-#X connect 107 0 118 1;
-#X connect 108 0 110 0;
-#X connect 109 0 108 0;
-#X connect 110 0 118 0;
-#X connect 111 0 119 2;
-#X connect 112 0 119 1;
-#X connect 113 0 115 0;
-#X connect 114 0 113 0;
-#X connect 115 0 119 0;
-#X connect 121 0 120 2;
-#X connect 122 0 120 1;
-#X connect 123 0 141 0;
-#X connect 124 0 123 0;
-#X connect 125 0 137 2;
-#X connect 126 0 137 1;
-#X connect 127 0 142 0;
-#X connect 128 0 127 0;
-#X connect 129 0 138 2;
-#X connect 130 0 138 1;
-#X connect 131 0 143 0;
-#X connect 132 0 131 0;
-#X connect 133 0 139 2;
-#X connect 134 0 139 1;
-#X connect 135 0 140 0;
-#X connect 136 0 135 0;
-#X connect 140 0 139 0;
-#X connect 141 0 120 0;
-#X connect 142 0 137 0;
-#X connect 143 0 138 0;
-#X connect 144 0 148 2;
-#X connect 145 0 148 1;
-#X connect 146 0 149 0;
-#X connect 147 0 146 0;
-#X connect 149 0 148 0;
+#X connect 109 0 98 0;
+#X connect 110 0 111 0;
+#X connect 110 0 121 0;
+#X connect 112 0 113 0;
+#X connect 116 0 117 0;
+#X connect 120 0 81 0;