Mercurial > hg > aeolianharp

diff MechAeolianD3.pd @ 3:432a4398d556 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dipole Gains updated. Wake angle corrected. Scale factors consolidated. 15 05 17
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Mon, 15 May 2017 08:27:39 +0100
parents 12b68fb81455
children
line wrap: on
line diff
--- a/MechAeolianD3.pd	Mon Jan 02 11:26:25 2017 +0000
+++ b/MechAeolianD3.pd	Mon May 15 08:27:39 2017 +0100
@@ -291,8 +291,6 @@
 #X obj 332 446 line~;
 #X msg 332 424 \$1 5;
 #X msg 219 100 \$1 5;
-#X obj 219 317 /~ 400;
-#X text -53 316 Scale factor to bring in line with CFD calcs;
 #X obj 559 214 r~ MY_MACH;
 #X floatatom 265 294 5 0 0 0 - - -;
 #X floatatom 311 117 0 0 0 0 - - -;
@@ -303,13 +301,13 @@
 #X connect 3 0 44 0;
 #X connect 8 0 1 0;
 #X connect 8 0 1 1;
-#X connect 9 0 115 0;
+#X connect 9 0 113 0;
 #X connect 11 0 90 1;
 #X connect 12 0 5 0;
 #X connect 12 0 76 0;
 #X connect 15 0 17 1;
-#X connect 15 0 113 0;
-#X connect 17 0 110 0;
+#X connect 15 0 111 0;
+#X connect 17 0 36 0;
 #X connect 18 0 93 0;
 #X connect 19 0 20 1;
 #X connect 20 0 43 0;
@@ -386,10 +384,9 @@
 #X connect 107 0 40 0;
 #X connect 108 0 107 0;
 #X connect 109 0 95 0;
-#X connect 110 0 36 0;
-#X connect 112 0 48 1;
-#X connect 115 0 109 0;
-#X connect 115 0 114 0;
+#X connect 110 0 48 1;
+#X connect 113 0 109 0;
+#X connect 113 0 112 0;
 #X restore 83 325 pd GoldfreqGain;
 #N canvas 300 30 1006 797 GoldnoiseGain 0;
 #X text -21037 364 Mass Density of Air \, squared;
@@ -506,11 +503,9 @@
 #X obj -20720 502 *~;
 #X obj -20777 530 *~;
 #X obj -20861 574 /~;
-#X obj -20624 194 -~;
 #X text -20533 187 Angle goes with the flow in Goldstein hence 90 -
 theta so that theta is same angle as dipole angles.;
-#X obj -20624 149 sig~ 180;
-#X obj -20609 172 r~ \$0-this_elev;
+#X obj -20624 172 r~ \$0-this_elev;
 #X obj -20916 137 inlet~;
 #X obj -20916 164 *~;
 #X obj -20828 253 inlet~;
@@ -575,23 +570,23 @@
 #X text -20929 530 Sqrt(2*pi);
 #X obj -20609 328 r~ MY_MACH;
 #X obj -20861 488 /~ 10000;
-#X connect 1 0 60 0;
-#X connect 3 0 46 1;
-#X connect 4 0 53 0;
-#X connect 5 0 45 1;
+#X connect 1 0 58 0;
+#X connect 3 0 44 1;
+#X connect 4 0 51 0;
+#X connect 5 0 43 1;
 #X connect 6 0 1 0;
 #X connect 6 0 1 1;
 #X connect 13 0 17 0;
-#X connect 13 0 62 0;
+#X connect 13 0 60 0;
 #X connect 14 0 16 0;
-#X connect 14 0 58 0;
-#X connect 20 0 49 0;
-#X connect 21 0 65 0;
+#X connect 14 0 56 0;
+#X connect 20 0 47 0;
+#X connect 21 0 63 0;
 #X connect 22 0 35 1;
 #X connect 23 0 22 0;
 #X connect 24 0 34 1;
 #X connect 25 0 26 0;
-#X connect 26 0 66 0;
+#X connect 26 0 64 0;
 #X connect 27 0 29 1;
 #X connect 28 0 29 0;
 #X connect 29 0 24 0;
@@ -603,36 +598,34 @@
 #X connect 34 0 35 0;
 #X connect 35 0 36 1;
 #X connect 36 0 37 1;
-#X connect 37 0 64 0;
-#X connect 38 0 25 0;
-#X connect 40 0 38 0;
-#X connect 41 0 38 1;
+#X connect 37 0 62 0;
+#X connect 39 0 25 0;
+#X connect 40 0 41 0;
+#X connect 40 0 41 1;
+#X connect 41 0 44 0;
 #X connect 42 0 43 0;
-#X connect 42 0 43 1;
-#X connect 43 0 46 0;
+#X connect 43 0 45 1;
 #X connect 44 0 45 0;
-#X connect 45 0 47 1;
-#X connect 46 0 47 0;
-#X connect 47 0 20 0;
-#X connect 48 0 49 1;
-#X connect 49 0 70 0;
-#X connect 50 0 37 0;
-#X connect 53 0 56 0;
+#X connect 45 0 20 0;
+#X connect 46 0 47 1;
+#X connect 47 0 68 0;
+#X connect 48 0 37 0;
+#X connect 51 0 54 0;
+#X connect 52 0 51 0;
+#X connect 53 0 3 0;
 #X connect 54 0 53 0;
-#X connect 55 0 3 0;
+#X connect 55 0 19 0;
 #X connect 56 0 55 0;
-#X connect 57 0 19 0;
+#X connect 57 0 36 0;
 #X connect 58 0 57 0;
-#X connect 59 0 36 0;
+#X connect 59 0 18 0;
 #X connect 60 0 59 0;
-#X connect 61 0 18 0;
-#X connect 62 0 61 0;
-#X connect 63 0 66 1;
-#X connect 64 0 7 0;
-#X connect 65 0 63 0;
-#X connect 66 0 27 0;
-#X connect 69 0 27 1;
-#X connect 70 0 50 0;
+#X connect 61 0 64 1;
+#X connect 62 0 7 0;
+#X connect 63 0 61 0;
+#X connect 64 0 27 0;
+#X connect 67 0 27 1;
+#X connect 68 0 48 0;
 #X restore 64 570 pd GoldnoiseGain;
 #X text 55 617 Calculates the gain of the wake;
 #X obj 467 82 s \$0-azim;
@@ -687,8 +680,6 @@
 #X obj 636 104 min 0.99;
 #N canvas 125 74 950 728 Dipoles 0;
 #X obj 225 154 r~ \$0-liftDiGain;
-#X obj 495 160 r~ \$0-liftDiGain;
-#X obj 495 182 *~ 0.6;
 #X obj 381 91 *~ 3;
 #X obj 468 490 r~ \$0-dragDiGain;
 #X obj 354 400 *~ 2;
@@ -743,59 +734,73 @@
 #X obj 495 248 r~ \$0-reyGain;
 #X obj 453 577 *~;
 #X obj 468 555 r~ \$0-reyGain;
-#X connect 0 0 6 1;
-#X connect 1 0 2 0;
-#X connect 2 0 12 1;
-#X connect 3 0 15 1;
-#X connect 3 0 31 1;
-#X connect 4 0 18 1;
-#X connect 5 0 21 1;
-#X connect 5 0 32 1;
-#X connect 6 0 41 0;
-#X connect 9 0 30 0;
-#X connect 10 0 38 1;
-#X connect 11 0 9 0;
-#X connect 12 0 42 0;
-#X connect 15 0 31 0;
-#X connect 16 0 39 1;
-#X connect 17 0 15 0;
-#X connect 18 0 43 0;
-#X connect 21 0 32 0;
-#X connect 22 0 40 1;
-#X connect 23 0 21 0;
-#X connect 26 0 9 2;
-#X connect 26 0 29 0;
+#X obj 710 118 r~ \$0-liftDiGain;
+#X obj 689 217 pow~;
+#X obj 689 97 sig~ 10;
+#X obj 710 140 /~ 2e-05;
+#X obj 689 240 *~ 2e-05;
+#X obj 710 190 *~ 0.6;
+#X obj 710 167 log~ 10;
+#X obj 782 143 sig~ 10;
+#X connect 0 0 4 1;
+#X connect 1 0 13 1;
+#X connect 1 0 29 1;
+#X connect 2 0 16 1;
+#X connect 3 0 19 1;
+#X connect 3 0 30 1;
+#X connect 4 0 39 0;
+#X connect 7 0 28 0;
+#X connect 8 0 36 1;
+#X connect 9 0 7 0;
+#X connect 10 0 40 0;
+#X connect 13 0 29 0;
+#X connect 14 0 37 1;
+#X connect 15 0 13 0;
+#X connect 16 0 41 0;
+#X connect 19 0 30 0;
+#X connect 20 0 38 1;
+#X connect 21 0 19 0;
+#X connect 24 0 7 2;
+#X connect 24 0 27 0;
+#X connect 24 0 28 2;
+#X connect 25 0 13 2;
+#X connect 25 0 29 2;
+#X connect 26 0 19 2;
 #X connect 26 0 30 2;
-#X connect 27 0 15 2;
-#X connect 27 0 31 2;
-#X connect 28 0 21 2;
-#X connect 28 0 32 2;
-#X connect 30 0 6 0;
-#X connect 31 0 12 0;
-#X connect 32 0 18 0;
-#X connect 33 0 34 0;
-#X connect 35 0 9 1;
-#X connect 35 0 30 1;
-#X connect 36 0 3 0;
-#X connect 37 0 5 0;
-#X connect 38 0 7 0;
-#X connect 38 1 8 0;
-#X connect 39 0 13 0;
-#X connect 39 1 14 0;
-#X connect 40 0 19 0;
-#X connect 40 1 20 0;
-#X connect 41 0 46 0;
-#X connect 42 0 48 0;
-#X connect 43 0 50 0;
-#X connect 44 0 42 1;
-#X connect 44 0 41 1;
-#X connect 44 0 43 1;
-#X connect 46 0 38 0;
+#X connect 28 0 4 0;
+#X connect 29 0 10 0;
+#X connect 30 0 16 0;
+#X connect 31 0 32 0;
+#X connect 33 0 7 1;
+#X connect 33 0 28 1;
+#X connect 34 0 1 0;
+#X connect 35 0 3 0;
+#X connect 36 0 5 0;
+#X connect 36 1 6 0;
+#X connect 37 0 11 0;
+#X connect 37 1 12 0;
+#X connect 38 0 17 0;
+#X connect 38 1 18 0;
+#X connect 39 0 44 0;
+#X connect 40 0 46 0;
+#X connect 41 0 48 0;
+#X connect 42 0 40 1;
+#X connect 42 0 39 1;
+#X connect 42 0 41 1;
+#X connect 44 0 36 0;
+#X connect 45 0 44 1;
+#X connect 46 0 37 0;
 #X connect 47 0 46 1;
-#X connect 48 0 39 0;
+#X connect 48 0 38 0;
 #X connect 49 0 48 1;
-#X connect 50 0 40 0;
-#X connect 51 0 50 1;
+#X connect 50 0 53 0;
+#X connect 51 0 54 0;
+#X connect 52 0 51 0;
+#X connect 53 0 56 0;
+#X connect 54 0 10 1;
+#X connect 55 0 51 1;
+#X connect 56 0 55 0;
+#X connect 57 0 56 1;
 #X restore 474 688 pd Dipoles;
 #X obj 1088 69 noise~;
 #X obj 1088 92 s~ \$0-thisNoise;