Mercurial > hg > weather-synthesis-prototyping

diff SwordCorInterpS/freqCalcCyl4HiFiS.pd @ 216:f461a0f5d471

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Swordsman added Mechanical testbed updated - have a basic working prototype
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Mon, 09 May 2016 17:19:54 +0100
parents 99f0fdbd4c70
children
line wrap: on
line diff
--- a/SwordCorInterpS/freqCalcCyl4HiFiS.pd	Sat Apr 09 16:30:13 2016 +0100
+++ b/SwordCorInterpS/freqCalcCyl4HiFiS.pd	Mon May 09 17:19:54 2016 +0100
@@ -291,7 +291,6 @@
 #X obj 534 59 inlet~;
 #X obj 393 84 s~ \$0-dist;
 #X obj 120 65 inlet~;
-#X obj 52 88 /~ 343.56;
 #X obj 52 111 s~ \$0-MY_MACH;
 #X obj 391 245 r~ \$0-dist;
 #X obj 410 266 r~ \$0-elev;
@@ -455,7 +454,6 @@
 #X obj 525 166 r~ \$0-this_elev;
 #X obj 411 135 r~ \$0-thisDist;
 #X obj 411 161 *~;
-#X obj 411 191 *~ 4.05513e+07;
 #X obj 411 244 *~ 32;
 #X obj 234 443 r~ \$0-this_elev;
 #X obj 723 273 r~ \$0-this_elev;
@@ -470,6 +468,7 @@
 #X obj 773 294 r~ \$0-gain_azim;
 #X obj 270 150 sig~ 7;
 #X text 293 139 Set Corr Length;
+#X obj 411 191 *~ 6.8921e+07;
 #X connect 0 0 2 0;
 #X connect 1 0 2 1;
 #X connect 2 0 55 0;
@@ -520,24 +519,24 @@
 #X connect 60 0 29 1;
 #X connect 61 0 65 0;
 #X connect 62 0 64 0;
-#X connect 63 0 79 0;
+#X connect 63 0 78 0;
 #X connect 66 0 51 0;
 #X connect 67 0 68 0;
 #X connect 67 0 68 1;
-#X connect 68 0 69 0;
-#X connect 69 0 70 0;
-#X connect 70 0 33 0;
-#X connect 71 0 14 0;
-#X connect 72 0 38 0;
+#X connect 68 0 83 0;
+#X connect 69 0 33 0;
+#X connect 70 0 14 0;
+#X connect 71 0 38 0;
+#X connect 72 0 73 0;
 #X connect 73 0 74 0;
-#X connect 74 0 75 0;
-#X connect 75 0 49 1;
-#X connect 76 0 73 0;
-#X connect 76 0 73 1;
-#X connect 78 0 13 1;
-#X connect 80 0 23 0;
-#X connect 81 0 42 0;
-#X connect 82 0 54 0;
+#X connect 74 0 49 1;
+#X connect 75 0 72 0;
+#X connect 75 0 72 1;
+#X connect 77 0 13 1;
+#X connect 79 0 23 0;
+#X connect 80 0 42 0;
+#X connect 81 0 54 0;
+#X connect 83 0 69 0;
 #X restore 313 307 pd GoldfreqGainSword;
 #N canvas 300 30 1006 797 GoldnoiseGainSword 0;
 #X text -21037 364 Mass Density of Air \, squared;
@@ -607,7 +606,6 @@
 #X connect 9 0 2 0;
 #X connect 9 0 3 0;
 #X restore -20705 475 pd pow5;
-#X obj -20705 451 sig~ 343.56;
 #N canvas 875 261 250 309 pow5 0;
 #X obj 47 67 *~;
 #X obj 76 35 inlet~;
@@ -676,52 +674,53 @@
 #X obj -20366 274 s~ \$0-wake_elev;
 #X obj -20609 172 r~ \$0-wake_elev;
 #X obj -20861 488 /~ 10000;
-#X connect 2 0 37 1;
+#X obj -20705 451 sig~ 410;
+#X connect 2 0 36 1;
 #X connect 3 0 2 0;
-#X connect 4 0 36 1;
-#X connect 12 0 39 0;
-#X connect 13 0 45 0;
-#X connect 14 0 27 1;
-#X connect 15 0 14 0;
-#X connect 16 0 26 1;
-#X connect 17 0 18 0;
-#X connect 18 0 46 0;
-#X connect 19 0 21 1;
-#X connect 20 0 21 0;
-#X connect 21 0 16 0;
-#X connect 22 0 23 0;
-#X connect 22 0 23 1;
-#X connect 23 0 25 1;
+#X connect 4 0 35 1;
+#X connect 12 0 38 0;
+#X connect 13 0 44 0;
+#X connect 14 0 26 1;
+#X connect 15 0 25 1;
+#X connect 16 0 17 0;
+#X connect 17 0 45 0;
+#X connect 18 0 20 1;
+#X connect 19 0 20 0;
+#X connect 20 0 15 0;
+#X connect 21 0 22 0;
+#X connect 21 0 22 1;
+#X connect 22 0 24 1;
+#X connect 23 0 24 0;
 #X connect 24 0 25 0;
 #X connect 25 0 26 0;
-#X connect 26 0 27 0;
+#X connect 26 0 27 1;
 #X connect 27 0 28 1;
-#X connect 28 0 29 1;
-#X connect 29 0 44 0;
-#X connect 30 0 17 0;
-#X connect 32 0 30 0;
-#X connect 33 0 34 0;
-#X connect 33 0 34 1;
-#X connect 34 0 37 0;
-#X connect 35 0 36 0;
-#X connect 36 0 38 1;
-#X connect 37 0 38 0;
-#X connect 38 0 12 0;
-#X connect 39 0 58 0;
-#X connect 40 0 29 0;
-#X connect 43 0 46 1;
-#X connect 44 0 5 0;
-#X connect 45 0 43 0;
-#X connect 46 0 19 0;
-#X connect 49 0 19 1;
-#X connect 50 0 39 1;
-#X connect 51 0 11 0;
-#X connect 52 0 56 0;
-#X connect 53 0 54 0;
-#X connect 53 0 54 1;
-#X connect 54 0 28 0;
-#X connect 57 0 30 1;
-#X connect 58 0 40 0;
+#X connect 28 0 43 0;
+#X connect 29 0 16 0;
+#X connect 31 0 29 0;
+#X connect 32 0 33 0;
+#X connect 32 0 33 1;
+#X connect 33 0 36 0;
+#X connect 34 0 35 0;
+#X connect 35 0 37 1;
+#X connect 36 0 37 0;
+#X connect 37 0 12 0;
+#X connect 38 0 57 0;
+#X connect 39 0 28 0;
+#X connect 42 0 45 1;
+#X connect 43 0 5 0;
+#X connect 44 0 42 0;
+#X connect 45 0 18 0;
+#X connect 48 0 18 1;
+#X connect 49 0 38 1;
+#X connect 50 0 11 0;
+#X connect 51 0 55 0;
+#X connect 52 0 53 0;
+#X connect 52 0 53 1;
+#X connect 53 0 27 0;
+#X connect 56 0 29 1;
+#X connect 57 0 39 0;
+#X connect 58 0 14 0;
 #X restore 294 552 pd GoldnoiseGainSword;
 #X obj 417 531 r~ \$0-elev;
 #X obj 396 510 r~ \$0-azim;
@@ -731,7 +730,7 @@
 #X obj 709 151 r~ \$0-sourceSpeed;
 #X obj 314 426 r~ \$0-sourceSpeed;
 #X obj 776 330 r~ \$0-sourceSpeed;
-#N canvas 8 111 823 563 doppler 0;
+#N canvas 8 111 823 563 doppler 1;
 #X obj 88 329 inlet~;
 #X obj 88 467 outlet~;
 #X obj 186 256 r~ \$0-azim;
@@ -753,7 +752,6 @@
 #X obj 286 207 +~ 90;
 #X obj 210 370 *~ -1;
 #X obj 171 349 spigot~;
-#X obj 96 359 sig~ 323.56;
 #X obj 156 389 +~;
 #X obj 141 411 /~;
 #X obj 88 435 *~;
@@ -763,7 +761,8 @@
 #X text 423 61 Calculate the azimuth angle from the projected position
 of the oberver in the plane of the sword. Peak position is when the
 current azimuth is the same as the observer azimuth.;
-#X connect 0 0 24 0;
+#X obj 96 359 sig~ 410;
+#X connect 0 0 23 0;
 #X connect 2 0 3 0;
 #X connect 3 0 5 0;
 #X connect 4 0 6 0;
@@ -781,24 +780,25 @@
 #X connect 15 0 20 1;
 #X connect 17 0 13 1;
 #X connect 18 0 13 0;
-#X connect 19 0 22 1;
-#X connect 20 0 22 1;
+#X connect 19 0 21 1;
+#X connect 20 0 21 1;
 #X connect 20 1 19 0;
-#X connect 21 0 22 0;
-#X connect 21 0 23 0;
+#X connect 21 0 22 1;
 #X connect 22 0 23 1;
-#X connect 23 0 24 1;
-#X connect 24 0 1 0;
-#X connect 25 0 15 0;
-#X connect 26 0 8 0;
-#X connect 27 0 8 1;
+#X connect 23 0 1 0;
+#X connect 24 0 15 0;
+#X connect 25 0 8 0;
+#X connect 26 0 8 1;
+#X connect 28 0 21 0;
+#X connect 28 0 22 0;
 #X restore 709 410 pd doppler;
 #X obj 467 82 s~ \$0-elev;
 #X obj 542 82 s~ \$0-azim;
 #X obj 709 179 *~ 64.8;
 #X obj 709 254 /~ 3.47e-05;
-#X connect 1 0 87 0;
-#X connect 2 0 83 0;
+#X obj 52 88 /~ 410;
+#X connect 1 0 86 0;
+#X connect 2 0 82 0;
 #X connect 3 0 2 0;
 #X connect 4 0 8 0;
 #X connect 4 0 26 0;
@@ -806,23 +806,23 @@
 #X connect 10 0 2 1;
 #X connect 12 0 29 0;
 #X connect 14 0 50 0;
-#X connect 18 0 74 3;
+#X connect 18 0 73 3;
 #X connect 25 0 34 0;
 #X connect 25 0 3 0;
 #X connect 29 0 27 0;
 #X connect 29 1 28 0;
-#X connect 32 0 74 0;
+#X connect 32 0 73 0;
 #X connect 36 0 12 0;
 #X connect 37 0 29 1;
 #X connect 39 0 48 0;
 #X connect 40 0 39 0;
-#X connect 41 0 73 2;
-#X connect 42 0 73 0;
+#X connect 41 0 72 2;
+#X connect 42 0 72 0;
 #X connect 44 0 46 0;
 #X connect 45 0 44 0;
-#X connect 47 0 73 3;
+#X connect 47 0 72 3;
 #X connect 48 0 12 1;
-#X connect 49 0 74 2;
+#X connect 49 0 73 2;
 #X connect 50 0 51 0;
 #X connect 51 0 15 0;
 #X connect 51 0 35 0;
@@ -834,25 +834,25 @@
 #X connect 60 0 48 1;
 #X connect 61 0 60 0;
 #X connect 63 0 66 0;
-#X connect 64 0 84 0;
-#X connect 65 0 85 0;
-#X connect 67 0 68 0;
-#X connect 67 0 79 0;
-#X connect 68 0 69 0;
-#X connect 70 0 73 4;
-#X connect 71 0 73 5;
-#X connect 72 0 73 6;
-#X connect 73 0 31 0;
-#X connect 73 1 30 0;
-#X connect 74 0 33 0;
-#X connect 75 0 74 6;
-#X connect 76 0 74 5;
-#X connect 77 0 74 4;
-#X connect 78 0 73 1;
-#X connect 80 0 86 0;
-#X connect 81 0 74 1;
-#X connect 82 0 3 1;
-#X connect 83 0 11 0;
-#X connect 86 0 1 0;
-#X connect 87 0 13 0;
-#X connect 87 0 25 0;
+#X connect 64 0 83 0;
+#X connect 65 0 84 0;
+#X connect 67 0 78 0;
+#X connect 67 0 87 0;
+#X connect 69 0 72 4;
+#X connect 70 0 72 5;
+#X connect 71 0 72 6;
+#X connect 72 0 31 0;
+#X connect 72 1 30 0;
+#X connect 73 0 33 0;
+#X connect 74 0 73 6;
+#X connect 75 0 73 5;
+#X connect 76 0 73 4;
+#X connect 77 0 72 1;
+#X connect 79 0 85 0;
+#X connect 80 0 73 1;
+#X connect 81 0 3 1;
+#X connect 82 0 11 0;
+#X connect 85 0 1 0;
+#X connect 86 0 13 0;
+#X connect 86 0 25 0;
+#X connect 87 0 68 0;