Mercurial > hg > weather-synthesis-prototyping

changeset 160:cd1f59cfc390

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Development of sword model
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Wed, 27 Jan 2016 13:53:07 +0000
parents 807981af6f93
children 27ae51f25ff3
files newSword/arccos.pd newSword/arccos~.pd newSword/arcsin~.pd newSword/centreAngles.pd newSword/freqCalcCyl3No_D2Mach.pd newSword/newSword.pd newSword/sourceSpeed.pd newSword/sweepTime.pd newSword/thisAngle.pd newSword/thisPosition.pd scene demo/freqCalcCyl3No_D2Mach.pd scene demo/testBedD2.pd
diffstat 12 files changed, 1372 insertions(+), 224 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/newSword/arccos.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -0,0 +1,30 @@
+#N canvas 88 45 313 368 10;
+#X obj 112 255 * 360;
+#X floatatom 159 306 5 0 0 0 - - -;
+#X obj 112 279 / 6.28319;
+#X obj 70 47 *;
+#X obj 70 79 swap 1;
+#X obj 70 112 -;
+#X obj 70 141 sqrt;
+#X obj 112 172 /;
+#X obj 112 200 atan;
+#X obj 112 226 * 2;
+#X text 152 108 Arccos of angle;
+#X obj 127 48 + 1;
+#X obj 112 306 outlet;
+#X obj 70 20 inlet;
+#X connect 0 0 2 0;
+#X connect 2 0 1 0;
+#X connect 2 0 12 0;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 4 1 5 1;
+#X connect 5 0 6 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 9 0 0 0;
+#X connect 11 0 7 1;
+#X connect 13 0 3 1;
+#X connect 13 0 3 0;
+#X connect 13 0 11 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/newSword/arccos~.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -0,0 +1,39 @@
+#N canvas 177 186 443 430 10;
+#X obj 162 73 inlet~;
+#X obj 162 108 *~;
+#X obj 197 107 +~ 1;
+#X obj 147 136 -~;
+#X obj 113 109 sig~ 1;
+#X obj 147 163 sqrt~;
+#X obj 182 193 /~;
+#X obj 182 221 atan~;
+#X obj 182 248 *~ 2;
+#X obj 69 236 loadbang;
+#X obj 69 259 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 69 280 metro 10;
+#X obj 69 303 snapshot~;
+#X floatatom 69 327 5 0 0 0 - - -;
+#X obj 182 339 outlet~;
+#X obj 182 272 *~ 360;
+#X obj 182 294 /~ 3.14159;
+#X obj 182 315 /~ 2;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 2 0;
+#X connect 1 0 3 1;
+#X connect 2 0 6 1;
+#X connect 3 0 5 0;
+#X connect 4 0 3 0;
+#X connect 5 0 6 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 15 0;
+#X connect 9 0 10 0;
+#X connect 10 0 11 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 14 0;
+#X connect 17 0 12 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/newSword/arcsin~.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -0,0 +1,40 @@
+#N canvas 549 79 369 390 10;
+#X obj 178 28 inlet~;
+#X obj 163 67 *~;
+#X obj 116 67 sig~ 1;
+#X obj 148 95 -~;
+#X obj 220 307 outlet~;
+#X obj 148 119 sqrt~;
+#X obj 133 144 -~;
+#X obj 220 168 /~;
+#X obj 220 193 atan~;
+#X obj 220 218 *~ 2;
+#X obj 220 241 *~ 360;
+#X obj 145 242 loadbang;
+#X obj 145 263 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 145 281 metro 10;
+#X obj 145 303 snapshot~;
+#X floatatom 145 323 8 0 0 0 - - -;
+#X obj 220 262 /~ 3.14159;
+#X obj 220 283 /~ 2;
+#X connect 0 0 1 1;
+#X connect 0 0 1 0;
+#X connect 0 0 7 1;
+#X connect 1 0 3 1;
+#X connect 2 0 3 0;
+#X connect 2 0 6 0;
+#X connect 3 0 5 0;
+#X connect 5 0 6 1;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 9 0 10 0;
+#X connect 10 0 16 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 16 0 17 0;
+#X connect 17 0 14 0;
+#X connect 17 0 4 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/newSword/centreAngles.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -0,0 +1,159 @@
+#N canvas 0 22 1376 625 10;
+#X obj 69 140 f;
+#X obj 69 97 r GO;
+#X obj 84 118 r preswingTime;
+#X obj 231 198 line~;
+#X obj 96 262 loadbang;
+#X obj 96 283 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 96 301 metro 10;
+#X obj 96 323 snapshot~;
+#X floatatom 96 343 5 0 0 0 - - -;
+#X obj 177 359 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 9172 1;
+#X obj 231 97 r setUp;
+#X text 214 78 Start at 0 speed;
+#X obj 246 118 r presweepAzim;
+#X obj 231 141 f;
+#X msg 231 164 \$1;
+#X msg 69 163 0 \$1;
+#X obj 355 42 t f b;
+#X obj 356 70 delay;
+#X obj 370 -3 r preswingTime;
+#X obj 377 119 r postswingTime;
+#X obj 355 -23 r GO;
+#X obj 355 19 f;
+#X obj 356 97 f;
+#X obj 356 142 pack;
+#X obj 398 71 r postsweepAzim;
+#X msg 356 168 \$1 \$2;
+#X obj 179 97 r myEnd;
+#X text 294 217 Current source Azimuth angle;
+#X obj 858 109 f;
+#X obj 858 66 r GO;
+#X obj 879 132 r preswingTime;
+#X obj 1029 232 line~;
+#X obj 882 295 loadbang;
+#X obj 882 316 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 882 334 metro 10;
+#X obj 882 356 snapshot~;
+#X floatatom 882 376 5 0 0 0 - - -;
+#X obj 963 392 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 9878 1;
+#X obj 1029 131 r setUp;
+#X text 1012 112 Start at 0 speed;
+#X obj 1029 175 f;
+#X msg 1029 198 \$1;
+#X obj 1141 75 t f b;
+#X obj 1142 103 delay;
+#X obj 1156 30 r preswingTime;
+#X obj 1163 152 r postswingTime;
+#X obj 1141 10 r GO;
+#X obj 1141 52 f;
+#X obj 1142 130 f;
+#X obj 1142 175 pack;
+#X msg 1142 201 \$1 \$2;
+#X obj 1044 152 r presweepElev;
+#X obj 1184 78 r postsweepElev;
+#X obj 858 156 pack;
+#X obj 873 88 r midElev;
+#X msg 858 190 \$1 \$2;
+#X obj 658 74 +;
+#X obj 643 101 /;
+#X obj 616 53 t f f;
+#X floatatom 589 132 5 0 0 0 - - -;
+#X obj 658 124 r presweepElev;
+#X obj 673 146 r postsweepElev;
+#X obj 658 30 r postswingTime;
+#X obj 673 52 r preswingTime;
+#X obj 643 199 *;
+#X floatatom 606 267 5 0 0 0 - - -;
+#X obj 643 267 s midElev;
+#X text 536 -100 Calculate the angles with respect to the centre of
+the swing circle;
+#X text 1092 251 Current source Elevation angle;
+#X obj 1085 304 s~ currentElev;
+#X obj 248 265 s~ currentAzim;
+#X obj 951 -54 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 951 -1 s GO;
+#X obj 891 -54 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj 891 -1 s setUp;
+#X obj 980 130 r myEnd;
+#X obj 658 175 -;
+#X obj 643 242 +;
+#X obj 658 219 r postsweepElev;
+#X connect 0 0 15 0;
+#X connect 1 0 0 0;
+#X connect 2 0 0 1;
+#X connect 3 0 7 0;
+#X connect 3 0 70 0;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 7 0 9 0;
+#X connect 10 0 13 0;
+#X connect 12 0 13 1;
+#X connect 13 0 14 0;
+#X connect 14 0 3 0;
+#X connect 15 0 3 0;
+#X connect 16 0 17 1;
+#X connect 16 1 17 0;
+#X connect 17 0 22 0;
+#X connect 18 0 21 1;
+#X connect 19 0 23 1;
+#X connect 20 0 21 0;
+#X connect 21 0 16 0;
+#X connect 22 0 23 0;
+#X connect 23 0 25 0;
+#X connect 24 0 22 1;
+#X connect 25 0 3 0;
+#X connect 26 0 13 0;
+#X connect 28 0 53 0;
+#X connect 29 0 28 0;
+#X connect 30 0 53 1;
+#X connect 31 0 35 0;
+#X connect 31 0 69 0;
+#X connect 32 0 33 0;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 35 0 36 0;
+#X connect 35 0 37 0;
+#X connect 38 0 40 0;
+#X connect 40 0 41 0;
+#X connect 41 0 31 0;
+#X connect 42 0 43 1;
+#X connect 42 1 43 0;
+#X connect 43 0 48 0;
+#X connect 44 0 47 1;
+#X connect 45 0 49 1;
+#X connect 46 0 47 0;
+#X connect 47 0 42 0;
+#X connect 48 0 49 0;
+#X connect 49 0 50 0;
+#X connect 50 0 31 0;
+#X connect 51 0 40 1;
+#X connect 52 0 48 1;
+#X connect 53 0 55 0;
+#X connect 54 0 28 1;
+#X connect 55 0 31 0;
+#X connect 56 0 57 1;
+#X connect 57 0 59 0;
+#X connect 57 0 64 0;
+#X connect 58 0 56 0;
+#X connect 58 1 57 0;
+#X connect 60 0 76 0;
+#X connect 61 0 76 1;
+#X connect 62 0 58 0;
+#X connect 63 0 56 1;
+#X connect 64 0 77 0;
+#X connect 71 0 72 0;
+#X connect 73 0 74 0;
+#X connect 75 0 40 0;
+#X connect 76 0 64 1;
+#X connect 77 0 66 0;
+#X connect 77 0 65 0;
+#X connect 78 0 77 1;
--- a/newSword/freqCalcCyl3No_D2Mach.pd	Tue Jan 26 18:40:48 2016 +0000
+++ b/newSword/freqCalcCyl3No_D2Mach.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -1,4 +1,4 @@
-#N canvas 0 23 1374 822 10;
+#N canvas 125 221 1374 822 10;
 #X text 577 168 Mass Density of Air;
 #X obj 699 169 *~ 1.225;
 #X obj 699 244 /~ 1.81e-05;
@@ -14,14 +14,11 @@
 #X obj 220 76 s \$0-diameter;
 #X obj 760 168 r \$0-diameter;
 #X obj 767 343 r \$0-diameter;
-#X obj 130 115 s~ \$0-windSpeed;
+#X obj 110 77 s~ \$0-windSpeed;
 #X obj 766 320 r~ \$0-windSpeed;
 #X obj 699 141 r~ \$0-windSpeed;
 #X obj 699 386 s~ \$0-myFreq;
 #X obj 1113 484 r~ \$0-myFreq;
-#X obj 130 73 sig~;
-#X obj 130 95 vd~ varwind;
-#X obj 130 49 inlet;
 #X obj 1050 348 *~;
 #X obj 124 228 snapshot~;
 #X floatatom 124 254 0 0 0 0 - - -;
@@ -54,11 +51,10 @@
 #X text 523 31 Elevation;
 #X text 374 32 Distance;
 #X text 208 32 Diameter;
-#X text 123 31 Wind Speed;
+#X text 103 34 Wind Speed;
 #X obj 305 50 inlet;
 #X floatatom 305 94 5 0 0 0 - - -;
 #X text 301 31 Length;
-#X floatatom 73 89 5 0 0 0 - - -;
 #X floatatom 213 97 5 0 0 0 - - -;
 #X obj 1050 417 throw~ l;
 #X obj 1077 395 throw~ r;
@@ -102,7 +98,7 @@
 #X obj 303 132 r~ \$0-str;
 #X obj 321 173 r \$0-leng;
 #X obj 346 231 r \$0-dist;
-#N canvas 203 82 1238 721 GoldfreqGain 1;
+#N canvas 203 82 1238 721 GoldfreqGain 0;
 #N canvas 759 125 286 294 pow6 0;
 #X obj 47 67 *~;
 #X obj 76 67 *~;
@@ -1075,131 +1071,129 @@
 #X obj 1290 623 r myMet;
 #X floatatom 1292 679 0 0 0 0 - - -;
 #X obj 699 309 newStrou;
+#X obj 110 52 inlet~;
 #X connect 1 0 3 0;
-#X connect 2 0 27 0;
-#X connect 2 0 182 0;
+#X connect 2 0 24 0;
+#X connect 2 0 178 0;
 #X connect 3 0 2 0;
 #X connect 4 0 18 0;
 #X connect 6 0 4 0;
 #X connect 7 0 12 0;
-#X connect 7 0 60 0;
-#X connect 10 0 42 0;
-#X connect 10 0 65 0;
+#X connect 7 0 56 0;
+#X connect 10 0 39 0;
+#X connect 10 0 61 0;
 #X connect 13 0 3 1;
 #X connect 14 0 4 1;
 #X connect 16 0 6 1;
 #X connect 17 0 1 0;
-#X connect 19 0 118 1;
-#X connect 20 0 21 0;
-#X connect 21 0 15 0;
-#X connect 22 0 20 0;
-#X connect 22 0 59 0;
-#X connect 23 0 63 0;
-#X connect 24 0 25 0;
-#X connect 24 0 97 0;
-#X connect 26 0 24 0;
-#X connect 29 0 31 0;
-#X connect 31 0 32 0;
-#X connect 32 0 30 0;
-#X connect 32 0 74 0;
-#X connect 36 0 107 1;
-#X connect 37 0 38 0;
-#X connect 37 0 165 0;
-#X connect 39 0 107 4;
-#X connect 40 0 43 0;
-#X connect 40 0 152 0;
-#X connect 41 0 44 0;
-#X connect 41 0 153 0;
-#X connect 46 0 45 0;
-#X connect 46 0 5 0;
-#X connect 46 0 76 0;
-#X connect 47 0 46 0;
-#X connect 56 0 57 0;
-#X connect 56 0 64 0;
-#X connect 63 0 61 0;
-#X connect 63 1 62 0;
-#X connect 68 0 107 0;
-#X connect 69 0 107 3;
-#X connect 70 0 107 5;
-#X connect 72 0 118 0;
-#X connect 75 0 93 1;
-#X connect 77 0 37 0;
-#X connect 78 0 23 0;
-#X connect 79 0 63 1;
-#X connect 80 0 83 0;
-#X connect 80 0 86 0;
-#X connect 81 0 84 0;
-#X connect 81 0 87 0;
-#X connect 82 0 85 0;
-#X connect 82 0 88 0;
-#X connect 93 0 163 0;
-#X connect 94 0 118 2;
-#X connect 95 0 93 0;
-#X connect 96 0 95 0;
-#X connect 98 0 103 1;
-#X connect 99 0 103 3;
-#X connect 100 0 103 0;
-#X connect 101 0 103 2;
-#X connect 102 0 103 5;
+#X connect 19 0 114 1;
+#X connect 20 0 59 0;
+#X connect 21 0 22 0;
+#X connect 21 0 93 0;
+#X connect 23 0 21 0;
+#X connect 26 0 28 0;
+#X connect 28 0 29 0;
+#X connect 29 0 27 0;
+#X connect 29 0 70 0;
+#X connect 33 0 103 1;
+#X connect 34 0 35 0;
+#X connect 34 0 161 0;
+#X connect 36 0 103 4;
+#X connect 37 0 40 0;
+#X connect 37 0 148 0;
+#X connect 38 0 41 0;
+#X connect 38 0 149 0;
+#X connect 43 0 42 0;
+#X connect 43 0 5 0;
+#X connect 43 0 72 0;
+#X connect 44 0 43 0;
+#X connect 53 0 54 0;
+#X connect 53 0 60 0;
+#X connect 59 0 57 0;
+#X connect 59 1 58 0;
+#X connect 64 0 103 0;
+#X connect 65 0 103 3;
+#X connect 66 0 103 5;
+#X connect 68 0 114 0;
+#X connect 71 0 89 1;
+#X connect 73 0 34 0;
+#X connect 74 0 20 0;
+#X connect 75 0 59 1;
+#X connect 76 0 79 0;
+#X connect 76 0 82 0;
+#X connect 77 0 80 0;
+#X connect 77 0 83 0;
+#X connect 78 0 81 0;
+#X connect 78 0 84 0;
+#X connect 89 0 159 0;
+#X connect 90 0 114 2;
+#X connect 91 0 89 0;
+#X connect 92 0 91 0;
+#X connect 94 0 99 1;
+#X connect 95 0 99 3;
+#X connect 96 0 99 0;
+#X connect 97 0 99 2;
+#X connect 98 0 99 5;
+#X connect 99 0 63 0;
+#X connect 99 1 62 0;
+#X connect 100 0 115 2;
+#X connect 101 0 115 0;
+#X connect 102 0 115 1;
 #X connect 103 0 67 0;
-#X connect 103 1 66 0;
-#X connect 104 0 119 2;
-#X connect 105 0 119 0;
-#X connect 106 0 119 1;
-#X connect 107 0 71 0;
-#X connect 109 0 110 0;
-#X connect 109 0 111 0;
-#X connect 112 0 114 0;
-#X connect 112 0 116 0;
-#X connect 113 0 112 0;
-#X connect 115 0 119 3;
-#X connect 117 0 118 3;
-#X connect 120 0 124 1;
+#X connect 105 0 106 0;
+#X connect 105 0 107 0;
+#X connect 108 0 110 0;
+#X connect 108 0 112 0;
+#X connect 109 0 108 0;
+#X connect 111 0 115 3;
+#X connect 113 0 114 3;
+#X connect 116 0 120 1;
+#X connect 117 0 120 2;
+#X connect 118 0 120 3;
+#X connect 119 0 120 0;
 #X connect 121 0 124 2;
-#X connect 122 0 124 3;
-#X connect 123 0 124 0;
-#X connect 125 0 128 2;
-#X connect 126 0 128 0;
-#X connect 127 0 128 3;
-#X connect 129 0 128 1;
-#X connect 130 0 134 2;
-#X connect 131 0 134 0;
-#X connect 132 0 134 3;
-#X connect 133 0 134 1;
-#X connect 135 0 139 1;
-#X connect 136 0 139 2;
-#X connect 137 0 139 3;
-#X connect 138 0 139 0;
-#X connect 140 0 144 2;
-#X connect 141 0 144 0;
-#X connect 142 0 144 3;
-#X connect 143 0 144 1;
-#X connect 145 0 149 1;
-#X connect 146 0 149 2;
-#X connect 147 0 149 3;
-#X connect 148 0 149 0;
-#X connect 154 0 103 6;
-#X connect 155 0 103 7;
-#X connect 156 0 107 6;
-#X connect 157 0 107 7;
-#X connect 158 0 160 0;
-#X connect 159 0 158 0;
-#X connect 161 0 103 4;
-#X connect 162 0 163 1;
-#X connect 163 0 23 1;
-#X connect 164 0 107 2;
-#X connect 166 0 24 0;
-#X connect 167 0 46 0;
-#X connect 168 0 37 0;
-#X connect 169 0 178 1;
-#X connect 170 0 178 0;
-#X connect 171 0 178 2;
-#X connect 172 0 177 2;
-#X connect 173 0 177 0;
-#X connect 174 0 177 1;
-#X connect 175 0 177 3;
-#X connect 176 0 178 3;
-#X connect 179 0 181 0;
-#X connect 180 0 179 0;
-#X connect 182 0 73 0;
-#X connect 182 0 6 0;
+#X connect 122 0 124 0;
+#X connect 123 0 124 3;
+#X connect 125 0 124 1;
+#X connect 126 0 130 2;
+#X connect 127 0 130 0;
+#X connect 128 0 130 3;
+#X connect 129 0 130 1;
+#X connect 131 0 135 1;
+#X connect 132 0 135 2;
+#X connect 133 0 135 3;
+#X connect 134 0 135 0;
+#X connect 136 0 140 2;
+#X connect 137 0 140 0;
+#X connect 138 0 140 3;
+#X connect 139 0 140 1;
+#X connect 141 0 145 1;
+#X connect 142 0 145 2;
+#X connect 143 0 145 3;
+#X connect 144 0 145 0;
+#X connect 150 0 99 6;
+#X connect 151 0 99 7;
+#X connect 152 0 103 6;
+#X connect 153 0 103 7;
+#X connect 154 0 156 0;
+#X connect 155 0 154 0;
+#X connect 157 0 99 4;
+#X connect 158 0 159 1;
+#X connect 159 0 20 1;
+#X connect 160 0 103 2;
+#X connect 162 0 21 0;
+#X connect 163 0 43 0;
+#X connect 164 0 34 0;
+#X connect 165 0 174 1;
+#X connect 166 0 174 0;
+#X connect 167 0 174 2;
+#X connect 168 0 173 2;
+#X connect 169 0 173 0;
+#X connect 170 0 173 1;
+#X connect 171 0 173 3;
+#X connect 172 0 174 3;
+#X connect 175 0 177 0;
+#X connect 176 0 175 0;
+#X connect 178 0 69 0;
+#X connect 178 0 6 0;
+#X connect 179 0 15 0;
--- a/newSword/newSword.pd	Tue Jan 26 18:40:48 2016 +0000
+++ b/newSword/newSword.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -1,4 +1,4 @@
-#N canvas 57 68 1302 759 10;
+#N canvas 71 23 1283 702 10;
 #X obj 586 149 freqCalcCyl3No_D2Mach;
 #X obj 315 22 loadbang;
 #X obj 315 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
@@ -10,19 +10,19 @@
 #X obj -259 60 s NoOfSources;
 #X obj -221 455 s topSpeed;
 #X obj -273 429 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3465 1;
+-1 -1 0 1;
 #X floatatom -276 455 8 0 0 0 - - -;
 #X text -24 27 Blade Length;
 #X text -25 93 Arm Length;
 #X text -231 37 Number of Sources;
 #X text -165 433 Top Speed;
 #X obj 21 248 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 7150 1;
+-262144 -1 -1 0 1;
 #X floatatom 18 280 8 0 0 0 - - -;
 #X obj -279 516 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 6600 1;
+-262144 -1 -1 0 1;
 #X obj -280 601 hsl 100 20 0.0001 0.01 0 0 empty empty empty -2 -8
-0 10 -262144 -1 -1 7900 1;
+0 10 -262144 -1 -1 0 1;
 #X floatatom -282 546 8 0 0 0 - - -;
 #X obj -228 545 s hiltThick;
 #X floatatom -283 629 8 0 0 0 - - -;
@@ -60,11 +60,11 @@
 #X floatatom 16 358 8 0 0 0 - - -;
 #X obj -42 306 r setUp;
 #X obj 14 439 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4950 1;
+-1 -1 0 1;
 #X floatatom 11 471 8 0 0 0 - - -;
 #X obj -47 419 r setUp;
 #X obj 12 517 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4950 1;
+-1 -1 0 1;
 #X floatatom 9 549 8 0 0 0 - - -;
 #X obj -49 497 r setUp;
 #X obj 66 470 s presweepElev;
@@ -80,11 +80,11 @@
 #X msg -259 37 10;
 #X msg 87 225 80;
 #X obj -274 139 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 4950 1;
+-262144 -1 -1 0 1;
 #X obj -275 233 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 4950 1;
+-262144 -1 -1 0 1;
 #X obj -275 324 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 4950 1;
+-262144 -1 -1 0 1;
 #X obj -277 162 s Xobs;
 #X obj -278 253 s Yobs;
 #X obj -278 351 s Zobs;
@@ -126,6 +126,182 @@
 #X msg 175 222 10;
 #X msg 206 221 0;
 #X msg 109 492 0;
+#X obj 384 23 sweepTime;
+#X obj 384 45 centreAngles;
+#N canvas 528 427 426 335 thickCalc 0;
+#X obj 173 139 r NoOfSources;
+#X obj 158 115 -;
+#X obj 158 164 /;
+#X floatatom 126 147 5 0 0 0 - - -;
+#X floatatom 94 189 8 0 0 0 - - -;
+#X obj 173 72 t f b;
+#X obj 200 95 delay 9;
+#X text 58 237 Calculates the difference in thickness between sources
+;
+#X text 59 254 based on the blade tapering in a straight line;
+#X obj 158 19 r hiltThick;
+#X obj 173 44 r tipThick;
+#X obj 158 187 s deltaThick;
+#X connect 0 0 2 1;
+#X connect 1 0 2 0;
+#X connect 1 0 3 0;
+#X connect 2 0 4 0;
+#X connect 2 0 11 0;
+#X connect 5 0 1 1;
+#X connect 5 1 6 0;
+#X connect 6 0 1 0;
+#X connect 9 0 1 0;
+#X connect 10 0 5 0;
+#X restore 384 67 pd thickCalc;
+#N canvas 72 23 1360 722 maxCircCalc 0;
+#X obj 440 104 +;
+#X obj 468 128 s length;
+#X obj 153 86 r presweepAzim;
+#X obj 644 76 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 644 129 s GO;
+#X obj 584 76 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1
+-1;
+#X obj 584 129 s setUp;
+#X obj 153 132 * 6.28312;
+#X obj 153 110 / 360;
+#X obj 153 174 *;
+#X floatatom 91 198 5 0 0 0 - - -;
+#X text 194 175 Circumference of the nearest source on blade;
+#X text 307 191 up to 0 azimuth;
+#X obj 153 200 s minPreCirc;
+#X obj 437 279 * 6.28312;
+#X obj 437 257 / 360;
+#X obj 437 321 *;
+#X floatatom 375 345 5 0 0 0 - - -;
+#X text 478 322 Circumference of the nearest source on blade;
+#X obj 437 233 r postsweepAzim;
+#X obj 437 347 s minPostCirc;
+#X obj 149 252 r presweepAzim;
+#X obj 149 276 / 360;
+#X obj 149 342 *;
+#X floatatom 85 364 0 0 0 0 - - -;
+#X obj 440 57 r bladeLen;
+#X obj 455 81 r start_armLength;
+#X obj 437 434 * 6.28312;
+#X obj 437 412 / 360;
+#X obj 437 478 *;
+#X floatatom 399 501 5 0 0 0 - - -;
+#X obj 437 388 r postsweepAzim;
+#X obj 164 362 r minPreCirc;
+#X obj 149 383 -;
+#X obj 149 426 /;
+#X floatatom 80 454 0 0 0 0 - - -;
+#X obj 164 403 r NoOfSources;
+#X obj 149 454 s deltaPreCirc;
+#X obj 437 519 -;
+#X obj 437 562 /;
+#X obj 452 539 r NoOfSources;
+#X obj 452 498 r minPostCirc;
+#X obj 437 590 s deltaPostCirc;
+#X floatatom 368 591 0 0 0 0 - - -;
+#X text 33 334 Max Circumference;
+#X text 323 472 Max Circumference;
+#X obj 1076 361 r presweepElev;
+#X obj 1091 384 r postsweepElev;
+#X obj 1076 419 +;
+#X obj 1076 441 * 0.5;
+#X obj 1075 488 * 6.28312;
+#X obj 1075 466 / 360;
+#X obj 1074 514 cos;
+#X floatatom 1022 579 0 0 0 0 - - -;
+#X floatatom 1126 425 5 0 0 0 - - -;
+#X obj 1074 536 *;
+#X floatatom 531 128 5 0 0 0 - - -;
+#X obj 1101 514 r start_armLength;
+#X obj 149 298 * 6.28319;
+#X obj 1074 562 s compSrcRadius;
+#X obj 452 300 r compSrcRadius;
+#X obj 168 153 r compSrcRadius;
+#X obj 364 101 r arcConst;
+#X obj 425 129 *;
+#X floatatom 387 153 5 0 0 0 - - -;
+#X obj 994 538 s arcConst;
+#X obj 425 153 s compRadius;
+#X obj 164 320 r compRadius;
+#X obj 452 456 r compRadius;
+#X connect 0 0 1 0;
+#X connect 0 0 56 0;
+#X connect 0 0 63 1;
+#X connect 2 0 8 0;
+#X connect 3 0 4 0;
+#X connect 5 0 6 0;
+#X connect 7 0 9 0;
+#X connect 8 0 7 0;
+#X connect 9 0 10 0;
+#X connect 9 0 13 0;
+#X connect 14 0 16 0;
+#X connect 15 0 14 0;
+#X connect 16 0 17 0;
+#X connect 16 0 20 0;
+#X connect 19 0 15 0;
+#X connect 21 0 22 0;
+#X connect 22 0 58 0;
+#X connect 23 0 24 0;
+#X connect 23 0 33 0;
+#X connect 25 0 0 0;
+#X connect 26 0 0 1;
+#X connect 27 0 29 0;
+#X connect 28 0 27 0;
+#X connect 29 0 30 0;
+#X connect 29 0 38 0;
+#X connect 31 0 28 0;
+#X connect 32 0 33 1;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 34 0 37 0;
+#X connect 36 0 34 1;
+#X connect 38 0 39 0;
+#X connect 39 0 42 0;
+#X connect 39 0 43 0;
+#X connect 40 0 39 1;
+#X connect 41 0 38 1;
+#X connect 46 0 48 0;
+#X connect 47 0 48 1;
+#X connect 48 0 49 0;
+#X connect 48 0 54 0;
+#X connect 49 0 51 0;
+#X connect 50 0 52 0;
+#X connect 51 0 50 0;
+#X connect 52 0 55 0;
+#X connect 52 0 65 0;
+#X connect 55 0 53 0;
+#X connect 55 0 59 0;
+#X connect 57 0 55 1;
+#X connect 58 0 23 0;
+#X connect 60 0 16 1;
+#X connect 61 0 9 1;
+#X connect 62 0 63 0;
+#X connect 63 0 64 0;
+#X connect 63 0 66 0;
+#X connect 67 0 23 1;
+#X connect 68 0 29 1;
+#X restore 383 87 pd maxCircCalc;
+#X obj 586 63 sourceSpeed;
+#X text 836 -13 Wind Speed;
+#X text 837 5 Diameter;
+#X text 839 25 Length;
+#X text 838 48 Distance;
+#X text 838 72 Azimuth;
+#X text 838 93 Elevation;
+#X text 837 114 Pan;
+#X text 836 132 X Rot;
+#X text 838 154 Y Rot;
+#X text 839 174 Z Rot;
+#X text 836 193 TurbInt;
+#X floatatom 666 365 0 0 0 0 - - -;
+#X floatatom 700 365 0 0 0 0 - - -;
+#X obj 666 318 route motion;
+#X obj 666 340 route x y;
+#X obj 666 297 cursor;
+#X obj 666 279 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 666 258 loadbang;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
 #X connect 3 0 4 0;
@@ -210,3 +386,10 @@
 #X connect 109 0 15 0;
 #X connect 110 0 15 0;
 #X connect 111 0 53 0;
+#X connect 116 0 0 0;
+#X connect 130 0 131 0;
+#X connect 131 0 128 0;
+#X connect 131 1 129 0;
+#X connect 132 0 130 0;
+#X connect 133 0 132 0;
+#X connect 134 0 133 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/newSword/sourceSpeed.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -0,0 +1,152 @@
+#N canvas 140 48 1008 758 10;
+#X obj -219 -121 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034
+-1 -1;
+#X obj -219 -68 s GO;
+#X obj -279 -121 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj -279 -68 s setUp;
+#X obj -98 420 line~;
+#X text -89 -100 Start calculation with elevation = 0 \, arm length
+is constant \, acceleration/deceleration is constant.;
+#X obj -211 469 loadbang;
+#X obj -211 490 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -211 508 metro 10;
+#X obj -211 530 snapshot~;
+#X floatatom -211 550 5 0 0 0 - - -;
+#X obj -130 566 hsl 128 15 0 80 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X msg -268 354 \$1 \$2;
+#X obj -268 329 pack;
+#X msg -98 386 0;
+#X obj -269 306 f;
+#X obj -269 261 r GO;
+#X msg 41 388 0 \$1;
+#X obj 40 311 t f b;
+#X obj 41 339 delay;
+#X obj -98 365 r setUp;
+#X text -115 346 Start at 0 speed;
+#X text 83 399 \$1 = time to reach speed of 0;
+#X obj 55 264 r preswingTime;
+#X text -7 224 Trigger once full speed;
+#X obj -98 453 outlet~;
+#X obj 233 -103 inlet;
+#X obj 327 -105 inlet;
+#X obj 233 -80 s \$0_thisGroup;
+#X obj 327 -81 s \$0_thisSource;
+#X text -331 385 \$1 = source speed;
+#X text -331 401 \$2 = time to reach source speed;
+#X obj -243 305 r preswingTime;
+#X obj 236 16 r \$0_thisGroup;
+#X obj 251 36 r \$0_thisSource;
+#X obj 236 58 +;
+#X floatatom 190 85 5 0 0 0 - - -;
+#X obj 236 84 s \$0_mySourceNo;
+#X obj -239 -39 r \$0_mySourceNo;
+#X obj -224 -19 r deltaPreCirc;
+#X obj -239 2 *;
+#X obj -239 43 +;
+#X obj -224 22 r minPreCirc;
+#X floatatom -302 64 5 0 0 0 - - -;
+#X obj -224 64 r preswingTime;
+#X obj -239 107 /;
+#X obj -224 85 * 0.001;
+#X obj -239 134 * 2;
+#X text -196 114 Average Speed;
+#X text -199 138 Top Speed for this source;
+#X floatatom -292 160 5 0 0 0 - - -;
+#X obj -239 161 s \$0_myPreSourceSpeed;
+#X obj -254 282 r \$0_myPreSourceSpeed;
+#X obj 98 328 r postswingTime;
+#X floatatom 130 351 5 0 0 0 - - -;
+#X obj 40 244 r GO;
+#X obj 40 286 f;
+#X obj 41 366 f;
+#X obj 436 7 r start_armLength;
+#X obj 421 -15 r length;
+#X obj 421 69 -;
+#X obj 469 50 r NoOfSources;
+#X obj 454 29 r \$0_mySourceNo;
+#X obj 454 72 /;
+#X obj 421 94 *;
+#X floatatom 376 162 5 0 0 0 - - -;
+#X obj 421 137 +;
+#X obj 436 115 r start_armLength;
+#X text 476 163 Distance from centre of arc;
+#X obj 421 162 sig~;
+#X obj 421 210 s~ \$0_srcCnt;
+#X obj 457 331 r~ \$0_srcCnt;
+#X text 453 373 Y;
+#X text 465 374 X;
+#X text 477 374 Z;
+#X obj 457 360 thisPosition;
+#X obj 419 529 outlet~;
+#X obj 493 523 outlet~;
+#X obj 468 402 thisAngle;
+#X obj 586 532 outlet~;
+#X connect 0 0 1 0;
+#X connect 2 0 3 0;
+#X connect 4 0 9 0;
+#X connect 4 0 25 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 9 0 10 0;
+#X connect 9 0 11 0;
+#X connect 12 0 4 0;
+#X connect 13 0 12 0;
+#X connect 14 0 4 0;
+#X connect 15 0 13 0;
+#X connect 16 0 15 0;
+#X connect 17 0 4 0;
+#X connect 18 0 19 1;
+#X connect 18 1 19 0;
+#X connect 19 0 57 0;
+#X connect 20 0 14 0;
+#X connect 23 0 56 1;
+#X connect 26 0 28 0;
+#X connect 27 0 29 0;
+#X connect 32 0 13 1;
+#X connect 33 0 35 0;
+#X connect 34 0 35 1;
+#X connect 35 0 36 0;
+#X connect 35 0 37 0;
+#X connect 38 0 40 0;
+#X connect 39 0 40 1;
+#X connect 40 0 41 0;
+#X connect 41 0 43 0;
+#X connect 41 0 45 0;
+#X connect 42 0 41 1;
+#X connect 44 0 46 0;
+#X connect 45 0 47 0;
+#X connect 46 0 45 1;
+#X connect 47 0 50 0;
+#X connect 47 0 51 0;
+#X connect 52 0 15 1;
+#X connect 53 0 54 0;
+#X connect 53 0 57 1;
+#X connect 55 0 56 0;
+#X connect 56 0 18 0;
+#X connect 57 0 17 0;
+#X connect 58 0 60 1;
+#X connect 59 0 60 0;
+#X connect 60 0 64 0;
+#X connect 61 0 63 1;
+#X connect 62 0 63 0;
+#X connect 63 0 64 1;
+#X connect 64 0 66 0;
+#X connect 66 0 65 0;
+#X connect 66 0 69 0;
+#X connect 67 0 66 1;
+#X connect 69 0 70 0;
+#X connect 71 0 75 0;
+#X connect 75 0 78 0;
+#X connect 75 1 78 1;
+#X connect 75 2 78 2;
+#X connect 75 3 76 0;
+#X connect 75 3 78 3;
+#X connect 75 4 78 4;
+#X connect 75 5 78 5;
+#X connect 75 6 78 6;
+#X connect 78 0 77 0;
+#X connect 78 1 79 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/newSword/sweepTime.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -0,0 +1,136 @@
+#N canvas 64 60 1299 777 10;
+#X obj 658 -89 r presweepElev;
+#X obj 751 -90 r postsweepElev;
+#X obj 199 19 r presweepAzim;
+#X floatatom 158 51 5 0 0 0 - - -;
+#X floatatom 658 -65 5 0 0 0 - - -;
+#X floatatom 751 -67 5 0 0 0 - - -;
+#X obj 198 -110 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 198 -57 s GO;
+#X obj 138 -110 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj 138 -57 s setUp;
+#X obj 852 -90 r start_armLength;
+#X floatatom 852 -69 5 0 0 0 - - -;
+#X obj 968 -90 r bladeLen;
+#X floatatom 968 -67 5 0 0 0 - - -;
+#X obj 214 86 r start_armLength;
+#X obj 229 107 r bladeLen;
+#X obj 214 131 +;
+#X floatatom 232 151 5 0 0 0 - - -;
+#X text 328 -89 Start calculation with elevation = 0 \, arm length
+is constant \, acceleration/deceleration is constant.;
+#X obj 199 64 * 6.28312;
+#X obj 199 42 / 360;
+#X floatatom 156 97 5 0 0 0 - - -;
+#X obj 199 164 *;
+#X floatatom 152 198 5 0 0 0 - - -;
+#X obj 214 185 r topSpeed;
+#X obj 214 210 / 2;
+#X obj 199 293 /;
+#X obj 199 317 * 1000;
+#X floatatom 246 346 5 0 0 0 - - -;
+#X floatatom 542 40 5 0 0 0 - - -;
+#X obj 598 75 r start_armLength;
+#X obj 613 96 r bladeLen;
+#X obj 598 120 +;
+#X floatatom 616 140 5 0 0 0 - - -;
+#X obj 583 53 * 6.28312;
+#X obj 583 31 / 360;
+#X floatatom 540 86 5 0 0 0 - - -;
+#X obj 583 153 *;
+#X floatatom 536 187 5 0 0 0 - - -;
+#X obj 598 174 r topSpeed;
+#X obj 598 199 / 2;
+#X obj 583 275 /;
+#X obj 583 299 * 1000;
+#X obj 583 -17 r postsweepAzim;
+#X text 683 304 Time from 0 azimuth to;
+#X text 686 319 stationary at post sweep;
+#X text 637 199 Assuming constant acceleration;
+#X floatatom 635 326 5 0 0 0 - - -;
+#X obj 199 379 s preswingTime;
+#X obj 583 358 s postswingTime;
+#X text 249 211 Assuming constant acceleration;
+#X text 25 240 Time from pre-sweep azimuth;
+#X text 26 253 to centre at top speed;
+#X text 8 186 Pre sweep Circumference;
+#X text 396 167 Post sweep Circumference;
+#X text 315 380 Acceleration time;
+#X text 692 359 Decceleration time;
+#X text 246 130 Full radius;
+#X text 648 119 Full radius;
+#X obj 1037 70 r preswingTime;
+#X obj 1022 152 +;
+#X obj 1009 253 delay;
+#X obj 1007 200 t f b;
+#X obj 1007 27 r GO;
+#X obj 1007 175 f;
+#X obj 1036 230 + 5;
+#X obj 1022 48 r postswingTime;
+#X obj 1009 276 s myEnd;
+#X obj 1037 122 t f b;
+#X floatatom 955 252 5 0 0 0 - - -;
+#X obj 582 10 * -1;
+#X obj 214 233 t f b;
+#X obj 241 257 delay 9;
+#X obj 598 222 t f b;
+#X obj 625 246 delay 9;
+#X connect 0 0 4 0;
+#X connect 1 0 5 0;
+#X connect 2 0 3 0;
+#X connect 2 0 20 0;
+#X connect 6 0 7 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 0;
+#X connect 12 0 13 0;
+#X connect 14 0 16 0;
+#X connect 15 0 16 1;
+#X connect 16 0 17 0;
+#X connect 16 0 22 1;
+#X connect 19 0 21 0;
+#X connect 19 0 22 0;
+#X connect 20 0 19 0;
+#X connect 22 0 23 0;
+#X connect 22 0 26 0;
+#X connect 24 0 25 0;
+#X connect 25 0 71 0;
+#X connect 26 0 27 0;
+#X connect 27 0 28 0;
+#X connect 27 0 48 0;
+#X connect 30 0 32 0;
+#X connect 31 0 32 1;
+#X connect 32 0 33 0;
+#X connect 32 0 37 1;
+#X connect 34 0 36 0;
+#X connect 34 0 37 0;
+#X connect 35 0 34 0;
+#X connect 37 0 38 0;
+#X connect 37 0 41 0;
+#X connect 39 0 40 0;
+#X connect 40 0 73 0;
+#X connect 41 0 42 0;
+#X connect 42 0 47 0;
+#X connect 42 0 49 0;
+#X connect 43 0 29 0;
+#X connect 43 0 70 0;
+#X connect 59 0 68 0;
+#X connect 60 0 64 1;
+#X connect 61 0 67 0;
+#X connect 62 0 65 0;
+#X connect 62 1 61 0;
+#X connect 63 0 64 0;
+#X connect 64 0 62 0;
+#X connect 65 0 61 1;
+#X connect 65 0 69 0;
+#X connect 66 0 60 0;
+#X connect 68 0 60 1;
+#X connect 68 1 60 0;
+#X connect 70 0 35 0;
+#X connect 71 0 26 1;
+#X connect 71 1 72 0;
+#X connect 72 0 26 0;
+#X connect 73 0 41 1;
+#X connect 73 1 74 0;
+#X connect 74 0 41 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/newSword/thisAngle.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -0,0 +1,277 @@
+#N canvas 18 44 1440 726 10;
+#X obj -19 -52 inlet~;
+#X obj 58 -52 inlet~;
+#X obj 134 -53 inlet~;
+#X obj -19 -31 s~ \$0_Ydiff;
+#X obj 58 -31 s~ \$0_Xdiff;
+#X obj 134 -32 s~ \$0_Zdiff;
+#X obj -130 -58 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj -130 -5 s GO;
+#X obj -190 -58 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj -190 -5 s setUp;
+#X obj 230 -58 inlet~;
+#X obj 230 -37 s~ \$0_scrObsDist;
+#X obj 451 -74 inlet~;
+#X obj 74 5 loadbang;
+#X obj 74 26 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1
+;
+#X obj 74 44 metro 10;
+#X obj 74 66 snapshot~;
+#X floatatom 74 86 8 0 0 0 - - -;
+#X obj 139 5 loadbang;
+#X obj 139 26 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 139 44 metro 10;
+#X obj 139 66 snapshot~;
+#X floatatom 139 86 8 0 0 0 - - -;
+#X obj 205 6 loadbang;
+#X obj 205 27 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 205 45 metro 10;
+#X obj 205 67 snapshot~;
+#X floatatom 205 87 8 0 0 0 - - -;
+#X obj 338 -72 loadbang;
+#X obj 338 -51 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 338 -33 metro 10;
+#X obj 338 -11 snapshot~;
+#X floatatom 338 11 8 0 0 0 - - -;
+#X obj 477 -30 loadbang;
+#X obj 477 -9 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 477 9 metro 10;
+#X obj 477 31 snapshot~;
+#X floatatom 477 51 8 0 0 0 - - -;
+#X text 45 106 Y \, X \, Z dist between source and centre;
+#X text 61 119 Based on length \, azim and elev;
+#X obj 575 -75 inlet~;
+#X obj 601 -31 loadbang;
+#X obj 601 -10 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 601 8 metro 10;
+#X obj 601 30 snapshot~;
+#X floatatom 601 50 8 0 0 0 - - -;
+#X text 318 30 Distance src to obs;
+#X obj 691 -77 inlet~;
+#X obj 717 -33 loadbang;
+#X obj 717 -12 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 717 6 metro 10;
+#X obj 717 28 snapshot~;
+#X floatatom 717 48 8 0 0 0 - - -;
+#X obj 451 -53 s~ \$0_scrObsYDist;
+#X obj 575 -54 s~ \$0_scrObsXDist;
+#X obj 691 -56 s~ \$0_scrObsZDist;
+#X obj 430 443 s~ \$0-Az;
+#X obj 79 497 loadbang;
+#X obj 79 518 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 79 536 metro 10;
+#X obj 79 558 snapshot~;
+#X floatatom 79 578 8 0 0 0 - - -;
+#X obj 343 484 loadbang;
+#X obj 343 505 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 343 523 metro 10;
+#X obj 343 545 snapshot~;
+#X floatatom 343 565 8 0 0 0 - - -;
+#X obj 820 354 loadbang;
+#X obj 820 375 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 820 393 metro 10;
+#X obj 820 415 snapshot~;
+#X floatatom 820 435 8 0 0 0 - - -;
+#X obj 354 150 r~ \$0_Xdiff;
+#X obj 354 216 -~;
+#X obj 427 150 r~ \$0_Zdiff;
+#X obj 427 215 -~;
+#X obj 369 173 r Xobs;
+#X obj 369 194 sig~;
+#X obj 442 171 r Zobs;
+#X obj 442 193 sig~;
+#X obj 412 240 /~;
+#X obj 430 270 *~;
+#X obj 445 290 sig~ 1;
+#X obj 430 312 +~;
+#X obj 430 336 sqrt~;
+#X obj 412 360 /~;
+#X obj 426 408 arcsin~;
+#X obj 192 452 r~ currentAzim;
+#X obj 192 512 r~ \$0-Az;
+#X obj 177 536 -~;
+#X obj 888 409 outlet~;
+#X obj 1110 365 loadbang;
+#X obj 1110 386 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 1110 404 metro 10;
+#X obj 1110 426 snapshot~;
+#X floatatom 1110 446 8 0 0 0 - - -;
+#X obj 177 430 sig~ 90;
+#X obj 177 484 -~;
+#X obj 1018 191 r~ currentAzim;
+#X obj 1003 169 sig~ 90;
+#X obj 1003 215 -~;
+#X obj 939 73 /~;
+#X obj 954 103 *~;
+#X obj 969 123 sig~ 1;
+#X obj 954 145 +~;
+#X obj 954 169 sqrt~;
+#X obj 939 193 /~;
+#X obj 939 216 arcsin~;
+#X obj 954 28 r Xobs;
+#X obj 954 49 sig~;
+#X obj 939 -17 r Zobs;
+#X obj 939 5 sig~;
+#X obj 988 245 -~;
+#X obj 232 570 s~ \$0-Pv;
+#X obj 294 337 r~ \$0-Pv;
+#X obj 267 319 sig~ 180;
+#X obj 958 308 -~;
+#X obj 973 281 +~;
+#X obj 279 357 +~;
+#X obj 902 279 sig~ 180;
+#X obj 656 203 /~;
+#X obj 671 233 *~;
+#X obj 686 253 sig~ 1;
+#X obj 671 275 +~;
+#X obj 671 299 sqrt~;
+#X obj 656 323 /~;
+#X obj 656 346 arcsin~;
+#X obj 671 179 sig~;
+#X obj 656 135 sig~;
+#X obj 656 113 r Xobs;
+#X obj 671 158 r Zobs;
+#X obj 656 392 -~;
+#X obj 671 369 r~ \$0-Az;
+#X obj 1029 468 outlet~;
+#X obj 1036 422 clip~ 0 1;
+#X obj 1036 374 /~ 360;
+#X obj 986 401 -~ 0.5;
+#X connect 0 0 3 0;
+#X connect 0 0 16 0;
+#X connect 1 0 4 0;
+#X connect 1 0 21 0;
+#X connect 2 0 5 0;
+#X connect 2 0 26 0;
+#X connect 6 0 7 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 0;
+#X connect 10 0 31 0;
+#X connect 12 0 36 0;
+#X connect 12 0 53 0;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 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 25 0 26 0;
+#X connect 26 0 27 0;
+#X connect 28 0 29 0;
+#X connect 29 0 30 0;
+#X connect 30 0 31 0;
+#X connect 31 0 32 0;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 35 0 36 0;
+#X connect 36 0 37 0;
+#X connect 40 0 44 0;
+#X connect 40 0 54 0;
+#X connect 41 0 42 0;
+#X connect 42 0 43 0;
+#X connect 43 0 44 0;
+#X connect 44 0 45 0;
+#X connect 47 0 51 0;
+#X connect 47 0 55 0;
+#X connect 48 0 49 0;
+#X connect 49 0 50 0;
+#X connect 50 0 51 0;
+#X connect 51 0 52 0;
+#X connect 57 0 58 0;
+#X connect 58 0 59 0;
+#X connect 59 0 60 0;
+#X connect 60 0 61 0;
+#X connect 62 0 63 0;
+#X connect 63 0 64 0;
+#X connect 64 0 65 0;
+#X connect 65 0 66 0;
+#X connect 67 0 68 0;
+#X connect 68 0 69 0;
+#X connect 69 0 70 0;
+#X connect 70 0 71 0;
+#X connect 72 0 73 0;
+#X connect 73 0 80 0;
+#X connect 74 0 75 0;
+#X connect 75 0 80 1;
+#X connect 76 0 77 0;
+#X connect 77 0 73 1;
+#X connect 78 0 79 0;
+#X connect 79 0 75 1;
+#X connect 80 0 81 0;
+#X connect 80 0 81 1;
+#X connect 80 0 85 0;
+#X connect 81 0 83 0;
+#X connect 82 0 83 1;
+#X connect 83 0 84 0;
+#X connect 84 0 85 1;
+#X connect 85 0 86 0;
+#X connect 86 0 56 0;
+#X connect 87 0 65 0;
+#X connect 87 0 97 1;
+#X connect 88 0 89 1;
+#X connect 89 0 60 0;
+#X connect 89 0 113 0;
+#X connect 91 0 92 0;
+#X connect 92 0 93 0;
+#X connect 93 0 94 0;
+#X connect 94 0 95 0;
+#X connect 96 0 97 0;
+#X connect 97 0 89 0;
+#X connect 98 0 100 1;
+#X connect 99 0 100 0;
+#X connect 100 0 112 1;
+#X connect 101 0 102 0;
+#X connect 101 0 102 1;
+#X connect 101 0 106 0;
+#X connect 102 0 104 0;
+#X connect 103 0 104 1;
+#X connect 104 0 105 0;
+#X connect 105 0 106 1;
+#X connect 106 0 107 0;
+#X connect 107 0 112 0;
+#X connect 108 0 109 0;
+#X connect 109 0 101 1;
+#X connect 110 0 111 0;
+#X connect 111 0 101 0;
+#X connect 112 0 117 1;
+#X connect 114 0 118 1;
+#X connect 115 0 118 0;
+#X connect 116 0 70 0;
+#X connect 116 0 90 0;
+#X connect 116 0 135 0;
+#X connect 117 0 116 1;
+#X connect 119 0 116 0;
+#X connect 120 0 121 0;
+#X connect 120 0 121 1;
+#X connect 120 0 125 0;
+#X connect 121 0 123 0;
+#X connect 122 0 123 1;
+#X connect 123 0 124 0;
+#X connect 124 0 125 1;
+#X connect 125 0 126 0;
+#X connect 126 0 131 0;
+#X connect 127 0 120 1;
+#X connect 128 0 120 0;
+#X connect 129 0 128 0;
+#X connect 130 0 127 0;
+#X connect 131 0 117 0;
+#X connect 132 0 131 1;
+#X connect 134 0 133 0;
+#X connect 134 0 94 0;
+#X connect 135 0 134 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/newSword/thisPosition.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -0,0 +1,132 @@
+#N canvas 131 311 917 541 10;
+#X obj -11951 -141 r~ currentElev;
+#X obj -11639 -26 r~ currentAzim;
+#X obj -11951 -117 /~ 360;
+#X obj -11951 -94 sin~;
+#X obj -11951 -51 *~;
+#X obj -11654 -139 r~ currentElev;
+#X obj -11654 -115 /~ 360;
+#X obj -11654 -49 *~;
+#X obj -11654 -92 cos~;
+#X obj -11639 19 cos~;
+#X obj -11639 -2 /~ 360;
+#X obj -11654 44 *~;
+#X obj -11798 -22 r~ currentAzim;
+#X obj -11813 -135 r~ currentElev;
+#X obj -11813 -111 /~ 360;
+#X obj -11813 -45 *~;
+#X obj -11798 2 /~ 360;
+#X obj -11813 48 *~;
+#X obj -11813 -88 cos~;
+#X obj -11798 23 sin~;
+#X text -11683 -163 Z position of source;
+#X obj -11999 75 sig~;
+#X obj -11966 105 -~;
+#X obj -11862 85 sig~;
+#X obj -11828 115 -~;
+#X obj -11702 82 sig~;
+#X obj -11669 112 -~;
+#X obj -11702 59 r Zobs;
+#X obj -11966 134 *~;
+#X obj -11828 140 *~;
+#X obj -11669 137 *~;
+#X obj -11843 166 +~;
+#X obj -11546 214 +~;
+#X obj -11546 238 sqrt~;
+#X text -11961 -164 Y position of source;
+#X text -11820 -162 X position of source;
+#X obj -11862 62 r Xobs;
+#X obj -11999 52 r Yobs;
+#X text -11514 -93 Distance between the observer as a point in 3D space
+and the sound source.;
+#X obj -11546 261 outlet~;
+#X obj -11508 -190 inlet~;
+#X obj -11508 -166 s~ \$0_myScrCnt;
+#X obj -11639 -72 r~ \$0_myScrCnt;
+#X obj -11798 -68 r~ \$0_myScrCnt;
+#X obj -11936 -74 r~ \$0_myScrCnt;
+#X obj -11634 72 outlet~;
+#X obj -11796 75 outlet~;
+#X obj -11934 -24 outlet~;
+#X obj -11450 198 +~;
+#X obj -11450 222 sqrt~;
+#X obj -11450 245 outlet~;
+#X obj -11365 127 +~;
+#X obj -11365 151 sqrt~;
+#X obj -11365 174 outlet~;
+#X obj -11295 48 +~;
+#X obj -11295 72 sqrt~;
+#X obj -11295 95 outlet~;
+#X text -11447 266 Y;
+#X text -11362 192 X;
+#X text -11293 114 Z;
+#X obj -11518 -20 loadbang;
+#X obj -11518 1 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -11518 19 metro 10;
+#X obj -11518 41 snapshot~;
+#X floatatom -11518 61 5 0 0 0 - - -;
+#X obj -11320 -180 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034
+-1 -1;
+#X obj -11320 -127 s GO;
+#X obj -11380 -180 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj -11380 -127 s setUp;
+#X connect 0 0 2 0;
+#X connect 1 0 10 0;
+#X connect 2 0 3 0;
+#X connect 3 0 4 0;
+#X connect 4 0 22 1;
+#X connect 4 0 47 0;
+#X connect 5 0 6 0;
+#X connect 6 0 8 0;
+#X connect 7 0 11 0;
+#X connect 8 0 7 0;
+#X connect 9 0 11 1;
+#X connect 10 0 9 0;
+#X connect 11 0 26 1;
+#X connect 11 0 45 0;
+#X connect 12 0 16 0;
+#X connect 13 0 14 0;
+#X connect 14 0 18 0;
+#X connect 15 0 17 0;
+#X connect 16 0 19 0;
+#X connect 17 0 24 1;
+#X connect 17 0 46 0;
+#X connect 17 0 63 0;
+#X connect 18 0 15 0;
+#X connect 19 0 17 1;
+#X connect 21 0 22 0;
+#X connect 22 0 28 0;
+#X connect 22 0 28 1;
+#X connect 22 0 50 0;
+#X connect 23 0 24 0;
+#X connect 24 0 29 0;
+#X connect 24 0 29 1;
+#X connect 24 0 53 0;
+#X connect 25 0 26 0;
+#X connect 26 0 30 0;
+#X connect 26 0 30 1;
+#X connect 26 0 56 0;
+#X connect 27 0 25 0;
+#X connect 28 0 31 0;
+#X connect 29 0 31 1;
+#X connect 30 0 32 1;
+#X connect 31 0 32 0;
+#X connect 32 0 33 0;
+#X connect 33 0 39 0;
+#X connect 36 0 23 0;
+#X connect 37 0 21 0;
+#X connect 40 0 41 0;
+#X connect 42 0 7 1;
+#X connect 43 0 15 1;
+#X connect 44 0 4 1;
+#X connect 48 0 49 0;
+#X connect 51 0 52 0;
+#X connect 54 0 55 0;
+#X connect 60 0 61 0;
+#X connect 61 0 62 0;
+#X connect 62 0 63 0;
+#X connect 63 0 64 0;
+#X connect 65 0 66 0;
+#X connect 67 0 68 0;
--- a/scene demo/freqCalcCyl3No_D2Mach.pd	Tue Jan 26 18:40:48 2016 +0000
+++ b/scene demo/freqCalcCyl3No_D2Mach.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -103,7 +103,7 @@
 #X obj 303 132 r~ \$0-str;
 #X obj 321 173 r \$0-leng;
 #X obj 346 231 r \$0-dist;
-#N canvas 203 82 1238 721 GoldfreqGain 1;
+#N canvas 203 82 1238 721 GoldfreqGain 0;
 #N canvas 759 125 286 294 pow6 0;
 #X obj 47 67 *~;
 #X obj 76 67 *~;
@@ -976,12 +976,18 @@
 #X text 80 297 Equation of line derived from Norberg 2001;
 #X obj 88 169 max~ 1;
 #X obj 88 46 sig~ 44.67;
+#X obj 229 190 r myMet;
+#X obj 229 211 snapshot~;
+#X floatatom 230 236 5 0 0 0 - - -;
 #X connect 0 0 4 0;
 #X connect 2 0 9 0;
 #X connect 3 0 4 1;
 #X connect 4 0 2 1;
 #X connect 9 0 1 0;
+#X connect 9 0 12 0;
 #X connect 10 0 2 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
 #X restore 1151 76 pd corrLen Calc;
 #X obj 1151 53 r~ \$0-myRey;
 #X obj 1151 100 s~ \$0-myCor;
--- a/scene demo/testBedD2.pd	Tue Jan 26 18:40:48 2016 +0000
+++ b/scene demo/testBedD2.pd	Wed Jan 27 13:53:07 2016 +0000
@@ -2,7 +2,7 @@
 #X obj 195 -91 loadbang;
 #X obj -218 178 delwrite~ varwind 3000;
 #X obj -108 -73 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 1101 1;
+-1 -1 423 1;
 #X obj -300 23 snapshot~;
 #X floatatom -300 50 10 0 0 0 - - -;
 #X obj -217 -29 *~ 1;
@@ -11,7 +11,7 @@
 #X obj -19 -117 loadbang;
 #X msg -19 -97 5;
 #X obj 243 1 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 903 1;
+-262144 -1 -1 7202 1;
 #X floatatom 251 25 8 0 0 0 - - -;
 #X obj 301 275 hsl 128 15 0.009 0.9 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 6999 1;
@@ -21,10 +21,10 @@
 -1 -1 6350 1;
 #X floatatom 298 186 5 0 0 0 - - -;
 #X obj 289 212 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 706 1;
+-262144 -1 -1 7937 1;
 #X floatatom 313 241 5 0 0 0 - - -;
 #X obj 264 100 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 12700 1;
+-1 -1 8877 1;
 #X floatatom 275 129 5 0 0 0 - - -;
 #X text 442 276 Pan Value;
 #X obj -243 416 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -68,7 +68,7 @@
 #X restore -244 373 pd opLevels;
 #X msg -235 319 5;
 #X obj -241 344 hsl 100 25 0.1 1e+06 1 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 7746 1;
+10 -262144 -1 -1 2403 1;
 #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;
@@ -85,7 +85,7 @@
 #X obj 195 -67 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 252 57 hsl 128 15 1 10 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 12700 1;
+-1 -1 4233 1;
 #X floatatom 273 76 8 0 0 0 - - -;
 #X msg 161 40 4;
 #X obj -124 347 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144
@@ -308,7 +308,6 @@
 #X restore 39 -81 pd writing;
 #X msg 199 156 -45;
 #X obj -263 114 sig~;
-#X msg 322 -29 0.01;
 #X floatatom -70 -50 5 0 0 0 - - -;
 #X msg 227 -48 0;
 #X obj -455 256 unpack f f f f f f;
@@ -469,54 +468,55 @@
 #X msg 197 74 12.649;
 #X msg 374 503 0.05;
 #X msg 369 -29 0.019;
-#X msg -263 91 68.64;
+#X msg -263 91 16.6;
+#X msg 322 -29 0.0254;
 #X connect 0 0 34 0;
 #X connect 2 0 5 1;
-#X connect 2 0 69 0;
-#X connect 2 0 137 0;
+#X connect 2 0 68 0;
+#X connect 2 0 136 0;
 #X connect 3 0 4 0;
 #X connect 3 0 42 0;
 #X connect 5 0 6 0;
 #X connect 6 0 3 0;
-#X connect 6 0 98 0;
+#X connect 6 0 97 0;
 #X connect 8 0 9 0;
 #X connect 9 0 2 0;
 #X connect 10 0 11 0;
-#X connect 10 0 123 1;
+#X connect 10 0 122 1;
 #X connect 12 0 13 0;
-#X connect 12 0 123 6;
+#X connect 12 0 122 6;
 #X connect 15 0 16 0;
-#X connect 15 0 123 4;
+#X connect 15 0 122 4;
 #X connect 17 0 18 0;
-#X connect 17 0 97 0;
-#X connect 17 0 123 5;
+#X connect 17 0 96 0;
+#X connect 17 0 122 5;
 #X connect 19 0 20 0;
-#X connect 19 0 123 3;
+#X connect 19 0 122 3;
 #X connect 25 0 27 0;
 #X connect 26 0 22 0;
 #X connect 26 1 23 0;
 #X connect 27 0 28 0;
 #X connect 28 0 26 0;
-#X connect 28 0 83 0;
+#X connect 28 0 82 0;
 #X connect 30 0 43 0;
 #X connect 32 0 15 0;
 #X connect 33 0 12 0;
-#X connect 34 0 70 0;
-#X connect 34 0 133 0;
-#X connect 34 0 115 0;
+#X connect 34 0 69 0;
+#X connect 34 0 132 0;
+#X connect 34 0 114 0;
 #X connect 34 0 32 0;
-#X connect 34 0 132 0;
+#X connect 34 0 131 0;
 #X connect 34 0 33 0;
 #X connect 34 0 37 0;
 #X connect 34 0 60 0;
 #X connect 34 0 61 0;
 #X connect 34 0 62 0;
-#X connect 34 0 92 0;
+#X connect 34 0 91 0;
 #X connect 35 0 36 0;
-#X connect 35 0 123 2;
+#X connect 35 0 122 2;
 #X connect 37 0 35 0;
 #X connect 38 0 26 1;
-#X connect 39 0 82 0;
+#X connect 39 0 81 0;
 #X connect 44 0 10 0;
 #X connect 45 0 35 0;
 #X connect 46 0 19 0;
@@ -524,78 +524,78 @@
 #X connect 48 0 17 0;
 #X connect 49 0 12 0;
 #X connect 51 0 52 0;
-#X connect 51 0 123 7;
+#X connect 51 0 122 7;
 #X connect 53 0 51 0;
 #X connect 54 0 55 0;
-#X connect 54 0 123 8;
+#X connect 54 0 122 8;
 #X connect 56 0 54 0;
 #X connect 57 0 58 0;
-#X connect 57 0 123 9;
+#X connect 57 0 122 9;
 #X connect 59 0 57 0;
 #X connect 60 0 51 0;
 #X connect 61 0 54 0;
 #X connect 62 0 57 0;
 #X connect 66 0 17 0;
-#X connect 68 0 10 0;
-#X connect 70 0 123 0;
-#X connect 71 0 80 0;
-#X connect 71 1 78 0;
-#X connect 71 2 76 0;
-#X connect 71 3 74 0;
-#X connect 71 4 136 0;
-#X connect 71 5 72 0;
-#X connect 73 0 28 0;
-#X connect 75 0 19 0;
-#X connect 77 0 35 0;
-#X connect 79 0 10 0;
-#X connect 81 0 2 0;
-#X connect 82 0 38 0;
-#X connect 87 0 17 0;
-#X connect 88 0 123 10;
-#X connect 88 0 139 0;
-#X connect 89 0 88 0;
-#X connect 92 0 88 0;
-#X connect 93 0 123 1;
-#X connect 96 0 17 0;
+#X connect 67 0 1 0;
+#X connect 69 0 122 0;
+#X connect 70 0 79 0;
+#X connect 70 1 77 0;
+#X connect 70 2 75 0;
+#X connect 70 3 73 0;
+#X connect 70 4 135 0;
+#X connect 70 5 71 0;
+#X connect 72 0 28 0;
+#X connect 74 0 19 0;
+#X connect 76 0 35 0;
+#X connect 78 0 10 0;
+#X connect 80 0 2 0;
+#X connect 81 0 38 0;
+#X connect 86 0 17 0;
+#X connect 87 0 122 10;
+#X connect 87 0 138 0;
+#X connect 88 0 87 0;
+#X connect 91 0 87 0;
+#X connect 92 0 122 1;
+#X connect 95 0 17 0;
+#X connect 97 0 98 0;
+#X connect 97 0 137 0;
+#X connect 97 1 117 0;
 #X connect 98 0 99 0;
-#X connect 98 0 138 0;
-#X connect 98 0 1 0;
-#X connect 98 1 118 0;
-#X connect 99 0 100 0;
-#X connect 102 0 98 1;
+#X connect 101 0 97 1;
+#X connect 103 0 105 0;
+#X connect 104 0 109 0;
 #X connect 104 0 106 0;
-#X connect 105 0 110 0;
-#X connect 105 0 107 0;
-#X connect 106 0 105 0;
-#X connect 107 0 108 0;
-#X connect 111 0 106 0;
-#X connect 113 0 112 0;
-#X connect 114 0 112 0;
-#X connect 115 0 19 0;
-#X connect 118 0 119 0;
-#X connect 121 1 5 0;
-#X connect 122 0 2 0;
-#X connect 123 0 31 0;
-#X connect 123 1 84 0;
-#X connect 123 2 134 0;
-#X connect 124 0 127 0;
+#X connect 105 0 104 0;
+#X connect 106 0 107 0;
+#X connect 110 0 105 0;
+#X connect 112 0 111 0;
+#X connect 113 0 111 0;
+#X connect 114 0 19 0;
+#X connect 117 0 118 0;
+#X connect 120 1 5 0;
+#X connect 121 0 2 0;
+#X connect 122 0 31 0;
+#X connect 122 1 83 0;
+#X connect 122 2 133 0;
+#X connect 123 0 126 0;
+#X connect 124 0 123 0;
 #X connect 125 0 124 0;
-#X connect 126 0 125 0;
-#X connect 128 0 118 0;
-#X connect 129 0 99 0;
-#X connect 130 0 3 0;
-#X connect 131 0 107 0;
-#X connect 132 0 17 0;
-#X connect 133 0 10 0;
-#X connect 137 0 6 1;
-#X connect 138 0 116 0;
-#X connect 139 0 91 0;
-#X connect 141 0 71 0;
-#X connect 142 0 71 0;
-#X connect 143 0 71 0;
-#X connect 144 0 71 0;
-#X connect 145 0 17 0;
-#X connect 146 0 19 0;
-#X connect 147 0 88 0;
-#X connect 148 0 10 0;
-#X connect 149 0 67 0;
+#X connect 127 0 117 0;
+#X connect 128 0 98 0;
+#X connect 129 0 3 0;
+#X connect 130 0 106 0;
+#X connect 131 0 17 0;
+#X connect 132 0 10 0;
+#X connect 136 0 6 1;
+#X connect 137 0 115 0;
+#X connect 138 0 90 0;
+#X connect 140 0 70 0;
+#X connect 141 0 70 0;
+#X connect 142 0 70 0;
+#X connect 143 0 70 0;
+#X connect 144 0 17 0;
+#X connect 145 0 19 0;
+#X connect 146 0 87 0;
+#X connect 147 0 10 0;
+#X connect 148 0 67 0;
+#X connect 149 0 10 0;