Mercurial > hg > weather-synthesis-prototyping

changeset 183:18d72025b517

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TestBedD4 - Critical Reynolds number Q calculation bypassed as believe there is not enough data to accurately replicate this. Also only for reynolds numbers > 140000 and it is rare to be operating in this region.
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Thu, 18 Feb 2016 07:51:01 +0000
parents 6ab985b939c2
children 24b8a61996ce
files .DS_Store scene demo/freqCalcCyl3No_D3Mach.pd scene demo/testBedD4.pd
diffstat 3 files changed, 78 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
Binary file .DS_Store has changed
--- a/scene demo/freqCalcCyl3No_D3Mach.pd	Wed Feb 17 18:43:53 2016 +0000
+++ b/scene demo/freqCalcCyl3No_D3Mach.pd	Thu Feb 18 07:51:01 2016 +0000
@@ -926,8 +926,8 @@
 #X obj 881 424 r myMet;
 #X obj 881 444 snapshot~;
 #X floatatom 881 467 0 0 0 0 - - -;
-#N canvas 405 141 1027 635 StBandwidth 0;
-#X obj 444 142 inlet;
+#N canvas 573 58 1027 635 StBandwidth 1;
+#X obj 23 70 inlet;
 #X obj 460 365 swap 1;
 #X obj 460 391 /;
 #X floatatom 534 431 0 0 0 0 - - -;
@@ -944,7 +944,7 @@
 #X obj 219 233 + 0.9797;
 #X floatatom 194 270 0 0 0 0 - - -;
 #X obj 219 208 * 4.624e-05;
-#N canvas 249 105 810 724 linearCalc 0;
+#N canvas 97 95 810 724 linearCalc 1;
 #X obj 240 36 inlet;
 #X obj 248 579 outlet;
 #X floatatom 263 126 0 0 0 0 - - -;
@@ -955,7 +955,7 @@
 #X obj 215 435 < 193260;
 #X obj 182 458 spigot;
 #X obj 308 457 spigot;
-#X obj 338 433 > 193260;
+#X obj 341 433 > 193260;
 #X obj 125 164 - 7.685;
 #X obj 125 187 / 48293;
 #X obj 140 210 - 145021;
@@ -973,9 +973,9 @@
 #X obj 370 273 t f b;
 #X floatatom 409 328 0 0 0 0 - - -;
 #X obj 426 242 t f b;
-#X floatatom 336 491 0 0 0 0 - - -;
+#X floatatom 405 530 0 0 0 0 - - -;
 #X obj 240 102 min 200;
-#X text 328 56 Calculates the peak value of DeltaF / F depending on
+#X text 548 50 Calculates the peak value of DeltaF / F depending on
 the TU values. The higher the TU the higher the DeltaF/F value. A limit
 of 200 has been made as the value is a % and bandwidth greater than
 200% would invlove -ve frequencies;
@@ -983,18 +983,27 @@
 #X text 478 174 Linear down slope of the second section;
 #X text 391 391 Peak of the DeltaF / F was found to be at a Reynolds
 number of 193260;
-#X connect 0 0 3 0;
+#X obj 559 256 hsl 128 15 0 1e+06 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 1500 1;
+#X obj 65 15 hsl 128 15 0 20 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 566 289 0 0 0 0 - - -;
+#X floatatom 66 55 0 0 0 0 - - -;
+#X obj 379 460 < 243320;
+#X obj 346 484 spigot;
+#X obj 200 483 spigot;
+#X obj 233 460 > 145021;
+#X obj 392 60 *;
+#X obj 403 88 +;
+#X floatatom 463 120 0 0 0 0 - - -;
+#X obj 495 26 * 0.05;
+#X obj 424 61 * 7.89;
+#X obj 452 95 + 21.64;
 #X connect 3 0 4 0;
 #X connect 4 0 29 0;
-#X connect 6 0 10 0;
-#X connect 6 0 7 0;
-#X connect 6 0 18 0;
-#X connect 6 0 13 0;
 #X connect 7 0 8 1;
-#X connect 8 0 17 0;
-#X connect 8 0 1 0;
-#X connect 9 0 28 0;
-#X connect 9 0 1 0;
+#X connect 8 0 40 0;
+#X connect 9 0 39 0;
 #X connect 10 0 9 1;
 #X connect 11 0 12 0;
 #X connect 12 0 14 0;
@@ -1020,15 +1029,37 @@
 #X connect 29 0 19 0;
 #X connect 29 0 25 0;
 #X connect 29 0 11 0;
-#X restore 444 164 pd linearCalc;
-#X floatatom 384 206 0 0 0 0 - - -;
-#X obj 477 188 > 145021;
-#X obj 493 211 < 243320;
-#X obj 444 212 spigot;
-#X obj 460 235 spigot;
+#X connect 34 0 10 0;
+#X connect 34 0 18 0;
+#X connect 34 0 13 0;
+#X connect 34 0 7 0;
+#X connect 34 0 36 0;
+#X connect 34 0 38 0;
+#X connect 34 0 41 0;
+#X connect 35 0 3 0;
+#X connect 35 0 37 0;
+#X connect 35 0 42 1;
+#X connect 35 0 42 0;
+#X connect 35 0 46 0;
+#X connect 38 0 39 1;
+#X connect 39 0 1 0;
+#X connect 39 0 28 0;
+#X connect 40 0 1 0;
+#X connect 40 0 17 0;
+#X connect 41 0 40 1;
+#X connect 42 0 45 0;
+#X connect 43 0 47 0;
+#X connect 45 0 43 0;
+#X connect 46 0 43 1;
+#X connect 47 0 44 0;
+#X restore 23 92 pd linearCalc;
+#X floatatom -37 134 0 0 0 0 - - -;
+#X obj 56 116 > 145021;
+#X obj 72 139 < 243320;
+#X obj 23 140 spigot;
+#X obj 39 163 spigot;
 #X obj 602 150 spigot;
 #X obj 618 173 spigot;
-#X obj 635 126 > 243320;
 #X obj 651 149 < 1e+06;
 #X obj 618 216 * 1.227e-10;
 #X obj 618 196 *;
@@ -1037,7 +1068,7 @@
 #X obj 618 238 +;
 #X floatatom 640 291 0 0 0 0 - - -;
 #X floatatom 565 18 0 0 0 0 - - -;
-#X floatatom 475 260 0 0 0 0 - - -;
+#X floatatom 54 188 0 0 0 0 - - -;
 #X text -84 298 First section of the Reynolds number - DeltaF/F relationship
 is linear and did not appear to be reliant on current TU values;
 #X text 565 329 Third section of the Reynolds number - DeltaF/F relationship
@@ -1046,24 +1077,23 @@
 is also linear but depends on TU Value;
 #X obj 461 412 max 0.005;
 #X floatatom 412 438 0 0 0 0 - - -;
+#X obj 707 42 > 243320;
+#X obj 635 126 > 145021;
 #X connect 0 0 17 0;
 #X connect 1 0 2 0;
 #X connect 1 1 2 1;
 #X connect 2 0 3 0;
-#X connect 2 0 38 0;
+#X connect 2 0 37 0;
 #X connect 4 0 1 0;
 #X connect 7 0 9 0;
 #X connect 8 0 9 0;
 #X connect 9 0 25 0;
-#X connect 9 0 26 0;
 #X connect 9 0 23 0;
-#X connect 9 0 19 0;
-#X connect 9 0 20 0;
-#X connect 9 0 17 1;
 #X connect 9 0 13 0;
 #X connect 9 0 12 0;
 #X connect 9 0 10 0;
-#X connect 9 0 33 0;
+#X connect 9 0 32 0;
+#X connect 9 0 40 0;
 #X connect 10 0 11 0;
 #X connect 11 0 16 0;
 #X connect 12 0 10 1;
@@ -1076,22 +1106,21 @@
 #X connect 19 0 21 1;
 #X connect 20 0 22 1;
 #X connect 21 0 22 0;
-#X connect 22 0 4 0;
-#X connect 22 0 34 0;
+#X connect 22 0 33 0;
 #X connect 23 0 24 0;
 #X connect 24 0 28 0;
-#X connect 24 0 28 1;
-#X connect 24 0 29 0;
-#X connect 25 0 23 1;
-#X connect 26 0 24 1;
-#X connect 27 0 31 0;
-#X connect 28 0 27 0;
-#X connect 29 0 31 1;
-#X connect 30 0 32 0;
-#X connect 30 0 4 0;
-#X connect 31 0 30 0;
-#X connect 38 0 5 0;
-#X connect 38 0 39 0;
+#X connect 24 0 27 1;
+#X connect 24 0 27 0;
+#X connect 25 0 24 1;
+#X connect 26 0 30 0;
+#X connect 27 0 26 0;
+#X connect 28 0 30 1;
+#X connect 29 0 31 0;
+#X connect 29 0 4 0;
+#X connect 30 0 29 0;
+#X connect 37 0 5 0;
+#X connect 37 0 38 0;
+#X connect 40 0 23 1;
 #X restore 1189 91 pd StBandwidth;
 #X obj 1189 67 inlet;
 #X obj 1189 114 s \$0-Qval;
--- a/scene demo/testBedD4.pd	Wed Feb 17 18:43:53 2016 +0000
+++ b/scene demo/testBedD4.pd	Thu Feb 18 07:51:01 2016 +0000
@@ -1,8 +1,8 @@
-#N canvas 115 35 1333 826 10;
+#N canvas 90 57 1333 826 10;
 #X obj 205 -81 loadbang;
 #X obj -208 188 delwrite~ varwind 3000;
 #X obj -98 -63 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2032 1;
+-1 -1 1947 1;
 #X obj -290 33 snapshot~;
 #X floatatom -290 60 10 0 0 0 - - -;
 #X obj -207 -19 *~ 1;
@@ -11,7 +11,7 @@
 #X obj -9 -107 loadbang;
 #X msg -9 -87 5;
 #X obj 252 9 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5127 1;
+-262144 -1 -1 3990 1;
 #X floatatom 259 35 8 0 0 0 - - -;
 #X obj 320 285 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 6350 1;
@@ -21,10 +21,10 @@
 -1 -1 6350 1;
 #X floatatom 321 196 5 0 0 0 - - -;
 #X obj 306 222 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 9066 1;
+-262144 -1 -1 9349 1;
 #X floatatom 336 251 5 0 0 0 - - -;
 #X obj 279 110 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 7759 1;
+-1 -1 8877 1;
 #X floatatom 295 139 5 0 0 0 - - -;
 #X text 468 286 Pan Value;
 #X obj -233 426 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -84,7 +84,7 @@
 #X obj 205 -57 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 265 67 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 9358 1;
+-1 -1 2674 1;
 #X floatatom 287 86 8 0 0 0 - - -;
 #X msg 171 50 4;
 #X obj -114 357 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144