Mercurial > hg > weather-synthesis-prototyping
diff Propellor/OnePropD3.pd @ 286:ac3659c52b07
Minor tweeks to Prop model
Working on new shear calculation on Cavity model
author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
---|---|
date | Wed, 05 Apr 2017 08:22:31 +0100 |
parents | de87f9ec5065 |
children | 45bb69569481 |
line wrap: on
line diff
--- a/Propellor/OnePropD3.pd Mon Mar 27 06:13:48 2017 +0100 +++ b/Propellor/OnePropD3.pd Wed Apr 05 08:22:31 2017 +0100 @@ -2119,8 +2119,8 @@ #X obj 228 620 throw~ l; #X obj 306 627 throw~ r; #X obj 38 486 inlet; +#X obj 282 345 rotPeak; #X obj 286 533 rotPeak; -#X obj 282 345 rotPeak; #X obj 193 535 rotPeak; #X obj 189 347 rotPeak; #X obj 281 392 rotPeak; @@ -2157,12 +2157,12 @@ #X connect 16 2 55 2; #X connect 16 3 57 2; #X connect 16 4 52 2; -#X connect 16 5 51 2; +#X connect 16 5 50 2; #X connect 16 6 54 2; #X connect 16 7 58 2; #X connect 16 8 59 2; #X connect 16 9 46 0; -#X connect 16 9 50 2; +#X connect 16 9 51 2; #X connect 18 0 26 0; #X connect 19 0 21 0; #X connect 19 0 42 0; @@ -2205,11 +2205,11 @@ #X connect 30 0 58 0; #X connect 30 0 59 0; #X connect 31 0 53 1; -#X connect 32 0 50 1; +#X connect 32 0 51 1; #X connect 33 0 59 1; #X connect 34 0 58 1; #X connect 35 0 54 1; -#X connect 36 0 51 1; +#X connect 36 0 50 1; #X connect 37 0 52 1; #X connect 38 0 57 1; #X connect 39 0 55 1; @@ -2259,15 +2259,12 @@ #X obj 615 80 *~; #X obj 725 164 inlet; #X obj 725 210 AndyEngineD2; -#X obj 321 329 r myMet; -#X obj 321 349 snapshot~; -#X floatatom 321 369 0 0 0 0 - - -; #X obj 390 259 SourcesD6; #X obj 51 246 SourcesD6; #X obj 247 255 SourcesD6; #X obj 170 253 SourcesD6; #X connect 0 0 26 0; -#X connect 1 0 46 0; +#X connect 1 0 43 0; #X connect 2 0 1 0; #X connect 3 0 0 0; #X connect 4 0 13 0; @@ -2290,17 +2287,17 @@ #X connect 11 0 5 1; #X connect 11 0 7 1; #X connect 12 0 2 1; -#X connect 13 1 47 0; -#X connect 14 1 45 0; +#X connect 13 1 44 0; +#X connect 14 1 42 0; #X connect 15 0 14 1; -#X connect 15 0 45 3; +#X connect 15 0 42 3; #X connect 16 0 14 1; #X connect 16 0 13 1; -#X connect 16 0 45 3; +#X connect 16 0 42 3; #X connect 17 0 13 1; -#X connect 17 0 47 3; +#X connect 17 0 44 3; #X connect 18 0 13 1; -#X connect 18 0 47 3; +#X connect 18 0 44 3; #X connect 19 0 2 1; #X connect 20 0 5 1; #X connect 21 0 5 1; @@ -2310,22 +2307,22 @@ #X connect 23 2 10 0; #X connect 24 0 23 0; #X connect 25 0 26 1; -#X connect 25 0 44 3; +#X connect 25 0 41 3; #X connect 25 0 29 0; #X connect 25 0 40 1; -#X connect 25 0 46 3; +#X connect 25 0 43 3; #X connect 26 1 2 0; #X connect 26 1 5 0; #X connect 26 1 7 0; -#X connect 26 1 44 0; +#X connect 26 1 41 0; +#X connect 27 0 41 1; +#X connect 27 0 42 1; +#X connect 27 0 43 1; #X connect 27 0 44 1; -#X connect 27 0 45 1; -#X connect 27 0 46 1; -#X connect 27 0 47 1; +#X connect 28 0 41 2; +#X connect 28 0 42 2; +#X connect 28 0 43 2; #X connect 28 0 44 2; -#X connect 28 0 45 2; -#X connect 28 0 46 2; -#X connect 28 0 47 2; #X connect 30 0 29 2; #X connect 32 0 37 0; #X connect 32 0 36 0; @@ -2337,6 +2334,4 @@ #X connect 37 0 38 1; #X connect 38 0 36 1; #X connect 39 0 40 0; -#X connect 41 0 42 0; -#X connect 42 0 43 0; -#X connect 44 0 31 0; +#X connect 41 0 31 0;