diff June/stringE.pd @ 87:94fdafb68c3e

Sources made to match the one for the harp. Corrections to angle gain calculations made

--- a/June/stringE.pd	Mon Jun 29 22:13:55 2015 +0100
+++ b/June/stringE.pd	Wed Jul 01 00:49:11 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas -26 135 1440 700 10;
+#N canvas 43 79 1440 700 10;
 #X text 818 -13 Mass Density of Air;
 #X text 127 302 Frequency (Hz);
 #X obj 895 435 throw~ l;
@@ -38,11 +38,11 @@
 #X obj 149 -51 sig~;
 #X obj 149 -30 vd~ varwind;
 #X obj 149 -75 inlet;
-#X obj 1369 18 r~ \$0-myFreq;
-#X obj 1335 -32 noise~;
-#X obj 1412 202 throw~ l;
-#X obj 1439 181 throw~ r;
-#X obj 1412 109 *~;
+#X obj 1161 19 r~ \$0-myFreq;
+#X obj 1127 -31 noise~;
+#X obj 1204 203 throw~ l;
+#X obj 1231 182 throw~ r;
+#X obj 1204 110 *~;
 #X obj 143 104 snapshot~;
 #X obj 143 79 metro 100;
 #X obj 143 57 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
@@ -51,56 +51,56 @@
 #X obj 143 31 loadbang;
 #X obj 69 79 r~ \$0-myRey;
 #X obj 953 87 s~ \$0-myRey;
-#X obj 1550 19 snapshot~;
-#X floatatom 1550 45 10 0 0 0 - - -;
-#X obj 1550 -54 loadbang;
-#X obj 1550 -29 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+#X obj 1342 20 snapshot~;
+#X floatatom 1342 46 10 0 0 0 - - -;
+#X obj 1342 -53 loadbang;
+#X obj 1342 -28 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
 1 1;
-#X obj 1461 -83 r~ \$0-myRey;
-#X obj 1377 370 r~ \$0-myFreq;
-#X obj 1343 299 noise~;
-#X obj 1420 559 throw~ l;
-#X obj 1447 536 throw~ r;
-#X obj 1420 467 *~;
-#X obj 1558 379 snapshot~;
-#X floatatom 1558 405 10 0 0 0 - - -;
-#X obj 1558 306 loadbang;
-#X obj 1558 331 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+#X obj 1253 -82 r~ \$0-myRey;
+#X obj 1169 371 r~ \$0-myFreq;
+#X obj 1135 300 noise~;
+#X obj 1212 560 throw~ l;
+#X obj 1239 537 throw~ r;
+#X obj 1212 468 *~;
+#X obj 1350 380 snapshot~;
+#X floatatom 1350 406 10 0 0 0 - - -;
+#X obj 1350 307 loadbang;
+#X obj 1350 332 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
 1 1;
-#X obj 1469 277 r~ \$0-myRey;
-#X obj 1377 396 *~ 2;
+#X obj 1261 278 r~ \$0-myRey;
+#X obj 1169 397 *~ 2;
 #X text 128 150 Reynolds Number;
-#X obj 1335 61 vcf~ 1000 10;
-#X obj 1343 421 vcf~ 1000 10;
+#X obj 1127 62 vcf~ 1000 10;
+#X obj 1135 422 vcf~ 1000 10;
 #X obj 895 391 fcpan;
-#X obj 1412 158 fcpan;
-#X obj 1420 511 fcpan;
-#X obj 1427 82 *~ 1;
-#X obj 1435 442 *~ 1;
-#X obj 1469 352 clip~ 2 400;
-#X obj 1461 -8 clip~ 2 400;
-#X obj 1469 301 *~ -0.003;
-#X obj 1461 -59 *~ -0.003;
-#X obj 1550 -6 metro 10;
-#X obj 1558 354 metro 10;
+#X obj 1204 159 fcpan;
+#X obj 1212 512 fcpan;
+#X obj 1219 83 *~ 1;
+#X obj 1227 443 *~ 1;
+#X obj 1261 353 clip~ 2 400;
+#X obj 1253 -7 clip~ 2 400;
+#X obj 1261 302 *~ -0.003;
+#X obj 1253 -58 *~ -0.003;
+#X obj 1342 -5 metro 10;
+#X obj 1350 355 metro 10;
 #X obj 393 -53 s \$0_dist;
 #X obj 626 -80 inlet;
 #X obj 626 -11 s \$0_thisPan;
 #X obj 922 362 r \$0_thisPan;
-#X obj 1439 134 r \$0_thisPan;
-#X obj 1447 489 r \$0_thisPan;
+#X obj 1231 135 r \$0_thisPan;
+#X obj 1239 490 r \$0_thisPan;
 #X floatatom 571 -11 8 0 0 0 - - -;
 #X obj 626 -56 max 0.1;
 #X obj 626 -33 min 0.9;
-#X text 1471 455 Drag Dipole spectrum calculation;
-#X text 1466 99 Lift Dipole spectrum calculation;
+#X text 1263 456 Drag Dipole spectrum calculation;
+#X text 1258 100 Lift Dipole spectrum calculation;
 #X text 661 102 Calculates the frequency;
 #X text 661 115 based on the physics of;
 #X text 662 128 the object and environment;
 #X obj 335 319 r~ \$0-windSpeed;
 #X obj 324 296 r~ \$0_str;
-#X obj 1435 419 r~ \$0_dragNoiseGain;
-#X obj 1427 40 r~ \$0_liftNoiseGain;
+#X obj 1227 420 r~ \$0_dragNoiseGain;
+#X obj 1219 41 r~ \$0_liftNoiseGain;
 #X obj 891 67 sig~ 1;
 #X obj 925 132 sqrt~;
 #X obj 925 157 *~ 1.0356;
@@ -188,7 +188,7 @@
 #X text -20981 74 Diameter;
 #N canvas 1567 153 479 552 angleCalc 0;
 #X obj 307 116 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 5500 1;
+-1 -1 7425 1;
 #X text 287 77 Elevation Angle;
 #X obj 236 118 / 360;
 #X obj 236 140 * 6.28319;
@@ -313,7 +313,7 @@
 #X obj 370 381 r \$0_elev;
 #X obj 324 493 s~ \$0_liftNoiseGain;
 #X obj 393 471 s~ \$0_dragNoiseGain;
-#N canvas -19 130 702 650 freqGain 1;
+#N canvas 0 130 702 650 freqGain 0;
 #X text 36 127 Mass Density of Air \, squared;
 #X text 508 93 Speed of Sound to power 2;
 #N canvas 759 125 286 289 pow6 0;
@@ -504,18 +504,18 @@
 #X floatatom 463 -27 5 0 0 0 - - -;
 #X floatatom 531 -31 5 0 0 0 - - -;
 #X obj 92 282 outlet;
-#X obj 1335 15 hip~;
+#X obj 1127 16 hip~;
 #X obj 136 255 snapshot~;
 #X obj 136 208 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 136 182 loadbang;
 #X obj 136 230 metro 10;
-#X obj 1343 396 hip~;
+#X obj 1135 397 hip~;
 #X obj 57 232 r~ \$0-myFreq;
 #X obj 136 282 s \$0_contFreq;
-#X obj 1356 -8 r \$0_contFreq;
-#X obj 1364 320 r \$0_contFreq;
-#X obj 1364 343 * 2;
+#X obj 1148 -7 r \$0_contFreq;
+#X obj 1156 321 r \$0_contFreq;
+#X obj 1156 344 * 2;
 #X text 132 473 Strouhal Number;
 #X text 318 251 Calculates the gain of the dipole source;
 #X text 315 512 Calculates the gain of the source;
@@ -531,8 +531,8 @@
 #X obj 324 -50 s \$0_leng;
 #X obj 358 361 r \$0_leng;
 #X obj 359 104 r \$0_leng;
-#X obj 1461 -34 +~ 20;
-#X obj 1469 326 +~ 20;
+#X obj 1253 -33 +~ 20;
+#X obj 1261 327 +~ 20;
 #X connect 4 0 17 0;
 #X connect 5 0 7 0;
 #X connect 6 0 10 1;
@@ -565,6 +565,7 @@
 #X connect 38 0 36 0;
 #X connect 39 0 68 1;
 #X connect 40 0 132 0;
+#X connect 43 0 71 0;
 #X connect 44 0 47 0;
 #X connect 45 0 44 0;
 #X connect 46 0 45 0;
@@ -577,6 +578,7 @@
 #X connect 55 0 78 0;
 #X connect 56 0 66 0;
 #X connect 57 0 137 0;
+#X connect 60 0 72 0;
 #X connect 61 0 62 0;
 #X connect 61 0 69 2;
 #X connect 63 0 64 0;