""

svn path=/trunk/; revision=378

2 files changed, 22 insertions, 17 deletions

diff --git a/externals/grill/vasp/pd-ex/granular1.pd b/externals/grill/vasp/pd-ex/granular1.pd
index 2a601fc0..2ef369f9 100755
--- a/externals/grill/vasp/pd-ex/granular1.pd
+++ b/externals/grill/vasp/pd-ex/granular1.pd
@@ -1,4 +1,4 @@
-#N canvas 62 0 628 493 10;

+#N canvas 62 0 630 495 10;

 #N canvas 0 0 450 300 graph34 0;

 #X array insert 128 float 1;

 #A 0 1 0.995185 0.980785 0.95694 0.92388 0.881921 0.83147 0.77301 0.707107

@@ -73,7 +73,6 @@
 #X obj 76 333 s \$0-density;

 #X obj 204 275 tgl 15 0 empty empty start/stop 0 -6 0 8 -24198 -1 -1

 1 1;

-#X text 319 80 this array is insertet at triggering points;

 #X obj 76 290 * 0.001;

 #X floatatom 241 429 0 0 0 0 - - -;

 #X obj 241 407 env~ 32768;

@@ -329,13 +328,14 @@
 -1 -1 600 1;

 #X obj 204 374 *~ 0.2;

 #X text 387 445 needs the zexy library and vasp;

-#X connect 2 0 15 0;

+#X text 319 80 this array is inserted at triggering points;

+#X connect 2 0 14 0;

 #X connect 4 0 7 0;

-#X connect 5 0 10 0;

+#X connect 5 0 9 0;

 #X connect 8 0 1 0;

-#X connect 10 0 4 0;

-#X connect 12 0 11 0;

-#X connect 14 0 15 1;

-#X connect 15 0 3 0;

-#X connect 15 0 3 1;

-#X connect 15 0 12 0;

+#X connect 9 0 4 0;

+#X connect 11 0 10 0;

+#X connect 13 0 14 1;

+#X connect 14 0 3 0;

+#X connect 14 0 3 1;

+#X connect 14 0 11 0;

diff --git a/externals/grill/vasp/pd-ex/granular2.pd b/externals/grill/vasp/pd-ex/granular2.pd
index a065c25c..cfea7d6c 100644
--- a/externals/grill/vasp/pd-ex/granular2.pd
+++ b/externals/grill/vasp/pd-ex/granular2.pd
@@ -1,4 +1,4 @@
-#N canvas 30 24 706 558 10;

+#N canvas 30 24 708 560 10;

 #N canvas 0 0 450 300 graph34 0;

 #X array insert 128 float 0;

 #X coords 0 1 127 -1 200 140 1;

@@ -6,7 +6,7 @@
 #N canvas 339 256 523 452 player 0;

 #X obj 228 372 tabplay~ schnipparray;

 #X obj 228 396 throw~ toex;

-#X obj 208 45 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1

+#X obj 208 45 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1

 ;

 #X obj 208 76 spigot;

 #X obj 104 330 s \$0-part;

@@ -67,11 +67,11 @@
 #X obj 204 403 dac~;

 #X floatatom 51 318 0 0 0 0 - - -;

 #X obj 51 278 nbx 5 14 -1e+037 1e+037 0 1 empty empty empty 0 -6 0

-10 -24198 -1 -1 18.13 256;

+10 -24198 -1 -1 80.13 256;

 #X text 51 260 density;

 #X obj 51 340 s \$0-density;

 #X obj 204 275 tgl 15 0 empty empty start/stop 0 -6 0 8 -24198 -1 -1

-0 1;

+1 1;

 #X floatatom 241 430 0 0 0 0 - - -;

 #X obj 241 407 env~ 32768;

 #N canvas 202 187 293 232 inside 0;

@@ -256,7 +256,7 @@
 #X connect 4 0 1 0;

 #X connect 5 0 2 0;

 #X restore 41 95 pd init;

-#N canvas 409 43 522 372 create_schnippl 0;

+#N canvas 409 43 526 376 create_schnippl 0;

 #X msg 155 114 vasp insert;

 #X obj 155 182 vasp.u;

 #X obj 155 138 vasp.osc 6.4;

@@ -275,8 +275,11 @@
 #X obj 273 251 vasp.osc 2;

 #X obj 273 271 vasp.*xwindow hamming;

 #X obj 355 230 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0

-10 -24198 -1 -1 28 256;

+10 -24198 -1 -1 3 256;

 #X text 56 71 create various slices to insert;

+#X msg 405 113 vasp insert;

+#X obj 405 161 vasp.u;

+#X obj 405 137 vasp.= 0;

 #X connect 0 0 2 0;

 #X connect 2 0 12 0;

 #X connect 3 0 11 0;

@@ -290,10 +293,12 @@
 #X connect 15 0 16 0;

 #X connect 16 0 14 0;

 #X connect 17 0 15 1;

+#X connect 19 0 21 0;

+#X connect 21 0 20 0;

 #X restore 40 47 pd create_schnippl;

 #X restore 53 489 pd inside;

 #X obj 322 271 vsl 15 100 0 1 0 1 empty empty volume 0 -8 0 8 -24198

--1 -1 3400 1;

+-1 -1 4400 1;

 #X obj 204 374 *~ 0.2;

 #X text 332 464 needs the zexy library and vasp;

 #X obj 51 297 * 0.0001;