Mercurial > hg > weather-synthesis-prototyping

changeset 163:cd70d8030807

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
distance calculations started (Sword)
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Thu, 28 Jan 2016 21:13:15 +0000
parents 4ba5de5beb5c
children 2bcf178dcf1f
files newSword/freqCalcCyl3No_D2Mach.pd newSword/newSword.pd
diffstat 2 files changed, 139 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/newSword/freqCalcCyl3No_D2Mach.pd	Wed Jan 27 19:22:34 2016 +0000
+++ b/newSword/freqCalcCyl3No_D2Mach.pd	Thu Jan 28 21:13:15 2016 +0000
@@ -14,7 +14,7 @@
 #X obj 220 76 s \$0-diameter;
 #X obj 760 168 r \$0-diameter;
 #X obj 767 343 r \$0-diameter;
-#X obj 110 77 s~ \$0-windSpeed;
+#X obj 110 94 s~ \$0-windSpeed;
 #X obj 766 320 r~ \$0-windSpeed;
 #X obj 699 141 r~ \$0-windSpeed;
 #X obj 699 386 s~ \$0-myFreq;
@@ -98,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 *~;
@@ -1067,7 +1067,8 @@
 #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 obj 110 52 inlet;
+#X obj 110 73 sig~;
 #X connect 1 0 3 0;
 #X connect 2 0 24 0;
 #X connect 2 0 178 0;
@@ -1192,4 +1193,5 @@
 #X connect 176 0 175 0;
 #X connect 178 0 69 0;
 #X connect 178 0 6 0;
-#X connect 179 0 15 0;
+#X connect 179 0 180 0;
+#X connect 180 0 15 0;
--- a/newSword/newSword.pd	Wed Jan 27 19:22:34 2016 +0000
+++ b/newSword/newSword.pd	Thu Jan 28 21:13:15 2016 +0000
@@ -77,11 +77,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 0 1;
+-262144 -1 -1 5346 1;
 #X obj -275 233 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 0 1;
+-262144 -1 -1 4950 1;
 #X obj -275 324 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 0 1;
+-262144 -1 -1 4950 1;
 #X obj -277 162 s Xobs;
 #X obj -278 253 s Yobs;
 #X obj -278 351 s Zobs;
@@ -382,7 +382,7 @@
 #X connect 41 0 31 0;
 #X connect 42 0 34 0;
 #X restore 383 132 pd motion;
-#N canvas 143 209 714 620 speedCalc 0;
+#N canvas 452 151 714 620 speedCalc 0;
 #X obj -11 22 r azimuth;
 #X obj 134 18 r elevation;
 #X floatatom 218 40 5 0 0 0 - - -;
@@ -408,6 +408,14 @@
 #X floatatom 91 190 5 0 0 0 - - -;
 #X obj 178 94 delay 20;
 #X obj 136 167 abs;
+#X obj -11 167 *;
+#X obj 137 192 *;
+#X obj 10 218 +;
+#X obj 16 261 sqrt;
+#X floatatom -13 294 0 0 0 0 - - -;
+#X obj 19 297 outlet;
+#X obj 27 189 t f b;
+#X obj 58 231 delay 10;
 #X connect 0 0 6 0;
 #X connect 0 0 15 0;
 #X connect 0 0 16 0;
@@ -427,16 +435,29 @@
 #X connect 16 1 18 0;
 #X connect 18 0 15 0;
 #X connect 19 0 17 0;
+#X connect 19 0 25 0;
+#X connect 19 0 25 1;
 #X connect 20 0 24 0;
 #X connect 21 0 20 1;
 #X connect 21 1 23 0;
 #X connect 23 0 20 0;
 #X connect 24 0 22 0;
+#X connect 24 0 26 0;
+#X connect 24 0 26 1;
+#X connect 25 0 27 0;
+#X connect 26 0 31 0;
+#X connect 27 0 28 0;
+#X connect 28 0 29 0;
+#X connect 28 0 30 0;
+#X connect 31 0 27 1;
+#X connect 31 1 27 0;
+#X connect 31 1 32 0;
+#X connect 32 0 27 0;
 #X restore 384 155 pd speedCalc;
-#X obj 327 327 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
-#X obj 390 327 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
-#X text 387 236 Gain;
-#X obj 335 207 loadbang;
+#X obj 326 541 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj 389 541 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X text 386 450 Gain;
+#X obj 334 421 loadbang;
 #N canvas 555 179 313 396 opLevels 0;
 #X obj 74 322 dac~;
 #X obj 30 70 catch~ l;
@@ -471,17 +492,17 @@
 #X connect 13 0 4 1;
 #X connect 14 0 0 0;
 #X connect 15 0 0 1;
-#X restore 326 284 pd opLevels;
-#X msg 335 230 5;
-#X obj 329 255 hsl 100 25 0.1 1e+06 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 0 1;
-#X obj 446 258 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144
+#X restore 325 498 pd opLevels;
+#X msg 334 444 5;
+#X obj 328 469 hsl 100 25 0.1 1e+06 1 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6800 1;
+#X obj 445 472 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 0 1;
-#X obj 443 212 loadbang;
-#X text 508 237 No Of Sources;
-#X obj 326 184 r GAIN;
-#X msg 443 235 1;
-#X floatatom 269 285 8 0 0 0 - - -;
+#X obj 442 426 loadbang;
+#X text 507 451 No Of Sources;
+#X obj 325 398 r GAIN;
+#X msg 442 449 1;
+#X floatatom 268 499 8 0 0 0 - - -;
 #X obj 315 63 metro 1;
 #N canvas 916 347 450 300 PlayCont 0;
 #X obj 206 41 hid;
@@ -526,7 +547,86 @@
 #X connect 15 0 14 0;
 #X connect 17 0 12 0;
 #X connect 18 0 0 0;
-#X restore 655 476 pd PlayCont;
+#X restore 383 178 pd PlayCont;
+#X msg 715 113 0;
+#X msg 685 95 0.5;
+#X obj 708 43 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X floatatom 632 262 0 0 0 0 - - -;
+#X obj 654 25 r elevation;
+#X obj 654 1 r azimuth;
+#X msg 606 118 4;
+#X obj 534 45 r deltaThick;
+#N canvas 666 64 743 705 Distance 0;
+#X obj 51 47 r Xobs;
+#X obj 103 47 r Yobs;
+#X obj 152 47 r Zobs;
+#X obj 51 73 *;
+#X obj 103 71 *;
+#X obj 152 71 *;
+#X obj 88 99 +;
+#X obj 88 131 +;
+#X obj 88 158 sqrt;
+#X floatatom 45 180 0 0 0 0 - - -;
+#X text 26 23 Distance between observer and centre of arc;
+#X obj 332 43 r totLength;
+#X obj 333 67 *;
+#X obj 243 89 r azimuth;
+#X obj 527 51 r elevation;
+#X obj 289 43 r Xobs;
+#X obj 289 69 *;
+#X obj 327 114 *;
+#X obj 307 88 * -2;
+#X obj 243 136 cos;
+#X obj 312 167 *;
+#X obj 265 168 +;
+#X obj 312 198 +;
+#X obj 312 221 sqrt;
+#X floatatom 284 246 0 0 0 0 - - -;
+#X obj 243 110 * 0.01745;
+#X floatatom 379 72 5 0 0 0 - - -;
+#X obj 338 93 t f b;
+#X obj 330 140 t f b;
+#X obj 265 194 t f b;
+#X obj 283 142 t f b;
+#X connect 0 0 3 0;
+#X connect 0 0 3 1;
+#X connect 1 0 4 0;
+#X connect 1 0 4 1;
+#X connect 2 0 5 0;
+#X connect 2 0 5 1;
+#X connect 3 0 6 0;
+#X connect 4 0 6 1;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 11 0 12 0;
+#X connect 11 0 12 1;
+#X connect 11 0 26 0;
+#X connect 11 0 27 0;
+#X connect 12 0 30 0;
+#X connect 13 0 25 0;
+#X connect 15 0 16 0;
+#X connect 15 0 16 1;
+#X connect 15 0 18 0;
+#X connect 16 0 21 0;
+#X connect 17 0 28 0;
+#X connect 18 0 17 0;
+#X connect 19 0 20 0;
+#X connect 20 0 22 0;
+#X connect 21 0 29 0;
+#X connect 22 0 23 0;
+#X connect 23 0 24 0;
+#X connect 25 0 19 0;
+#X connect 27 0 17 1;
+#X connect 27 1 17 0;
+#X connect 28 0 20 1;
+#X connect 29 0 22 1;
+#X connect 29 1 22 0;
+#X connect 30 0 21 1;
+#X connect 30 1 21 0;
+#X restore 450 252 pd Distance;
 #X connect 1 0 2 0;
 #X connect 2 0 140 0;
 #X connect 7 0 6 0;
@@ -608,6 +708,7 @@
 #X connect 106 0 13 0;
 #X connect 107 0 13 0;
 #X connect 108 0 50 0;
+#X connect 126 0 0 0;
 #X connect 130 0 132 0;
 #X connect 131 0 127 0;
 #X connect 131 1 128 0;
@@ -619,3 +720,16 @@
 #X connect 137 0 133 0;
 #X connect 138 0 134 0;
 #X connect 140 0 3 0;
+#X connect 142 0 0 10;
+#X connect 142 0 0 9;
+#X connect 142 0 0 8;
+#X connect 142 0 0 7;
+#X connect 143 0 0 6;
+#X connect 144 0 142 0;
+#X connect 144 0 143 0;
+#X connect 144 0 148 0;
+#X connect 146 0 0 5;
+#X connect 147 0 0 4;
+#X connect 148 0 0 3;
+#X connect 148 0 0 2;
+#X connect 149 0 0 1;