Mercurial > hg > weather-synthesis-prototyping

changeset 72:966055a97c34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on angle
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Fri, 19 Jun 2015 21:58:03 +0100
parents eb08e5c84f21
children 092e23a82cd0
files June/prop_D1.pd
diffstat 1 files changed, 92 insertions(+), 177 deletions(-) [+]
line wrap: on
line diff
--- a/June/prop_D1.pd	Fri Jun 19 17:47:54 2015 +0100
+++ b/June/prop_D1.pd	Fri Jun 19 21:58:03 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 136 56 1105 841 10;
+#N canvas -2 23 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;
@@ -18,12 +18,10 @@
 #X obj 95 37 r NoOfSources;
 #X obj 74 143 /~ 15;
 #X obj 95 165 /~ 15;
-#X msg 94 111 15;
+#X msg 94 111 50;
 #X connect 1 0 4 0;
 #X connect 2 0 3 0;
-#X connect 3 0 6 0;
 #X connect 3 0 13 0;
-#X connect 4 0 5 0;
 #X connect 4 0 12 0;
 #X connect 5 0 9 0;
 #X connect 6 0 10 0;
@@ -31,7 +29,9 @@
 #X connect 7 0 4 1;
 #X connect 8 0 7 0;
 #X connect 12 0 0 0;
+#X connect 12 0 5 0;
 #X connect 13 0 0 1;
+#X connect 13 0 6 0;
 #X connect 14 0 12 1;
 #X connect 14 0 13 1;
 #X restore 376 -167 pd opLevels;
@@ -212,42 +212,18 @@
 #X restore 226 264 pd speedCalc;
 #X floatatom 135 288 8 0 0 0 - - -;
 #X floatatom 380 286 8 0 0 0 - - -;
-#X msg 4 -235 1;
-#X msg -1 -42 100;
-#X msg 1 -135 0.59;
 #X obj 226 169 r bladeLen;
 #X obj 249 192 r armLength;
 #X obj 272 216 r NoOfSources;
 #X obj 295 241 r topSpeed;
-#X obj 10 -191 s bladeLen;
-#X obj 2 -90 s armLength;
-#X obj -4 3 s NoOfSources;
-#X obj 50 72 s topSpeed;
-#X msg 35 -235 1.2;
-#X msg 66 -235 1.5;
-#X msg 31 -42 50;
-#X msg 64 -42 120;
-#X obj -2 46 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 5500 1;
-#X floatatom -5 72 8 0 0 0 - - -;
-#X obj -11 -211 f;
-#X obj -14 -114 f;
-#X obj -16 -21 f;
-#X floatatom -41 5 5 0 0 0 - - -;
-#X floatatom -39 -89 5 0 0 0 - - -;
-#X floatatom -39 -188 5 0 0 0 - - -;
-#X text 1 -258 Blade Length;
-#X text 0 -152 Arm Length;
-#X text -3 -61 Number of Sources;
-#X text -6 26 Top Speed;
-#X obj -3 122 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 8500 1;
-#X floatatom -6 154 8 0 0 0 - - -;
-#X obj 49 153 s sweepAngle;
-#X text -8 103 Sweep Angle;
+#X obj -62 -210 hsl 100 20 0 3000 0 0 empty empty empty -2 -8 0 10
+-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;
 #X obj 200 288 s firstSpeed;
 #X obj 295 287 s deltaSpeed;
-#X floatatom 156 130 8 0 0 0 - - -;
+#X floatatom 145 59 8 0 0 0 - - -;
 #X floatatom 396 126 8 0 0 0 - - -;
 #N canvas 57 585 305 180 thickCalc 0;
 #X obj 173 86 r NoOfSources;
@@ -274,48 +250,9 @@
 #X restore 205 -36 pd thickCalc;
 #X obj 205 -13 s deltaThick;
 #X floatatom 150 -12 8 0 0 0 - - -;
-#X obj -9 212 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 6200 1;
-#X obj -9 282 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 5800 1;
-#X floatatom -12 242 8 0 0 0 - - -;
-#X obj 42 241 s hiltThick;
-#X floatatom -12 310 8 0 0 0 - - -;
-#X obj 46 309 s tipThick;
-#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 -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
--262144 -1 -1 5200 1;
-#X floatatom -12 382 8 0 0 0 - - -;
-#X text -13 334 Distance to Observer;
-#X floatatom -15 452 8 0 0 0 - - -;
-#X text -15 406 Angle to Observer;
-#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;
-#X obj 258 -241 hsl 100 20 300 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 600 1;
-#X obj 144 -190 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
--1 -1;
-#X obj 144 -137 s setUp;
-#X obj -58 -240 r setUp;
-#X obj -63 -140 r setUp;
-#X obj -60 -48 r setUp;
-#X obj -66 32 r setUp;
-#X obj -64 102 r setUp;
-#X obj -63 185 r setUp;
-#X obj -63 259 r setUp;
-#X obj -64 335 r setUp;
-#X obj -66 402 r setUp;
-#X obj 47 383 s obsDistance;
-#X obj 40 451 s obsAngle;
-#N canvas 447 270 208 198 circumferCalc 1;
+#N canvas 447 270 208 198 circumferCalc 0;
 #X obj 84 45 inlet;
 #X obj 84 69 * 3.14159;
 #X floatatom 26 120 8 0 0 0 - - -;
@@ -325,8 +262,7 @@
 #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 restore 202 35 pd circumferCalc;
 #X obj 306 128 s deltaCircum;
 #N canvas 767 188 758 617 angleCalc 0;
 #X floatatom -252 49 8 0 0 0 - - -;
@@ -450,7 +386,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 690 1;
+-1 -1 390 1;
 #X obj 652 -128 freqCalcWoo;
 #X obj 652 -179 r \$0_thisGroup;
 #X obj 778 -101 *;
@@ -533,112 +469,91 @@
 #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 -66 175 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 5100 1;
+#X obj -69 329 hsl 100 20 100 1 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 9500 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;
+#X text -63 233 Elevation Angle;
+#X text -53 308 Distance;
+#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 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
+#X obj -68 -57 hsl 100 20 0.5 10 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 8600 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;
+#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
 -1 -1 200 1;
-#X floatatom 723 158 5 0 0 0 - - -;
-#X text 697 111 Chord Pitch;
+#X floatatom -72 48 5 0 0 0 - - -;
+#X text -65 1 Chord Pitch;
 #X text 538 -238 Vertical propellor;
-#X obj 213 35 r bladeRadius;
-#X obj 541 202 s bladeRadius;
+#X obj 202 12 r bladeRadius;
+#X obj -34 -29 s bladeRadius;
+#X obj 202 58 s circum;
+#X text -68 -153 RMP (Fine);
+#X text -66 -230 RMP (Coarse);
+#X floatatom -66 -107 8 0 0 0 - - -;
+#X obj -11 -107 s fineRPM;
+#X obj -10 -184 s coarseRPM;
+#X obj -30 203 s obsAzim;
+#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 -29 356 s obsDist;
 #X connect 3 0 5 0;
 #X connect 4 0 0 0;
 #X connect 4 1 1 0;
-#X connect 5 0 85 0;
+#X connect 5 0 29 0;
 #X connect 7 0 8 0;
-#X connect 7 0 41 0;
+#X connect 7 0 17 0;
 #X connect 7 1 9 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;
-#X connect 13 0 7 0;
-#X connect 14 0 7 1;
-#X connect 15 0 7 2;
-#X connect 16 0 7 3;
-#X connect 21 0 27 1;
-#X connect 22 0 27 1;
-#X connect 23 0 29 1;
-#X connect 24 0 29 1;
-#X connect 25 0 20 0;
-#X connect 25 0 26 0;
-#X connect 27 0 17 0;
-#X connect 27 0 32 0;
-#X connect 28 0 18 0;
-#X connect 28 0 31 0;
-#X connect 29 0 19 0;
-#X connect 29 0 30 0;
+#X connect 7 1 18 0;
+#X connect 10 0 7 0;
+#X connect 11 0 7 1;
+#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 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 29 0 4 0;
+#X connect 31 0 30 0;
+#X connect 32 0 37 1;
+#X connect 33 0 32 1;
+#X connect 34 0 35 0;
+#X connect 35 0 32 0;
+#X connect 35 0 41 0;
+#X connect 36 0 37 0;
 #X connect 37 0 38 0;
-#X connect 37 0 39 0;
-#X connect 45 0 46 0;
-#X connect 45 0 47 0;
-#X connect 48 0 50 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 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 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;
+#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 44 0 50 0;
+#X connect 44 0 76 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;