Mercurial > hg > weather-synthesis-prototyping

changeset 181:4c6c8c511a48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TestBed4 - VCFs doubled up on all dipoles and single osc at a magniture of 0.01 compared to the vcf signals.
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Wed, 17 Feb 2016 16:40:48 +0000
parents 158d649c58c1
children 6ab985b939c2
files .DS_Store scene demo/freqCalcCyl3No_D3Mach.pd scene demo/testBedD4.pd
diffstat 3 files changed, 210 insertions(+), 180 deletions(-) [+]
line wrap: on
line diff
Binary file .DS_Store has changed
--- a/scene demo/freqCalcCyl3No_D3Mach.pd	Wed Feb 17 10:39:19 2016 +0000
+++ b/scene demo/freqCalcCyl3No_D3Mach.pd	Wed Feb 17 16:40:48 2016 +0000
@@ -697,39 +697,38 @@
 #X obj 320 424 r~ \$0-myCor;
 #X obj 636 81 max 0.01;
 #X obj 636 104 min 0.99;
-#N canvas 93 119 976 679 Dipoles 0;
+#N canvas 93 119 976 679 Dipoles 1;
 #X obj 76 62 r~ \$0-myFreq;
 #X obj 91 107 r~ \$0-liftDiGain;
 #X obj 76 88 osc~;
 #X obj 76 261 throw~ l;
 #X obj 103 238 throw~ r;
-#X obj 76 195 *~;
 #X obj 76 216 fcpan;
 #X obj 103 195 r \$0-thisPan;
 #X obj 353 69 r~ \$0-myFreq;
-#X obj 368 154 r~ \$0-liftDiGain;
+#X obj 368 135 r~ \$0-liftDiGain;
 #X obj 353 114 osc~;
-#X obj 353 268 throw~ l;
-#X obj 380 245 throw~ r;
-#X obj 353 202 *~;
-#X obj 353 223 fcpan;
-#X obj 380 202 r \$0-thisPan;
-#X obj 368 176 *~ 0.6;
+#X obj 353 285 throw~ l;
+#X obj 380 262 throw~ r;
+#X obj 353 180 *~;
+#X obj 353 240 fcpan;
+#X obj 380 220 r \$0-thisPan;
+#X obj 368 157 *~ 0.6;
 #X obj 621 62 r~ \$0-myFreq;
-#X obj 636 147 r~ \$0-liftDiGain;
+#X obj 636 125 r~ \$0-liftDiGain;
 #X obj 621 107 osc~;
-#X obj 621 261 throw~ l;
-#X obj 648 238 throw~ r;
-#X obj 621 195 *~;
-#X obj 621 216 fcpan;
-#X obj 648 195 r \$0-thisPan;
+#X obj 621 280 throw~ l;
+#X obj 648 257 throw~ r;
+#X obj 621 173 *~;
+#X obj 621 235 fcpan;
+#X obj 648 214 r \$0-thisPan;
 #X obj 621 86 *~ 5;
 #X obj 353 93 *~ 3;
 #X obj 72 345 r~ \$0-myFreq;
 #X obj 72 399 osc~;
 #X obj 72 544 throw~ l;
 #X obj 99 521 throw~ r;
-#X obj 72 478 *~;
+#X obj 72 443 *~;
 #X obj 72 499 fcpan;
 #X obj 99 478 r \$0-thisPan;
 #X obj 87 418 r~ \$0-dragDiGain;
@@ -738,12 +737,12 @@
 #X obj 351 398 osc~;
 #X obj 351 543 throw~ l;
 #X obj 378 520 throw~ r;
-#X obj 351 477 *~;
+#X obj 351 436 *~;
 #X obj 351 498 fcpan;
 #X obj 378 477 r \$0-thisPan;
-#X obj 366 417 r~ \$0-dragDiGain;
+#X obj 385 392 r~ \$0-dragDiGain;
 #X obj 351 372 *~ 4;
-#X obj 366 446 *~ 0.125;
+#X obj 385 415 *~ 0.125;
 #X obj 210 199 *~;
 #X obj 210 264 throw~ l;
 #X obj 237 241 throw~ r;
@@ -765,7 +764,7 @@
 #X obj 750 107 vcf~ 3;
 #X obj 777 182 r \$0-thisPan;
 #X obj 750 65 r~ \$0-thisNoise;
-#X obj 636 169 *~ 0.1;
+#X obj 636 147 *~ 0.1;
 #X obj 217 464 *~;
 #X obj 217 529 throw~ l;
 #X obj 244 506 throw~ r;
@@ -790,108 +789,135 @@
 #X obj 524 364 r \$0-Qval;
 #X obj 250 366 r \$0-Qval;
 #X obj 210 158 *~ 1;
-#X obj 480 138 *~ 1;
-#X obj 750 129 *~ 1;
-#X obj 491 408 *~ 1;
-#X obj 217 410 *~ 1;
+#X obj 480 159 *~ 1;
+#X obj 750 154 *~ 1;
+#X obj 491 428 *~ 1;
+#X obj 217 431 *~ 1;
 #X floatatom 277 122 5 0 0 0 - - -;
 #X obj 210 134 vcf~ 3;
+#X obj 76 145 *~;
+#X obj 480 138 vcf~ 3;
+#X obj 750 131 vcf~ 3;
+#X obj 491 407 vcf~ 3;
+#X obj 217 409 vcf~ 3;
+#X obj 76 174 *~ 0.01;
+#X obj 352 199 *~ 0.01;
+#X obj 621 193 *~ 0.01;
+#X obj 351 457 *~ 0.01;
+#X obj 72 462 *~ 0.01;
 #X connect 0 0 2 0;
-#X connect 0 0 50 1;
-#X connect 0 0 95 1;
-#X connect 1 0 5 1;
-#X connect 1 0 46 1;
-#X connect 2 0 5 0;
-#X connect 5 0 6 0;
-#X connect 6 0 3 0;
-#X connect 6 1 4 0;
-#X connect 7 0 6 1;
-#X connect 8 0 26 0;
-#X connect 9 0 16 0;
-#X connect 10 0 13 0;
-#X connect 13 0 14 0;
-#X connect 14 0 11 0;
-#X connect 14 1 12 0;
-#X connect 15 0 14 1;
-#X connect 16 0 13 1;
-#X connect 16 0 53 1;
-#X connect 17 0 25 0;
-#X connect 18 0 67 0;
-#X connect 19 0 22 0;
-#X connect 22 0 23 0;
-#X connect 23 0 20 0;
-#X connect 23 1 21 0;
-#X connect 24 0 23 1;
-#X connect 25 0 19 0;
-#X connect 25 0 64 1;
-#X connect 26 0 10 0;
-#X connect 26 0 57 1;
-#X connect 27 0 35 0;
-#X connect 28 0 31 0;
-#X connect 31 0 32 0;
-#X connect 32 0 29 0;
-#X connect 32 1 30 0;
-#X connect 33 0 32 1;
-#X connect 34 0 31 1;
-#X connect 34 0 68 1;
-#X connect 35 0 28 0;
-#X connect 35 0 72 1;
-#X connect 36 0 44 0;
-#X connect 37 0 40 0;
-#X connect 40 0 41 0;
-#X connect 41 0 38 0;
-#X connect 41 1 39 0;
-#X connect 42 0 41 1;
-#X connect 43 0 45 0;
-#X connect 44 0 37 0;
-#X connect 44 0 79 1;
-#X connect 45 0 40 1;
-#X connect 45 0 75 1;
-#X connect 46 0 49 0;
-#X connect 49 0 47 0;
-#X connect 49 1 48 0;
-#X connect 50 0 95 0;
-#X connect 51 0 49 1;
-#X connect 52 0 50 0;
-#X connect 53 0 56 0;
-#X connect 56 0 54 0;
-#X connect 56 1 55 0;
-#X connect 57 0 90 0;
-#X connect 58 0 56 1;
-#X connect 59 0 57 0;
-#X connect 60 0 63 0;
-#X connect 63 0 61 0;
-#X connect 63 1 62 0;
-#X connect 64 0 91 0;
-#X connect 65 0 63 1;
-#X connect 66 0 64 0;
-#X connect 67 0 22 1;
-#X connect 67 0 60 1;
-#X connect 68 0 71 0;
-#X connect 71 0 69 0;
-#X connect 71 1 70 0;
-#X connect 72 0 93 0;
-#X connect 73 0 71 1;
-#X connect 74 0 72 0;
-#X connect 75 0 78 0;
-#X connect 78 0 76 0;
-#X connect 78 1 77 0;
-#X connect 79 0 92 0;
-#X connect 80 0 78 1;
-#X connect 81 0 79 0;
-#X connect 84 0 50 2;
-#X connect 84 0 94 0;
-#X connect 84 0 95 2;
-#X connect 85 0 57 2;
-#X connect 86 0 64 2;
-#X connect 87 0 79 2;
-#X connect 88 0 72 2;
-#X connect 89 0 46 0;
-#X connect 90 0 53 0;
-#X connect 91 0 60 0;
-#X connect 92 0 75 0;
-#X connect 93 0 68 0;
-#X connect 95 0 89 0;
+#X connect 0 0 49 1;
+#X connect 0 0 94 1;
+#X connect 1 0 45 1;
+#X connect 1 0 95 1;
+#X connect 2 0 95 0;
+#X connect 5 0 3 0;
+#X connect 5 1 4 0;
+#X connect 6 0 5 1;
+#X connect 7 0 25 0;
+#X connect 8 0 15 0;
+#X connect 9 0 12 0;
+#X connect 12 0 101 0;
+#X connect 13 0 10 0;
+#X connect 13 1 11 0;
+#X connect 14 0 13 1;
+#X connect 15 0 12 1;
+#X connect 15 0 52 1;
+#X connect 16 0 24 0;
+#X connect 17 0 66 0;
+#X connect 18 0 21 0;
+#X connect 21 0 102 0;
+#X connect 22 0 19 0;
+#X connect 22 1 20 0;
+#X connect 23 0 22 1;
+#X connect 24 0 18 0;
+#X connect 24 0 63 1;
+#X connect 24 0 97 1;
+#X connect 25 0 9 0;
+#X connect 25 0 56 1;
+#X connect 25 0 96 1;
+#X connect 26 0 34 0;
+#X connect 27 0 30 0;
+#X connect 30 0 104 0;
+#X connect 31 0 28 0;
+#X connect 31 1 29 0;
+#X connect 32 0 31 1;
+#X connect 33 0 30 1;
+#X connect 33 0 67 1;
+#X connect 34 0 27 0;
+#X connect 34 0 71 1;
+#X connect 34 0 99 1;
+#X connect 35 0 43 0;
+#X connect 36 0 39 0;
+#X connect 39 0 103 0;
+#X connect 40 0 37 0;
+#X connect 40 1 38 0;
+#X connect 41 0 40 1;
+#X connect 42 0 44 0;
+#X connect 43 0 36 0;
+#X connect 43 0 78 1;
+#X connect 43 0 98 1;
+#X connect 44 0 39 1;
+#X connect 44 0 74 1;
+#X connect 45 0 48 0;
+#X connect 48 0 46 0;
+#X connect 48 1 47 0;
+#X connect 49 0 94 0;
+#X connect 50 0 48 1;
+#X connect 51 0 49 0;
+#X connect 52 0 55 0;
+#X connect 55 0 53 0;
+#X connect 55 1 54 0;
+#X connect 56 0 96 0;
+#X connect 57 0 55 1;
+#X connect 58 0 56 0;
+#X connect 59 0 62 0;
+#X connect 62 0 60 0;
+#X connect 62 1 61 0;
+#X connect 63 0 97 0;
+#X connect 64 0 62 1;
+#X connect 65 0 63 0;
+#X connect 66 0 21 1;
+#X connect 66 0 59 1;
+#X connect 67 0 70 0;
+#X connect 70 0 68 0;
+#X connect 70 1 69 0;
+#X connect 71 0 99 0;
+#X connect 72 0 70 1;
+#X connect 73 0 71 0;
+#X connect 74 0 77 0;
+#X connect 77 0 75 0;
+#X connect 77 1 76 0;
+#X connect 78 0 98 0;
+#X connect 79 0 77 1;
+#X connect 80 0 78 0;
+#X connect 83 0 49 2;
+#X connect 83 0 93 0;
+#X connect 83 0 94 2;
+#X connect 84 0 56 2;
+#X connect 84 0 96 2;
+#X connect 85 0 63 2;
+#X connect 85 0 97 2;
+#X connect 86 0 78 2;
+#X connect 86 0 98 2;
+#X connect 87 0 71 2;
+#X connect 87 0 99 2;
+#X connect 88 0 45 0;
+#X connect 89 0 52 0;
+#X connect 90 0 59 0;
+#X connect 91 0 74 0;
+#X connect 92 0 67 0;
+#X connect 94 0 88 0;
+#X connect 95 0 100 0;
+#X connect 96 0 89 0;
+#X connect 97 0 90 0;
+#X connect 98 0 91 0;
+#X connect 99 0 92 0;
+#X connect 100 0 5 0;
+#X connect 101 0 13 0;
+#X connect 102 0 22 0;
+#X connect 103 0 40 0;
+#X connect 104 0 31 0;
 #X restore 649 504 pd Dipoles;
 #X obj 1088 69 noise~;
 #X obj 1088 92 s~ \$0-thisNoise;
@@ -900,13 +926,13 @@
 #X obj 881 424 r myMet;
 #X obj 881 444 snapshot~;
 #X floatatom 881 467 0 0 0 0 - - -;
-#N canvas 153 144 1027 635 StBandwidth 0;
+#N canvas 405 141 1027 635 StBandwidth 1;
 #X obj 444 142 inlet;
 #X obj 460 365 swap 1;
 #X obj 460 391 /;
-#X floatatom 514 414 0 0 0 0 - - -;
+#X floatatom 534 431 0 0 0 0 - - -;
 #X obj 460 342 / 100;
-#X obj 460 415 outlet;
+#X obj 461 434 outlet;
 #X text 437 453 Q value;
 #X obj 531 -36 r~ \$0-myRey;
 #X obj 477 -36 r myMet;
@@ -1018,11 +1044,13 @@
 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 412 438 0 0 0 0 - - -;
 #X connect 0 0 17 0;
 #X connect 1 0 2 0;
 #X connect 1 1 2 1;
 #X connect 2 0 3 0;
-#X connect 2 0 5 0;
+#X connect 2 0 38 0;
 #X connect 4 0 1 0;
 #X connect 7 0 9 0;
 #X connect 8 0 9 0;
@@ -1062,12 +1090,15 @@
 #X connect 30 0 32 0;
 #X connect 30 0 4 0;
 #X connect 31 0 30 0;
+#X connect 38 0 5 0;
+#X connect 38 0 39 0;
 #X restore 1189 91 pd StBandwidth;
 #X obj 1189 67 inlet;
 #X obj 1189 114 s \$0-Qval;
 #X connect 1 0 3 0;
 #X connect 2 0 20 0;
 #X connect 2 0 42 0;
+#X connect 2 0 104 0;
 #X connect 3 0 2 0;
 #X connect 4 0 17 0;
 #X connect 5 0 4 0;
@@ -1092,7 +1123,6 @@
 #X connect 39 0 47 0;
 #X connect 42 0 55 0;
 #X connect 42 0 5 0;
-#X connect 42 0 104 0;
 #X connect 46 0 44 0;
 #X connect 46 1 45 0;
 #X connect 51 0 81 0;
--- a/scene demo/testBedD4.pd	Wed Feb 17 10:39:19 2016 +0000
+++ b/scene demo/testBedD4.pd	Wed Feb 17 16:40:48 2016 +0000
@@ -1,8 +1,8 @@
-#N canvas 63 57 1333 826 10;
+#N canvas 115 35 1333 826 10;
 #X obj 205 -81 loadbang;
 #X obj -208 188 delwrite~ varwind 3000;
 #X obj -98 -63 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 1947 1;
+-1 -1 1439 1;
 #X obj -290 33 snapshot~;
 #X floatatom -290 60 10 0 0 0 - - -;
 #X obj -207 -19 *~ 1;
@@ -10,21 +10,21 @@
 #X text -293 78 Wind Speed;
 #X obj -9 -107 loadbang;
 #X msg -9 -87 5;
-#X obj 254 9 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 3990 1;
-#X floatatom 261 35 8 0 0 0 - - -;
-#X obj 327 285 hsl 128 15 0.009 0.9 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 6999 1;
-#X floatatom 357 314 5 0 0 0 - - -;
+#X obj 252 9 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 903 1;
+#X floatatom 259 35 8 0 0 0 - - -;
+#X obj 320 285 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6350 1;
+#X floatatom 350 314 5 0 0 0 - - -;
 #X text 390 12 Diameter;
-#X obj 297 167 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+#X obj 293 167 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 6350 1;
 #X floatatom 321 196 5 0 0 0 - - -;
-#X obj 312 222 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 9349 1;
+#X obj 306 222 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 2822 1;
 #X floatatom 336 251 5 0 0 0 - - -;
-#X obj 281 110 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 8877 1;
+#X obj 279 110 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 9670 1;
 #X floatatom 295 139 5 0 0 0 - - -;
 #X text 468 286 Pan Value;
 #X obj -233 426 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -67,8 +67,8 @@
 #X connect 15 0 0 1;
 #X restore -234 383 pd opLevels;
 #X msg -225 329 5;
-#X obj -231 354 hsl 100 25 0.1 1e+06 1 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 9900 1;
+#X obj -231 354 hsl 100 25 0.1 1e+07 0 0 empty empty empty -2 -8 0
+10 -262144 -1 -1 3960 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;
@@ -83,27 +83,27 @@
 #X msg 91 268 0.5;
 #X obj 205 -57 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
-#X obj 266 67 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2674 1;
+#X obj 265 67 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 6016 1;
 #X floatatom 287 86 8 0 0 0 - - -;
 #X msg 171 50 4;
 #X obj -114 357 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 0 1;
 #X obj -117 311 loadbang;
 #X text -52 336 No Of Sources;
-#X text 398 51 Length;
+#X text 397 51 Length;
 #X obj 378 -97 s SET_UP;
-#X obj 252 -10 r SET_UP;
-#X obj 321 45 r SET_UP;
-#X obj 392 84 r SET_UP;
-#X obj 382 136 r SET_UP;
-#X obj 394 196 r SET_UP;
-#X obj 401 254 r SET_UP;
-#X text 419 111 Obs Distance;
-#X obj 343 343 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+#X obj 250 -10 r SET_UP;
+#X obj 320 45 r SET_UP;
+#X obj 390 84 r SET_UP;
+#X obj 378 136 r SET_UP;
+#X obj 388 196 r SET_UP;
+#X obj 394 254 r SET_UP;
+#X text 417 111 Obs Distance;
+#X obj 334 343 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 6350 1;
-#X floatatom 380 372 5 0 0 0 - - -;
-#X obj 425 317 r SET_UP;
+#X floatatom 371 372 5 0 0 0 - - -;
+#X obj 416 317 r SET_UP;
 #X obj 347 403 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 6350 1;
 #X floatatom 366 430 5 0 0 0 - - -;
@@ -124,9 +124,9 @@
 #X obj -339 277 s GAIN;
 #X obj -234 283 r GAIN;
 #X obj -381 363 s DIST;
-#X obj 458 84 r DIST;
+#X obj 456 84 r DIST;
 #X obj -402 405 s LEN;
-#X obj 435 44 r LEN;
+#X obj 434 44 r LEN;
 #X obj -423 444 s DIA;
 #X obj 432 -21 r DIA;
 #X obj -444 482 s SPEED;
@@ -134,10 +134,10 @@
 #X msg -117 334 1;
 #X floatatom -291 384 8 0 0 0 - - -;
 #X msg 163 189 90;
-#X text 451 223 Obs Elevation;
-#X text 436 167 Obs Azimuth;
-#X obj 458 192 r ELEV;
-#X obj 491 244 s elev;
+#X text 445 223 Obs Elevation;
+#X text 432 167 Obs Azimuth;
+#X obj 452 192 r ELEV;
+#X obj 485 244 s elev;
 #N canvas 634 290 596 443 windDirection 0;
 #X obj 183 0 inlet~;
 #X obj 280 52 inlet;
@@ -196,9 +196,9 @@
 #X obj -194 117 TUCalc2;
 #X msg 172 233 18.435;
 #X msg 207 84 12.649;
-#X msg 306 -50 0.019;
-#X msg 307 -69 0.0254;
-#X msg 307 -89 0.0127;
+#X msg 304 -50 0.019;
+#X msg 305 -69 0.0254;
+#X msg 305 -89 0.0127;
 #X obj -138 -40 * 0.5;
 #X obj -101 -40 * 0.88;
 #X obj -339 258 line \$1 50;
@@ -209,7 +209,6 @@
 #X obj -444 463 line \$1 50;
 #X obj 249 560 freqCalcCyl3No_D3Mach;
 #X obj -349 61 s WSPEED;
-#X msg -435 137 20 0.01 15 6 77 40000;
 #X obj 574 -64 metro 100;
 #X msg 209 166 0;
 #X obj -194 141 s blust;
@@ -218,13 +217,14 @@
 #X obj 372 532 * 100;
 #X floatatom 390 561 0 0 0 0 - - -;
 #X text 420 531 Free Stream Turbulence Intensity (%);
-#X msg -444 113 23 0.006 5 4 85 40000;
-#X msg -423 165 17 0.0015 10 3 -160 40000;
-#X msg -416 198 28 0.04 7 6 35 40000;
 #X msg -253 101 20;
-#X msg 306 -33 0.004;
+#X msg 304 -33 0.004;
 #X obj 430 489 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4200 1;
+-1 -1 0 1;
+#X msg -444 113 23 0.006 5 4 85 4e+06;
+#X msg -416 198 28 0.04 7 6 35 4e+06;
+#X msg -435 137 24 0.01 15 6 77 4e+06;
+#X msg -423 165 17 0.0015 10 3 -100 4e+06;
 #X connect 0 0 33 0;
 #X connect 2 0 64 0;
 #X connect 2 0 111 0;
@@ -313,15 +313,15 @@
 #X connect 91 0 92 0;
 #X connect 94 0 5 0;
 #X connect 95 0 2 0;
-#X connect 96 0 122 0;
+#X connect 96 0 121 0;
 #X connect 97 0 96 0;
 #X connect 99 0 91 0;
 #X connect 100 0 85 0;
 #X connect 101 0 3 0;
 #X connect 102 0 17 0;
 #X connect 103 0 10 0;
-#X connect 105 0 124 0;
-#X connect 105 0 126 0;
+#X connect 105 0 123 0;
+#X connect 105 0 125 0;
 #X connect 106 0 17 0;
 #X connect 107 0 19 0;
 #X connect 108 0 10 0;
@@ -335,14 +335,14 @@
 #X connect 116 0 71 0;
 #X connect 117 0 73 0;
 #X connect 118 0 75 0;
-#X connect 121 0 66 0;
-#X connect 122 0 98 0;
-#X connect 123 0 17 0;
-#X connect 125 0 127 0;
-#X connect 127 0 128 0;
-#X connect 127 0 119 9;
-#X connect 130 0 66 0;
-#X connect 131 0 66 0;
+#X connect 121 0 98 0;
+#X connect 122 0 17 0;
+#X connect 124 0 126 0;
+#X connect 126 0 127 0;
+#X connect 126 0 119 9;
+#X connect 129 0 63 0;
+#X connect 130 0 10 0;
 #X connect 132 0 66 0;
-#X connect 133 0 63 0;
-#X connect 134 0 10 0;
+#X connect 133 0 66 0;
+#X connect 134 0 66 0;
+#X connect 135 0 66 0;