Mercurial > hg > weather-synthesis-prototyping

diff June/prop_D1.pd @ 73:092e23a82cd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Angle sorted. Second source added but requires sorting - individual variables rather than global
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Sat, 20 Jun 2015 22:10:34 +0100
parents 966055a97c34
children bbd6a0d6cb30
line wrap: on
line diff
--- a/June/prop_D1.pd	Fri Jun 19 21:58:03 2015 +0100
+++ b/June/prop_D1.pd	Sat Jun 20 22:10:34 2015 +0100
@@ -19,6 +19,7 @@
 #X obj 74 143 /~ 15;
 #X obj 95 165 /~ 15;
 #X msg 94 111 50;
+#X obj 229 39 inlet;
 #X connect 1 0 4 0;
 #X connect 2 0 3 0;
 #X connect 3 0 13 0;
@@ -34,6 +35,8 @@
 #X connect 13 0 6 0;
 #X connect 14 0 12 1;
 #X connect 14 0 13 1;
+#X connect 15 0 12 1;
+#X connect 15 0 13 1;
 #X restore 376 -167 pd opLevels;
 #X msg 376 -218 5;
 #N canvas 739 151 718 592 source1 0;
@@ -220,7 +223,7 @@
 -262144 -1 -1 0 1;
 #X floatatom -65 -184 8 0 0 0 - - -;
 #X obj -63 -134 hsl 100 20 0 300 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2600 1;
+-1 -1 6200 1;
 #X obj 200 288 s firstSpeed;
 #X obj 295 287 s deltaSpeed;
 #X floatatom 145 59 8 0 0 0 - - -;
@@ -386,7 +389,7 @@
 #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 390 1;
+-1 -1 1100 1;
 #X obj 652 -128 freqCalcWoo;
 #X obj 652 -179 r \$0_thisGroup;
 #X obj 778 -101 *;
@@ -470,9 +473,9 @@
 #X restore 677 -43 pd obsPosition;
 #X obj 525 417 freq3DChord;
 #X obj -66 175 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 5100 1;
+-1 -1 800 1;
 #X obj -69 329 hsl 100 20 100 1 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 9500 1;
+-1 -1 8800 1;
 #X obj -66 254 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 4800 1;
 #X text -62 152 Azimuth Angle;
@@ -481,12 +484,11 @@
 #X floatatom -69 281 5 0 0 0 - - -;
 #X floatatom -72 355 5 0 0 0 - - -;
 #X floatatom -69 203 5 0 0 0 - - -;
-#X obj 525 345 freqCalc3dCh;
 #X obj -68 -57 hsl 100 20 0.5 10 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 8600 1;
+-1 -1 9900 1;
 #X floatatom -71 -29 5 0 0 0 - - -;
 #X obj -70 100 hsl 100 20 0.001 0.1 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5000 1;
+-262144 -1 -1 9900 1;
 #X floatatom -73 127 5 0 0 0 - - -;
 #X text -67 78 Chord Thickness;
 #X obj -69 23 hsl 100 20 0 90 0 0 empty empty empty -2 -8 0 10 -262144
@@ -506,9 +508,20 @@
 #X obj -29 281 s obsElev;
 #X text -59 -79 Blade Radius (m);
 #X obj -37 126 s chordTh;
-#X obj 540 365 r chordTh;
-#X obj 555 387 r obsAzim;
+#X obj 540 352 r chordTh;
 #X obj -29 356 s obsDist;
+#X obj 645 418 freq3DChord;
+#X obj 645 333 freqCalc3dCh;
+#X obj 660 353 r chordTh;
+#X msg 546 277 1;
+#X msg 663 283 2;
+#X msg 654 259 1;
+#X obj 655 227 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X msg 592 263 0;
+#X obj 490 -194 hsl 100 25 1 400 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 400 1;
+#X obj 525 332 freqCalc3dCh;
 #X connect 3 0 5 0;
 #X connect 4 0 0 0;
 #X connect 4 1 1 0;
@@ -522,15 +535,15 @@
 #X connect 12 0 7 2;
 #X connect 13 0 7 3;
 #X connect 14 0 15 0;
-#X connect 14 0 69 0;
+#X connect 14 0 68 0;
+#X connect 16 0 66 0;
 #X connect 16 0 67 0;
-#X connect 16 0 68 0;
 #X connect 21 0 22 0;
 #X connect 21 0 23 0;
 #X connect 24 0 21 0;
 #X connect 25 0 21 1;
 #X connect 26 0 19 0;
-#X connect 26 0 64 0;
+#X connect 26 0 63 0;
 #X connect 29 0 4 0;
 #X connect 31 0 30 0;
 #X connect 32 0 37 1;
@@ -543,17 +556,29 @@
 #X connect 39 0 35 1;
 #X connect 40 0 30 1;
 #X connect 43 0 51 0;
-#X connect 43 0 70 0;
+#X connect 43 0 69 0;
 #X connect 44 0 50 0;
-#X connect 44 0 76 0;
+#X connect 44 0 74 0;
 #X connect 45 0 49 0;
-#X connect 45 0 71 0;
-#X connect 52 0 42 0;
-#X connect 53 0 54 0;
-#X connect 53 0 63 0;
-#X connect 55 0 56 0;
-#X connect 55 0 73 0;
-#X connect 58 0 59 0;
-#X connect 62 0 26 0;
-#X connect 74 0 42 1;
-#X connect 75 0 42 2;
+#X connect 45 0 70 0;
+#X connect 52 0 53 0;
+#X connect 52 0 62 0;
+#X connect 54 0 55 0;
+#X connect 54 0 72 0;
+#X connect 57 0 58 0;
+#X connect 61 0 26 0;
+#X connect 73 0 42 1;
+#X connect 76 0 75 0;
+#X connect 76 1 75 3;
+#X connect 76 2 75 2;
+#X connect 77 0 75 1;
+#X connect 78 0 84 0;
+#X connect 79 0 76 0;
+#X connect 80 0 84 0;
+#X connect 81 0 80 0;
+#X connect 81 0 79 0;
+#X connect 82 0 76 0;
+#X connect 83 0 4 1;
+#X connect 84 0 42 0;
+#X connect 84 1 42 3;
+#X connect 84 2 42 2;