Mercurial > hg > weather-synthesis-prototyping

diff Propellor/PropTestD2.pd @ 275:f2f885826de8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Propeller: Continually examining the changing angles for the Goldstien gain equaitons. Cavity: Small edits while completing paper
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Fri, 17 Feb 2017 12:28:48 +0000
parents 07458a0cfdab
children
line wrap: on
line diff
--- a/Propellor/PropTestD2.pd	Sat Feb 11 20:59:37 2017 +0000
+++ b/Propellor/PropTestD2.pd	Fri Feb 17 12:28:48 2017 +0000
@@ -4,7 +4,7 @@
 1;
 #X obj 405 79 s myMet;
 #X obj -251 527 hsl 70 15 0 2500 0 0 empty empty RPM 2 8 0 10 -262144
--1 -1 6264 1;
+-1 -1 4836 1;
 #X floatatom 76 540 0 0 0 0 - - -;
 #X obj 143 73 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
 -1;
@@ -48,7 +48,7 @@
 #X connect 7 0 3 1;
 #X restore 223 371 pd opLevels;
 #X obj 77 426 hsl 100 25 0.01 1e+07 1 0 empty empty Gain 2 13 0 10
--261682 -1 -66577 4400 1;
+-261682 -1 -66577 5400 1;
 #X obj 76 329 r GAIN;
 #X floatatom 227 52 5 0 0 0 - - -;
 #X obj -278 417 hsl 70 15 0.1 3 0 0 empty empty Blade_Length 2 8 0
@@ -62,7 +62,7 @@
 #X obj -203 484 loadbang;
 #X msg -203 504 0;
 #X obj 78 509 hsl 100 20 0 1 0 0 empty empty Throttle 2 10 0 10 -204800
--1 -1 8988 1;
+-1 -1 6938 1;
 #X text 131 539 RPM;
 #X floatatom 74 459 0 0 0 0 - - -;
 #N canvas 693 34 1095 835 rotNoise 0;
@@ -3947,12 +3947,12 @@
 #X obj -296 723 s~ noBlad;
 #X obj -296 617 loadbang;
 #X obj 355 429 hsl 70 15 1e-05 1000 1 0 empty empty Rot_Boost 2 8 0
-10 -203904 -1 -1 5197 1;
+10 -203904 -1 -1 0 1;
 #X floatatom 527 344 0 0 0 0 - - -;
 #X obj 448 280 loadbang;
 #X floatatom -221 172 0 0 0 0 - - -;
 #X obj 456 425 hsl 70 15 0 500 0 0 empty empty Horse_Power 2 8 0 10
--262144 -1 -1 5130 1;
+-262144 -1 -1 4830 1;
 #X obj -57 700 line~;
 #X msg -57 680 \$1 30;
 #X obj -57 743 s~ horseP;
@@ -5930,13 +5930,13 @@
 #X obj 324 28 r~ RPM;
 #X obj 324 49 /~ 60;
 #X obj 355 459 hsl 70 15 1e-07 0.01 1 0 empty empty Broad_Boost 2 8
-0 10 -204786 -1 -1 4209 1;
+0 10 -204786 -1 -1 5509 1;
 #X floatatom 515 198 0 0 0 0 - - -;
 #X obj 448 156 loadbang;
 #X obj 448 237 line~;
 #X msg 448 217 \$1 30;
 #X obj 448 257 s~ broBoost;
-#N canvas 365 218 1002 525 sources 0;
+#N canvas 365 218 1002 525 sources 1;
 #X text 480 -91 Patch that holds all the sources that are used to produce
 the basic aeolian tone.;
 #N canvas 216 23 1030 283 sourceAASpeed 0;
@@ -7359,7 +7359,7 @@
 #X connect 41 0 4 1;
 #X connect 41 0 37 4;
 #X restore 358 246 pd sourcePositions;
-#N canvas 223 181 1103 599 sourcePositions 0;
+#N canvas 223 181 1103 599 sourcePositions 1;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
 #X obj 185 256 -~;
@@ -7397,7 +7397,7 @@
 #X obj 86 140 sig~ 0;
 #X obj 170 142 inlet~;
 #X obj 256 150 inlet~;
-#N canvas 289 166 1084 684 prop________Angs 0;
+#N canvas 289 166 1084 684 prop________Angs 1;
 #X obj 378 47 inlet~;
 #X obj 461 46 inlet~;
 #X obj 568 43 inlet~;
@@ -7442,6 +7442,9 @@
 #X obj 526 562 arccos~;
 #X obj 554 598 outlet~;
 #X obj 781 473 arccos~;
+#X obj 796 571 r myMet;
+#X obj 796 593 snapshot~;
+#X floatatom 796 616 0 0 0 0 - - -;
 #X connect 0 0 34 0;
 #X connect 0 0 34 1;
 #X connect 1 0 18 0;
@@ -7484,6 +7487,8 @@
 #X connect 38 0 39 0;
 #X connect 39 0 40 0;
 #X connect 41 0 30 1;
+#X connect 42 0 43 0;
+#X connect 43 0 44 0;
 #X restore 436 379 pd prop________Angs;
 #X obj 418 155 inlet~;
 #X obj 101 229 r~ Xobs;
@@ -7539,17 +7544,17 @@
 #X connect 41 0 37 4;
 #X restore 619 260 pd sourcePositions;
 #X obj 560 -9 inlet;
+#X obj 607 312 freqCalcCyl6HiFi;
 #X obj 125 290 freqCalcCyl6HiFi;
 #X obj 20 168 freqCalcCyl6HiFi;
 #X obj 217 146 freqCalcCyl6HiFi;
 #X obj 426 145 freqCalcCyl6HiFi;
-#X obj 607 312 freqCalcCyl6HiFi;
 #X obj 662 145 freqCalcCyl6HiFi;
 #X obj 348 304 freqCalcCyl6HiFi;
-#X connect 1 0 20 0;
+#X connect 1 0 21 0;
 #X connect 1 1 11 0;
 #X connect 1 2 11 1;
-#X connect 1 3 20 1;
+#X connect 1 3 21 1;
 #X connect 1 4 11 2;
 #X connect 2 0 9 0;
 #X connect 2 0 10 0;
@@ -7560,35 +7565,35 @@
 #X connect 2 0 8 0;
 #X connect 2 0 7 0;
 #X connect 2 0 6 0;
-#X connect 3 0 21 0;
+#X connect 3 0 22 0;
 #X connect 3 1 12 0;
 #X connect 3 2 12 1;
-#X connect 3 3 21 1;
+#X connect 3 3 22 1;
 #X connect 3 4 12 2;
-#X connect 4 0 22 0;
+#X connect 4 0 23 0;
 #X connect 4 1 13 0;
 #X connect 4 2 13 1;
-#X connect 4 3 22 1;
+#X connect 4 3 23 1;
 #X connect 4 4 13 2;
 #X connect 5 0 24 0;
 #X connect 5 1 14 0;
 #X connect 5 2 14 1;
 #X connect 5 3 24 1;
 #X connect 5 4 14 2;
-#X connect 6 0 19 0;
+#X connect 6 0 20 0;
 #X connect 6 1 15 0;
 #X connect 6 2 15 1;
-#X connect 6 3 19 1;
+#X connect 6 3 20 1;
 #X connect 6 4 15 2;
 #X connect 7 0 25 0;
 #X connect 7 1 16 0;
 #X connect 7 2 16 1;
 #X connect 7 3 25 1;
 #X connect 7 4 16 2;
-#X connect 8 0 23 0;
+#X connect 8 0 19 0;
 #X connect 8 1 17 0;
 #X connect 8 2 17 1;
-#X connect 8 3 23 1;
+#X connect 8 3 19 1;
 #X connect 8 4 17 2;
 #X connect 9 0 19 6;
 #X connect 9 0 20 6;
@@ -7597,27 +7602,27 @@
 #X connect 9 0 23 6;
 #X connect 9 0 24 6;
 #X connect 9 0 25 6;
-#X connect 11 0 20 2;
-#X connect 11 1 20 3;
-#X connect 11 2 20 4;
-#X connect 12 0 21 2;
-#X connect 12 1 21 3;
-#X connect 12 2 21 4;
-#X connect 13 0 22 2;
-#X connect 13 1 22 3;
-#X connect 13 2 22 4;
+#X connect 11 0 21 2;
+#X connect 11 1 21 3;
+#X connect 11 2 21 4;
+#X connect 12 0 22 2;
+#X connect 12 1 22 3;
+#X connect 12 2 22 4;
+#X connect 13 0 23 2;
+#X connect 13 1 23 3;
+#X connect 13 2 23 4;
 #X connect 14 0 24 2;
 #X connect 14 1 24 3;
 #X connect 14 2 24 4;
-#X connect 15 0 19 2;
-#X connect 15 1 19 3;
-#X connect 15 2 19 4;
+#X connect 15 0 20 2;
+#X connect 15 1 20 3;
+#X connect 15 2 20 4;
 #X connect 16 0 25 2;
 #X connect 16 1 25 3;
 #X connect 16 2 25 4;
-#X connect 17 0 23 2;
-#X connect 17 1 23 3;
-#X connect 17 2 23 4;
+#X connect 17 0 19 2;
+#X connect 17 1 19 3;
+#X connect 17 2 19 4;
 #X connect 18 0 19 5;
 #X connect 18 0 20 5;
 #X connect 18 0 21 5;
@@ -7763,13 +7768,12 @@
 #X connect 9 0 13 0;
 #X connect 10 0 16 0;
 #X connect 12 0 13 1;
-#X connect 13 0 4 0;
 #X connect 14 0 8 1;
 #X connect 15 0 0 0;
 #X connect 16 0 1 0;
 #X restore 277 205 pd andyEngine;
 #X obj 356 488 hsl 70 15 0.1 2000 1 0 empty empty Engine_Boost 2 8
-0 10 -261234 -1 -1 4101 1;
+0 10 -261234 -1 -1 0 1;
 #X obj -57 720 *~;
 #X obj -17 701 line~;
 #X msg -17 681 \$1 30;
@@ -8302,10 +8306,10 @@
 #X restore -264 49 pd observerPosition;
 #N canvas 183 73 1117 782 PropellerAngles 0;
 #X obj 65 29 hsl 80 20 -10 10 0 0 empty empty Yaw 2 10 0 10 -262144
--1 -1 3000 1;
+-1 -1 3950 1;
 #X floatatom 227 55 0 0 0 0 - - -;
 #X obj 281 29 hsl 80 20 -180 180 0 0 empty empty Roll 2 10 0 10 -262144
--1 -1 4250 1;
+-1 -1 3950 1;
 #X floatatom 335 57 0 0 0 0 - - -;
 #X text 36 -64 Yaw \, Pitch & Roll at 0 \, 0 \, 0 means flying stright
 and level.;
@@ -8408,7 +8412,7 @@
 #X obj 547 570 s~ Yprop;
 #X obj 694 574 s~ Zprop;
 #X obj 172 -32 vsl 25 80 -10 10 0 0 empty empty Pitch 0 -9 0 10 -262144
--1 -1 4300 1;
+-1 -1 3950 1;
 #X msg 278 6 0;
 #X msg 61 2 0;
 #X msg 671 34 50;
@@ -8556,7 +8560,7 @@
 #X obj 595 549 bng 25 250 50 0 empty empty F 11 11 0 10 -204786 -1
 -1;
 #X obj 622 549 tgl 25 0 empty empty empty 17 7 0 10 -204786 -4034 -4034
-0 1;
+1 1;
 #N canvas 638 23 1079 777 Angles 0;
 #X obj 89 46 *~;
 #X obj 153 47 *~;
@@ -8832,7 +8836,7 @@
 #X msg -42 355 0.8;
 #X obj 764 646 +~ 0.7;
 #X obj 752 480 hsl 100 20 0 1 0 0 empty empty Throttle 2 10 0 10 -204800
--1 -1 9000 1;
+-1 -1 0 1;
 #X obj 747 607 *~ 0.8;
 #X connect 0 0 1 0;
 #X connect 1 0 113 0;