support ScilabBoolean, ScilabDouble, ScilabString

75 files changed, 936 insertions, 860 deletions

diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js
index d4305671..2ba7bda8 100644
--- a/js/Misc/AUTOMAT.js
+++ b/js/Misc/AUTOMAT.js
@@ -11,20 +11,20 @@ function AUTOMAT() {
         exprs = [[string(NMode)],[string(this.Minitial)],[string(NX)],[sci2exp(this.X0)],[sci2exp(this.XP)],[sci2exp(C1)],[sci2exp(C2)]];
         ipar = [[NMode],[this.Minitial],[NX],[this.XP],[C1],[C2]];
         rpar = [this.X0];
-        model = scicos_model();
-        model.sim = list("automat",10004);
-        model.in1 = [[2*NX+1],[2*NX+1]];
-        model.out = [[2],[2*NX]];
-        model.state = ones(2*NX,1);
-        model.nzcross = 1;
-        model.blocktype = "c";
-        model.evtout = 1;
-        model.firing = -1;
-        model.dep_ut = [false,true];
-        model.ipar = ipar;
-        model.rpar = rpar;
+        this.model = scicos_model();
+        this.model.sim = list("automat",10004);
+        this.model.in1 = [[2*NX+1],[2*NX+1]];
+        this.model.out = [[2],[2*NX]];
+        this.model.state = new ScilabDouble(ones(2*NX,1));
+        this.model.nzcross = new ScilabDouble(1);
+        this.model.blocktype = new ScilabString("c");
+        this.model.evtout = new ScilabDouble(1);
+        this.model.firing = new ScilabDouble(-1);
+        this.model.dep_ut = [false,true];
+        this.model.ipar = ipar;
+        this.model.rpar = rpar;
         gr_i = [];
-        this.x = standard_define([4,2],model,exprs,gr_i);
+        this.x = standard_define([4,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     AUTOMAT.prototype.details = function AUTOMAT() {
@@ -39,8 +39,8 @@ function AUTOMAT() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
-        ipar = model.ipar;
+        this.model = arg1.model;
+        ipar = this.model.ipar;
         NMode = ipar[1-1];
         NX = ipar[3-1];
         while (true) {
@@ -120,18 +120,18 @@ function AUTOMAT() {
                 }
             }
             if (!ModifEncore) {
-                [model,graphics,this.ok] = check_io(model,graphics,INP,OUT,[],[1]);
+                [model,graphics,this.ok] = check_io(this.model,graphics,INP,OUT,[],[1]);
                 if (!this.ok) {
                     break;
                 }
-                model.nzcross = nzcross;
-                model.state = ones(2*NX,1);
+                this.model.nzcross = new ScilabDouble(nzcross);
+                this.model.state = new ScilabDouble(ones(2*NX,1));
                 graphics.gr_i[1-1][1-1] = "txt=[\'Automaton\';\'nM="+string(NMode)+",nX="+string(NX)+"\'];";
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                model.ipar = ipar;
-                model.rpar = rpar;
-                this.x.model = model;
+                this.model.ipar = ipar;
+                this.model.rpar = new ScilabDouble(rpar);
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle
index 4870b5a1..01ba4b1e 100644
--- a/js/Misc/AUTOMAT.pickle
+++ b/js/Misc/AUTOMAT.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'ok'
 p2
 aS'X0'
 p3
-aS'ok'
+aS'x'
 p4
 aS'XP'
 p5
-aS'Minitial'
+aS'model'
 p6
-atp7
-Rp8
+aS'Minitial'
+p7
+atp8
+Rp9
 .(dp0
 S'[model,graphics,this.ok]'
 p1
diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js
index 29813621..30a8b1ec 100644
--- a/js/Misc/BACKLASH.js
+++ b/js/Misc/BACKLASH.js
@@ -2,16 +2,16 @@
 function BACKLASH() {
     BACKLASH.prototype.define = function BACKLASH() {
         exprs = [["0"],["1"],["1"]];
-        model = scicos_model();
-        model.sim = list("backlash",4);
-        model.in1 = 1;
-        model.out = 1;
-        model.rpar = [[0],[1]];
-        model.nzcross = 2;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("backlash",4);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.rpar = [[0],[1]];
+        this.model.nzcross = new ScilabDouble(2);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     BACKLASH.prototype.details = function BACKLASH() {
@@ -32,8 +32,8 @@ function BACKLASH() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
-        rpar = model.rpar;
+        this.model = arg1.model;
+        rpar = this.model.rpar;
         while (true) {
             [ok,this.ini,this.gap,this.zcr,exprs] = scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -44,13 +44,13 @@ function BACKLASH() {
                 rpar[1-1] = this.ini;
                 rpar[2-1] = this.gap;
                 if (this.zcr!=0) {
-                    model.nzcross = 2;
+                    this.model.nzcross = new ScilabDouble(2);
                 } else {
-                    model.nzcross = 0;
+                    this.model.nzcross = new ScilabDouble(0);
                 }
-                model.rpar = rpar;
+                this.model.rpar = rpar;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle
index c782a351..b102f178 100644
--- a/js/Misc/BACKLASH.pickle
+++ b/js/Misc/BACKLASH.pickle
@@ -4,14 +4,16 @@ p0
 ((lp1
 S'x'
 p2
-aS'ini'
+aS'model'
 p3
-aS'zcr'
+aS'ini'
 p4
-aS'gap'
+aS'zcr'
 p5
-atp6
-Rp7
+aS'gap'
+p6
+atp7
+Rp8
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js
index b55e03cc..899d7c5d 100644
--- a/js/Misc/BOUNCE.js
+++ b/js/Misc/BOUNCE.js
@@ -23,19 +23,19 @@ function BOUNCE() {
         this.rpar2 = this.rpar1;
         state = [this.x,this.xd,this.y,this.yd];
         state = transpose(state);
-        model = scicos_model();
-        model.sim = list("bounce_ball",4);
-        model.in1 = [];
-        model.out = [[n],[n]];
-        model.state = state.slice();
-        model.rpar = [[this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]];
-        model.ipar = ipar;
-        model.nzcross = n*(n-1)/2+4*n;
-        model.blocktype = "c";
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = list("bounce_ball",4);
+        this.model.in1 = [];
+        this.model.out = [[n],[n]];
+        this.model.state = state.slice();
+        this.model.rpar = [[this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]];
+        this.model.ipar = ipar;
+        this.model.nzcross = new ScilabDouble(n*(n-1)/2+4*n);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,true];
         exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     BOUNCE.prototype.details = function BOUNCE() {
@@ -68,7 +68,7 @@ function BOUNCE() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         if (size(exprs,"*")<9) {
             exprs[8-1] = "9.81";
             exprs[9-1] = "0";
@@ -102,7 +102,7 @@ function BOUNCE() {
             if (!ok) {
                 break;
             }
-            [model,graphics,ok] = check_io(model,graphics,[],[n,n],[],[]);
+            [model,graphics,ok] = check_io(this.model,graphics,[],[n,n],[],[]);
             if (ok) {
                 k = 1;
                 ipar = [];
@@ -114,15 +114,15 @@ function BOUNCE() {
                         k = k+1;
                     }
                 }
-                model.rpar = [[this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]];
-                model.ipar = ipar;
+                this.model.rpar = [[this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]];
+                this.model.ipar = ipar;
                 state = [this.xt,this.xd,this.y,this.yd];
                 state = transpose(state);
-                model.state = state.slice();
-                model.nzcross = n*(n-1)/2+4*n;
+                this.model.state = state.slice();
+                this.model.nzcross = new ScilabDouble(n*(n-1)/2+4*n);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle
index 38fc60ad..1b412589 100644
--- a/js/Misc/BOUNCE.pickle
+++ b/js/Misc/BOUNCE.pickle
@@ -20,10 +20,12 @@ aS'y'
 p9
 aS'x'
 p10
-aS'xt'
+aS'model'
 p11
-atp12
-Rp13
+aS'xt'
+p12
+atp13
+Rp14
 .(dp0
 S'arg1'
 p1
diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js
index a720b4ed..1f4509c1 100644
--- a/js/Misc/BOUNCEXY.js
+++ b/js/Misc/BOUNCEXY.js
@@ -9,12 +9,12 @@ function BOUNCEXY() {
         this.xmax = 5;
         this.ymin = 0;
         this.ymax = 15;
-        model = scicos_model();
-        model.sim = list("bouncexy",4);
-        model.in1 = [[-1],[-1]];
-        model.in2 = [[1],[1]];
-        model.intyp = [[1],[1]];
-        model.evtin = 1;
+        this.model = scicos_model();
+        this.model.sim = list("bouncexy",4);
+        this.model.in1 = [[-1],[-1]];
+        this.model.in2 = [[1],[1]];
+        this.model.intyp = [[1],[1]];
+        this.model.evtin = new ScilabDouble(1);
         z = [];
         for (i=1;i<=size(this.clrs,"*");i+=1) {
             z[6*(i-1)+1-1] = 0;
@@ -24,15 +24,15 @@ function BOUNCEXY() {
             z[6*(i-1)+5-1] = 0.000;
             z[6*(i-1)+6-1] = 64.0*360.000;
         }
-        model.dstate = z;
-        model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
-        model.ipar = [[this.win],[this.imode],[this.clrs.slice()]];
-        model.blocktype = "d";
-        model.firing = [];
-        model.dep_ut = [false,false];
+        this.model.dstate = z;
+        this.model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
+        this.model.ipar = [[this.win],[this.imode],[this.clrs.slice()]];
+        this.model.blocktype = new ScilabString("d");
+        this.model.firing = [];
+        this.model.dep_ut = [false,false];
         exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     BOUNCEXY.prototype.details = function BOUNCEXY() {
@@ -63,8 +63,8 @@ function BOUNCEXY() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
-        dstate = model.dstate;
+        this.model = arg1.model;
+        dstate = this.model.dstate;
         while (true) {
             [ok,this.clrs,this.siz,this.win,this.imode,this.xmin,this.xmax,this.ymin,this.ymax,exprs] = scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -101,12 +101,12 @@ function BOUNCEXY() {
                     z[6*(i-1)+5-1] = 0.000;
                     z[6*(i-1)+6-1] = 64.0*360.000;
                 }
-                model.dstate = z;
-                model.rpar = rpar;
-                model.ipar = ipar;
+                this.model.dstate = z;
+                this.model.rpar = rpar;
+                this.model.ipar = ipar;
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle
index 1c25cd48..2e83fd54 100644
--- a/js/Misc/BOUNCEXY.pickle
+++ b/js/Misc/BOUNCEXY.pickle
@@ -18,10 +18,12 @@ aS'xmin'
 p8
 aS'x'
 p9
-aS'ymin'
+aS'model'
 p10
-atp11
-Rp12
+aS'ymin'
+p11
+atp12
+Rp13
 .(dp0
 S'clrs'
 p1
diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js
index 8314c565..8c7f2bb0 100644
--- a/js/Misc/BPLATFORM.js
+++ b/js/Misc/BPLATFORM.js
@@ -8,17 +8,17 @@ function BPLATFORM() {
         this.xmax = 5;
         this.ymin = 0;
         this.ymax = 15;
-        model = scicos_model();
-        model.sim = list("bplatform2",5);
-        model.in1 = [[1],[1]];
-        model.evtin = 1;
-        model.dstate = 0;
-        model.rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
-        exprs = string(model.rpar);
+        this.model = scicos_model();
+        this.model.sim = list("bplatform2",5);
+        this.model.in1 = [[1],[1]];
+        this.model.evtin = new ScilabDouble(1);
+        this.model.dstate = new ScilabDouble(0);
+        this.model.rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
+        exprs = string(this.model.rpar);
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     BPLATFORM.prototype.details = function BPLATFORM() {
@@ -47,8 +47,8 @@ function BPLATFORM() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
-        dstate = model.dstate;
+        this.model = arg1.model;
+        dstate = this.model.dstate;
         while (true) {
             [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -71,10 +71,10 @@ function BPLATFORM() {
                 message(mess);
             } else {
                 rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
-                model.rpar = rpar;
+                this.model.rpar = rpar;
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle
index 5dc54d6a..9da37d3f 100644
--- a/js/Misc/BPLATFORM.pickle
+++ b/js/Misc/BPLATFORM.pickle
@@ -16,10 +16,12 @@ aS'xmin'
 p7
 aS'x'
 p8
-aS'ymin'
+aS'model'
 p9
-atp10
-Rp11
+aS'ymin'
+p10
+atp11
+Rp12
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js
index 1c43099e..30976cb0 100644
--- a/js/Misc/CBLOCK.js
+++ b/js/Misc/CBLOCK.js
@@ -13,23 +13,23 @@ function CBLOCK() {
         this.ipar = [];
         funam = "toto";
         this.ng = 0;
-        model = scicos_model();
-        model.sim = list(" ",2004);
-        model.in1 = in1;
-        model.out = out;
-        model.evtin = clkin;
-        model.evtout = clkout;
-        model.state = x0;
-        model.dstate = z0;
-        model.rpar = this.rpar;
-        model.ipar = this.ipar;
-        model.blocktype = typ;
-        model.firing = auto;
-        model.dep_ut = [true,false];
-        model.nzcross = this.ng;
+        this.model = scicos_model();
+        this.model.sim = list(" ",2004);
+        this.model.in1 = new ScilabDouble(in1);
+        this.model.out = new ScilabDouble(out);
+        this.model.evtin = clkin;
+        this.model.evtout = clkout;
+        this.model.state = x0;
+        this.model.dstate = z0;
+        this.model.rpar = this.rpar;
+        this.model.ipar = this.ipar;
+        this.model.blocktype = new ScilabString(typ);
+        this.model.firing = auto;
+        this.model.dep_ut = [true,false];
+        this.model.nzcross = new ScilabDouble(this.ng);
         label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]);
         gr_i = [];
-        this.x = standard_define([4,2],model,label,gr_i);
+        this.x = standard_define([4,2],this.model,label,gr_i);
         return new BasicBlock(this.x);
     }
     CBLOCK.prototype.details = function CBLOCK() {
@@ -71,7 +71,7 @@ function CBLOCK() {
         this.dept = parseBoolean(arguments[0]["dept"])
         this.lab = arguments[0]["lab"]
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         label = graphics.exprs;
         while (true) {
@@ -121,7 +121,7 @@ function CBLOCK() {
             if (funam==" ") {
                 break;
             }
-            if (model.sim[1-1]!=funam||sign(size(model.state,"*"))!=sign(nx)||sign(size(model.dstate,"*"))!=sign(nz)||model.nzcross!=this.ng||sign(size(model.evtout,"*"))!=sign(nevout)) {
+            if (this.model.sim[1-1]!=funam||sign(size(this.model.state,"*"))!=sign(nx)||sign(size(this.model.dstate,"*"))!=sign(nz)||this.model.nzcross!=this.ng||sign(size(this.model.evtout,"*"))!=sign(nevout)) {
                 tt = [];
             }
             tt = label[2-1];
@@ -132,22 +132,22 @@ function CBLOCK() {
                         break;
                     }
                 } else {
-                    [model,graphics,ok] = check_io(model,graphics,this.i,this.o,this.ci,this.co);
+                    [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co);
                     if (ok) {
-                        model.sim = list(funam,funtyp);
-                        model.in1 = this.i;
-                        model.out = this.o;
-                        model.evtin = this.ci;
-                        model.evtout = this.co;
-                        model.state = this.xx;
-                        model.dstate = this.z;
-                        model.rpar = this.rpar;
-                        model.ipar = this.ipar;
-                        model.firing = this.auto0;
-                        model.dep_ut = dep_ut;
-                        model.nzcross = this.ng;
+                        this.model.sim = list(funam,funtyp);
+                        this.model.in1 = new ScilabDouble(this.i);
+                        this.model.out = new ScilabDouble(this.o);
+                        this.model.evtin = new ScilabDouble(this.ci);
+                        this.model.evtout = new ScilabDouble(this.co);
+                        this.model.state = this.xx;
+                        this.model.dstate = this.z;
+                        this.model.rpar = this.rpar;
+                        this.model.ipar = new ScilabDouble(this.ipar);
+                        this.model.firing = new ScilabDouble(this.auto0);
+                        this.model.dep_ut = dep_ut;
+                        this.model.nzcross = new ScilabDouble(this.ng);
                         label[2-1] = tt;
-                        this.x.model = model;
+                        this.x.model = this.model;
                         graphics.exprs = label;
                         this.x.graphics = graphics;
                         break;
diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle
index 1d575875..06d2644c 100644
--- a/js/Misc/CBLOCK.pickle
+++ b/js/Misc/CBLOCK.pickle
@@ -30,12 +30,14 @@ aS'ipar'
 p14
 aS'x'
 p15
-aS'z'
+aS'model'
 p16
-aS'function_name'
+aS'z'
 p17
-atp18
-Rp19
+aS'function_name'
+p18
+atp19
+Rp20
 .(dp0
 S'ci'
 p1
diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js
index d7fd487e..84051ad4 100644
--- a/js/Misc/CBLOCK4.js
+++ b/js/Misc/CBLOCK4.js
@@ -2,18 +2,18 @@
 function CBLOCK4() {
     CBLOCK4.prototype.define = function CBLOCK4() {
         funam = "toto";
-        model = scicos_model();
-        model.sim = list(" ",2004);
-        model.in1 = 1;
-        model.in2 = 1;
-        model.intyp = 1;
-        model.out = 1;
-        model.out2 = 1;
-        model.outtyp = 1;
-        model.dep_ut = [true,false];
-        label = list([[funam],["n"],[sci2exp([model.in1,model.in2])],[sci2exp(model.intyp)],[sci2exp([model.out,model.out2])],[sci2exp(model.outtyp)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.odstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.opar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]],[]);
+        this.model = scicos_model();
+        this.model.sim = list(" ",2004);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.in2 = new ScilabDouble(1);
+        this.model.intyp = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.outtyp = new ScilabDouble(1);
+        this.model.dep_ut = [true,false];
+        label = list([[funam],["n"],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]);
         gr_i = [];
-        this.x = standard_define([4,2],model,label,gr_i);
+        this.x = standard_define([4,2],this.model,label,gr_i);
         return new BasicBlock(this.x);
     }
     CBLOCK4.prototype.details = function CBLOCK4() {
@@ -65,7 +65,7 @@ function CBLOCK4() {
         this.dept = parseBoolean(arguments[0]["dept"])
         this.lab = arguments[0]["lab"]
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         label = graphics.exprs;
         while (true) {
@@ -113,11 +113,11 @@ function CBLOCK4() {
                 if (funam==" ") {
                     break;
                 }
-                if (model.sim[1-1]!=funam||sign(size(model.state,"*"))!=sign(nx)||sign(size(model.dstate,"*"))!=sign(nz)||model.nzcross!=this.nzcr||sign(size(model.evtout,"*"))!=sign(nevout)) {
+                if (this.model.sim[1-1]!=funam||sign(size(this.model.state,"*"))!=sign(nx)||sign(size(this.model.dstate,"*"))!=sign(nz)||this.model.nzcross!=this.nzcr||sign(size(this.model.evtout,"*"))!=sign(nevout)) {
                     tt = [];
                 }
                 tt = label[2-1];
-                [model,graphics,ok] = set_io(model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co);
+                [model,graphics,ok] = set_io(this.model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co);
             }
             if (ok) {
                 while (true) {
@@ -127,19 +127,19 @@ function CBLOCK4() {
                             break;
                         }
                     } else {
-                        model.sim = list(funam,funtyp);
-                        model.state = this.xx;
-                        model.dstate = this.z;
-                        model.odstate = this.oz;
-                        model.rpar = this.rpar;
-                        model.ipar = this.ipar;
-                        model.opar = this.opar;
-                        model.firing = this.auto0;
-                        model.nzcross = this.nzcr;
-                        model.nmode = this.nmode;
-                        model.dep_ut = dep_ut;
+                        this.model.sim = list(funam,funtyp);
+                        this.model.state = this.xx;
+                        this.model.dstate = this.z;
+                        this.model.odstate = new ScilabDouble(this.oz);
+                        this.model.rpar = this.rpar;
+                        this.model.ipar = new ScilabDouble(this.ipar);
+                        this.model.opar = new ScilabDouble(this.opar);
+                        this.model.firing = new ScilabDouble(this.auto0);
+                        this.model.nzcross = new ScilabDouble(this.nzcr);
+                        this.model.nmode = new ScilabDouble(this.nmode);
+                        this.model.dep_ut = dep_ut;
                         label[2-1] = tt;
-                        this.x.model = model;
+                        this.x.model = this.model;
                         graphics.exprs = label;
                         this.x.graphics = graphics;
                         break;
diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle
index 46f7a08d..f06d22b2 100644
--- a/js/Misc/CBLOCK4.pickle
+++ b/js/Misc/CBLOCK4.pickle
@@ -10,7 +10,7 @@ aS'ci'
 p4
 aS'rpar'
 p5
-aS'xx'
+aS'auto0'
 p6
 aS'out'
 p7
@@ -28,7 +28,7 @@ aS'z'
 p13
 aS'CC4'
 p14
-aS'auto0'
+aS'xx'
 p15
 aS'nzcr'
 p16
@@ -44,10 +44,12 @@ aS'ipar'
 p21
 aS'x'
 p22
-aS'ot'
+aS'model'
 p23
-atp24
-Rp25
+aS'ot'
+p24
+atp25
+Rp26
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js
index 4bd4e01b..8d86b801 100644
--- a/js/Misc/CONSTRAINT2_c.js
+++ b/js/Misc/CONSTRAINT2_c.js
@@ -4,17 +4,17 @@ function CONSTRAINT2_c() {
         this.x0 = [0];
         this.xd0 = [0];
         this.id = [0];
-        model = scicos_model();
-        model.sim = list("constraint_c",10004);
-        model.in1 = 1;
-        model.out = [[1],[1]];
-        model.state = [[this.x0],[this.xd0]];
-        model.ipar = this.id;
-        model.blocktype = "c";
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = list("constraint_c",10004);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = [[1],[1]];
+        this.model.state = [[this.x0],[this.xd0]];
+        this.model.ipar = this.id;
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,true];
         exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id)));
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() {
@@ -35,7 +35,7 @@ function CONSTRAINT2_c() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             ask_again = false;
             [ok,this.x0,this.xd0,this.id,exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),exprs);
@@ -70,12 +70,12 @@ function CONSTRAINT2_c() {
             }
             if (!ask_again) {
                 graphics.exprs = exprs;
-                model.state = [[this.x0],[this.xd0]];
-                model.out = [[N],[N]];
-                model.in1 = N;
-                model.ipar = this.id;
+                this.model.state = [[this.x0],[this.xd0]];
+                this.model.out = [[N],[N]];
+                this.model.in1 = new ScilabDouble(N);
+                this.model.ipar = this.id;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle
index 2453bf3d..83d54cab 100644
--- a/js/Misc/CONSTRAINT2_c.pickle
+++ b/js/Misc/CONSTRAINT2_c.pickle
@@ -2,16 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'id'
 p2
-aS'x0'
+aS'x'
 p3
-aS'id'
+aS'model'
 p4
-aS'xd0'
+aS'x0'
 p5
-atp6
-Rp7
+aS'xd0'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js
index da135a7c..084c7ef7 100644
--- a/js/Misc/CONSTRAINT_c.js
+++ b/js/Misc/CONSTRAINT_c.js
@@ -2,17 +2,17 @@
 function CONSTRAINT_c() {
     CONSTRAINT_c.prototype.define = function CONSTRAINT_c() {
         this.x0 = [[0],[0]];
-        model = scicos_model();
-        model.sim = list("constraint_c",10004);
-        model.in1 = 1;
-        model.out = 1;
-        model.ipar = 0;
-        model.state = this.x0;
-        model.blocktype = "c";
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = list("constraint_c",10004);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.ipar = new ScilabDouble(0);
+        this.model.state = this.x0;
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,true];
         exprs = "0";
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     CONSTRAINT_c.prototype.details = function CONSTRAINT_c() {
@@ -28,7 +28,7 @@ function CONSTRAINT_c() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.x0,exprs] = scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),exprs);
             if (!ok) {
@@ -39,15 +39,15 @@ function CONSTRAINT_c() {
             if (N<=0) {
                 message("number of states (constraints) must be > 0 ");
             } else {
-                [model,graphics,ok] = check_io(model,graphics,N,N,[],[]);
+                [model,graphics,ok] = check_io(this.model,graphics,N,N,[],[]);
                 if (ok) {
                     graphics.exprs = exprs;
-                    model.state = [[this.x0],[zeros(N,1)]];
-                    model.out = N;
-                    model.in1 = N;
-                    model.ipar = -1*ones(N,1);
+                    this.model.state = [[this.x0],[zeros(N,1)]];
+                    this.model.out = new ScilabDouble(N);
+                    this.model.in1 = new ScilabDouble(N);
+                    this.model.ipar = new ScilabDouble(-1*ones(N,1));
                     this.x.graphics = graphics;
-                    this.x.model = model;
+                    this.x.model = this.model;
                     break;
                 }
             }
diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle
index 928d3033..21c28204 100644
--- a/js/Misc/CONSTRAINT_c.pickle
+++ b/js/Misc/CONSTRAINT_c.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'x0'
+aS'model'
 p3
-atp4
-Rp5
+aS'x0'
+p4
+atp5
+Rp6
 .(dp0
 S'[model,graphics,ok]'
 p1
diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js
index a88d6e57..dc380f40 100644
--- a/js/Misc/DEADBAND.js
+++ b/js/Misc/DEADBAND.js
@@ -4,18 +4,18 @@ function DEADBAND() {
         this.minp = -.5;
         this.maxp = .5;
         rpar = [[this.maxp],[this.minp]];
-        model = scicos_model();
-        model.sim = list("deadband",4);
-        model.in1 = 1;
-        model.nzcross = 2;
-        model.nmode = 1;
-        model.out = 1;
-        model.rpar = rpar;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
-        exprs = [[string(this.maxp)],[string(this.minp)],[string(model.nmode)]];
+        this.model = scicos_model();
+        this.model.sim = list("deadband",4);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.nzcross = new ScilabDouble(2);
+        this.model.nmode = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.rpar = rpar;
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
+        exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     DEADBAND.prototype.details = function DEADBAND() {
@@ -36,7 +36,7 @@ function DEADBAND() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.maxp,this.minp,this.zeroc,exprs] = scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -46,17 +46,17 @@ function DEADBAND() {
                 message("Upper limit must be > Lower limit");
             } else {
                 rpar = [[this.maxp],[this.minp]];
-                model.rpar = rpar;
+                this.model.rpar = rpar;
                 if (this.zeroc!=0) {
-                    model.nzcross = 2;
-                    model.nmode = 1;
+                    this.model.nzcross = new ScilabDouble(2);
+                    this.model.nmode = new ScilabDouble(1);
                 } else {
-                    model.nzcross = 0;
-                    model.nmode = 0;
+                    this.model.nzcross = new ScilabDouble(0);
+                    this.model.nmode = new ScilabDouble(0);
                 }
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle
index 4597f082..496fcd93 100644
--- a/js/Misc/DEADBAND.pickle
+++ b/js/Misc/DEADBAND.pickle
@@ -6,12 +6,14 @@ S'minp'
 p2
 aS'x'
 p3
-aS'maxp'
+aS'model'
 p4
 aS'zeroc'
 p5
-atp6
-Rp7
+aS'maxp'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js
index eb8969d4..fd1547c1 100644
--- a/js/Misc/DEBUG.js
+++ b/js/Misc/DEBUG.js
@@ -1,12 +1,12 @@
 /* autogenerated from "macros/Misc/DEBUG.sci" */
 function DEBUG() {
     DEBUG.prototype.define = function DEBUG() {
-        model = scicos_model();
-        model.sim = list("%debug_scicos",99);
-        model.blocktype = "d";
+        this.model = scicos_model();
+        this.model.sim = list("%debug_scicos",99);
+        this.model.blocktype = new ScilabString("d");
         exprs = list("","xcos_debug_gui(flag,block);");
         gr_i = [];
-        this.x = standard_define([8,2],model,exprs,gr_i);
+        this.x = standard_define([8,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     DEBUG.prototype.details = function DEBUG() {
diff --git a/js/Misc/DEBUG.pickle b/js/Misc/DEBUG.pickle
index 287dcc53..fff46cd6 100644
--- a/js/Misc/DEBUG.pickle
+++ b/js/Misc/DEBUG.pickle
@@ -6,12 +6,14 @@ S'debug_scicos'
 p2
 aS'x'
 p3
-aS'TMPDIR'
+aS'model'
 p4
-aS'dialog'
+aS'TMPDIR'
 p5
-atp6
-Rp7
+aS'dialog'
+p6
+atp7
+Rp8
 .(dp0
 S'exprs[2-1]'
 p1
diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js
index f9aba023..cc27fc20 100644
--- a/js/Misc/DIFF_f.js
+++ b/js/Misc/DIFF_f.js
@@ -2,16 +2,16 @@
 function DIFF_f() {
     DIFF_f.prototype.define = function DIFF_f() {
         this.x0 = [[0],[0]];
-        model = scicos_model();
-        model.sim = list("diffblk",10001);
-        model.in1 = 1;
-        model.out = 1;
-        model.state = this.x0;
-        model.blocktype = "c";
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = list("diffblk",10001);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.state = this.x0;
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,true];
         exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     DIFF_f.prototype.details = function DIFF_f() {
@@ -30,16 +30,16 @@ function DIFF_f() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.x0,this.xd0,exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),exprs);
             if (!ok) {
                 break;
             }
             graphics.exprs = exprs;
-            model.state = [[this.x0.slice()],[this.xd0.slice()]];
+            this.model.state = [[this.x0.slice()],[this.xd0.slice()]];
             this.x.graphics = graphics;
-            this.x.model = model;
+            this.x.model = this.model;
             break;
         }
         this.x.model.firing = [];
diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle
index ed2ddff9..51912c36 100644
--- a/js/Misc/DIFF_f.pickle
+++ b/js/Misc/DIFF_f.pickle
@@ -4,12 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-aS'x0'
+aS'model'
 p3
-aS'xd0'
+aS'x0'
 p4
-atp5
-Rp6
+aS'xd0'
+p5
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js
index 61d495a1..fcbf7b41 100644
--- a/js/Misc/EDGETRIGGER.js
+++ b/js/Misc/EDGETRIGGER.js
@@ -2,18 +2,18 @@
 function EDGETRIGGER() {
     EDGETRIGGER.prototype.define = function EDGETRIGGER() {
         this.edge = 1;
-        model = scicos_model();
-        model.sim = list("edgetrig",4);
-        model.in1 = 1;
-        model.out = 1;
-        model.dstate = 0;
-        model.nzcross = 1;
-        model.ipar = sign(this.edge);
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("edgetrig",4);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.dstate = new ScilabDouble(0);
+        this.model.nzcross = new ScilabDouble(1);
+        this.model.ipar = new ScilabDouble(sign(this.edge));
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [string(this.edge)];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     EDGETRIGGER.prototype.details = function EDGETRIGGER() {
@@ -30,16 +30,16 @@ function EDGETRIGGER() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.edge,exprs] = scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),exprs);
             if (!ok) {
                 break;
             }
-            model.ipar = sign(this.edge);
+            this.model.ipar = new ScilabDouble(sign(this.edge));
             graphics.exprs = exprs;
             this.x.graphics = graphics;
-            this.x.model = model;
+            this.x.model = this.model;
             break;
         }
         return new BasicBlock(this.x);
diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle
index a2ffe47d..40ed449b 100644
--- a/js/Misc/EDGETRIGGER.pickle
+++ b/js/Misc/EDGETRIGGER.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'edge'
+aS'model'
 p3
-atp4
-Rp5
+aS'edge'
+p4
+atp5
+Rp6
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js
index 452ad747..655cd0a4 100644
--- a/js/Misc/EDGE_TRIGGER.js
+++ b/js/Misc/EDGE_TRIGGER.js
@@ -11,51 +11,51 @@ function EDGE_TRIGGER() {
         scs_m_1.objs[7-1] = scicos_link();
         blk = scs_m_1.objs[1-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [60,0];
         graphics.sz = [60,40];
         graphics.exprs = "0";
-        model.ipar = 0;
+        this.model.ipar = new ScilabDouble(0);
         graphics.pin = 5;
         graphics.pout = 6;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[1-1] = blk;
         blk = scs_m_1.objs[2-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [160,0];
         graphics.sz = [60,40];
         graphics.exprs = [["0"],["0"]];
-        model.evtin = [];
-        model.nzcross = 0;
-        model.nmode = 0;
+        this.model.evtin = [];
+        this.model.nzcross = new ScilabDouble(0);
+        this.model.nmode = new ScilabDouble(0);
         graphics.pin = 6;
         graphics.peout = [[7],[0]];
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[2-1] = blk;
         blk = scs_m_1.objs[3-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [0,10];
         graphics.sz = [20,20];
         graphics.exprs = ["1"];
-        model.ipar = 1;
+        this.model.ipar = new ScilabDouble(1);
         graphics.pout = 5;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[3-1] = blk;
         blk = scs_m_1.objs[4-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [170,-60];
         graphics.sz = [20,20];
         graphics.exprs = ["1"];
-        model.ipar = 1;
+        this.model.ipar = new ScilabDouble(1);
         graphics.pein = 7;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[4-1] = blk;
         lnk = scs_m_1.objs[5-1];
         lnk.from = [3,1,0];
@@ -72,13 +72,13 @@ function EDGE_TRIGGER() {
         scs_m_1.objs[7-1] = lnk;
         blk={};
         lnk={};
-        model = scicos_model();
-        model.sim = "csuper";
-        model.in1 = 1;
-        model.evtout = 1;
-        model.rpar = scs_m_1;
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.in1 = new ScilabDouble(1);
+        this.model.evtout = new ScilabDouble(1);
+        this.model.rpar = scs_m_1;
         gr_i = [];
-        this.x = standard_define([3,2],model,[],gr_i);
+        this.x = standard_define([3,2],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() {
@@ -111,40 +111,40 @@ function EDGE_TRIGGER() {
             xx = arg1[spath-1];
             execstr("xxn="+xx.gui+"(\'set\',xx)");
             if (diffobjs(this.xxn,xx)) {
-                model = xx.model;
+                this.model = xx.model;
                 model_n = this.xxn.model;
                 if (!is_modelica_block(xx)) {
-                    modified = or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.label,model_n.label);
-                    if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)) {
+                    modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label);
+                    if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) {
                         needcompile = 1;
                     }
-                    if (or(model.firing!=model_n.firing)) {
+                    if (or(this.model.firing!=model_n.firing)) {
                         needcompile = 2;
                     }
-                    if ((size(model.in1,"*")!=size(model_n.in1,"*"))||(size(model.out,"*")!=size(model_n.out,"*"))) {
+                    if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) {
                         needcompile = 4;
                     }
-                    if (model.sim=="input"||model.sim=="output") {
-                        if (model.ipar!=model_n.ipar) {
+                    if (this.model.sim=="input"||this.model.sim=="output") {
+                        if (this.model.ipar!=model_n.ipar) {
                             needcompile = 4;
                         }
                     }
-                    if (or(model.blocktype!=model_n.blocktype)||or(model.dep_ut!=model_n.dep_ut)) {
+                    if (or(this.model.blocktype!=model_n.blocktype)||or(this.model.dep_ut!=model_n.dep_ut)) {
                         needcompile = 4;
                     }
-                    if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) {
+                    if ((this.model.nzcross!=model_n.nzcross)||(this.model.nmode!=model_n.nmode)) {
                         needcompile = 4;
                     }
                     if (prod(size(model_n.sim))>1) {
                         if (model_n.sim[2-1]>1000) {
-                            if (model.sim[1-1]!=model_n.sim[1-1]) {
+                            if (this.model.sim[1-1]!=model_n.sim[1-1]) {
                                 needcompile = 4;
                             }
                         }
                     }
                 } else {
-                    modified = or(model_n!=model);
-                    eq = model.equations;
+                    modified = or(model_n!=this.model);
+                    eq = this.model.equations;
                     eqn = model_n.equations;
                     if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
                         needcompile = 4;
diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle
index 054aef01..7e4dd5be 100644
--- a/js/Misc/EDGE_TRIGGER.pickle
+++ b/js/Misc/EDGE_TRIGGER.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'xxn'
+aS'model'
 p3
-atp4
-Rp5
+aS'xxn'
+p4
+atp5
+Rp6
 .(dp0
 S'lnk.ct'
 p1
diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js
index c28cda3b..10d576b9 100644
--- a/js/Misc/ENDBLK.js
+++ b/js/Misc/ENDBLK.js
@@ -4,9 +4,9 @@ function ENDBLK() {
         scs_m_1 = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,0,7,1.4],Title="ENDBLK",tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
         scs_m_1.objs[1-1] = scicos_block(gui="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m_1.objs[2-1] = scicos_link(xx=[[292.104],[292.104],[261.83733],[261.83733],[292.104],[292.104]],yy=[[243.40305],[234.45067],[234.45067],[305.584],[305.584],[294.83162]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
-        model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
+        this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
         gr_i = [];
-        this.x = standard_define([2,2],model,[],gr_i);
+        this.x = standard_define([2,2],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     ENDBLK.prototype.details = function ENDBLK() {
@@ -39,40 +39,40 @@ function ENDBLK() {
             xx = arg1[spath-1];
             execstr("xxn="+xx.gui+"(\'set\',xx)");
             if (!this.isequalbitwise[this.xxn-1][xx-1]) {
-                model = xx.model;
+                this.model = xx.model;
                 model_n = this.xxn.model;
                 if (!is_modelica_block(xx)) {
-                    modified = or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label);
-                    if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) {
+                    modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label);
+                    if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) {
                         needcompile = 1;
                     }
-                    if (or(model.firing!=model_n.firing)) {
+                    if (or(this.model.firing!=model_n.firing)) {
                         needcompile = 2;
                     }
-                    if ((size(model.in1,"*")!=size(model_n.in1,"*"))||(size(model.out,"*")!=size(model_n.out,"*"))||(size(model.evtin,"*")!=size(model_n.evtin,"*"))) {
+                    if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))||(size(this.model.evtin,"*")!=size(model_n.evtin,"*"))) {
                         needcompile = 4;
                     }
-                    if (model.sim=="input"||model.sim=="output") {
-                        if (model.ipar!=model_n.ipar) {
+                    if (this.model.sim=="input"||this.model.sim=="output") {
+                        if (this.model.ipar!=model_n.ipar) {
                             needcompile = 4;
                         }
                     }
-                    if (or(model.blocktype!=model_n.blocktype)||or(model.dep_ut!=model_n.dep_ut)) {
+                    if (or(this.model.blocktype!=model_n.blocktype)||or(this.model.dep_ut!=model_n.dep_ut)) {
                         needcompile = 4;
                     }
-                    if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) {
+                    if ((this.model.nzcross!=model_n.nzcross)||(this.model.nmode!=model_n.nmode)) {
                         needcompile = 4;
                     }
                     if (prod(size(model_n.sim))>1) {
                         if (model_n.sim[2-1]>1000) {
-                            if (model.sim[1-1]!=model_n.sim[1-1]) {
+                            if (this.model.sim[1-1]!=model_n.sim[1-1]) {
                                 needcompile = 4;
                             }
                         }
                     }
                 } else {
-                    modified = or(model_n!=model);
-                    eq = model.equations;
+                    modified = or(model_n!=this.model);
+                    eq = this.model.equations;
                     eqn = model_n.equations;
                     if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
                         needcompile = 4;
diff --git a/js/Misc/ENDBLK.pickle b/js/Misc/ENDBLK.pickle
index 4704173c..c05aa082 100644
--- a/js/Misc/ENDBLK.pickle
+++ b/js/Misc/ENDBLK.pickle
@@ -4,12 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-aS'xxn'
+aS'model'
 p3
-aS'isequalbitwise'
+aS'xxn'
 p4
-atp5
-Rp6
+aS'isequalbitwise'
+p5
+atp6
+Rp7
 .(dp0
 S'ppath'
 p1
diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle
index 6042a857..4d43bd5f 100644
--- a/js/Misc/EXPRESSION.pickle
+++ b/js/Misc/EXPRESSION.pickle
@@ -14,10 +14,12 @@ aS'%nin'
 p6
 aS'x'
 p7
-aS'%usenz'
+aS'model'
 p8
-atp9
-Rp10
+aS'%usenz'
+p9
+atp10
+Rp11
 .(dp0
 S'arg1'
 p1
diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js
index f6e70284..50fee2cd 100644
--- a/js/Misc/Extract_Activation.js
+++ b/js/Misc/Extract_Activation.js
@@ -12,49 +12,49 @@ function Extract_Activation() {
         scs_m_1.objs[8-1] = scicos_link();
         blk = scs_m_1.objs[1-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [80,0];
         graphics.sz = [60,40];
         graphics.exprs = [["0"],["0"]];
-        model.evtin = [];
-        model.nzcross = 0;
-        model.nmode = 0;
+        this.model.evtin = [];
+        this.model.nzcross = new ScilabDouble(0);
+        this.model.nmode = new ScilabDouble(0);
         graphics.pin = 7;
         graphics.peout = [[5],[6]];
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[1-1] = blk;
         blk = scs_m_1.objs[2-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [80,-80];
         graphics.sz = [80,40];
         graphics.pein = [[5],[6]];
         graphics.peout = 8;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[2-1] = blk;
         blk = scs_m_1.objs[3-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [0,10];
         graphics.sz = [20,20];
         graphics.exprs = ["1"];
-        model.ipar = 1;
+        this.model.ipar = new ScilabDouble(1);
         graphics.pout = 7;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[3-1] = blk;
         blk = scs_m_1.objs[4-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [110,-140];
         graphics.sz = [20,20];
         graphics.exprs = ["1"];
-        model.ipar = 1;
+        this.model.ipar = new ScilabDouble(1);
         graphics.pein = 8;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[4-1] = blk;
         lnk = scs_m_1.objs[5-1];
         lnk.ct = [5,-1];
@@ -77,13 +77,13 @@ function Extract_Activation() {
         scs_m_1.objs[8-1] = lnk;
         blk={};
         lnk={};
-        model = scicos_model();
-        model.sim = "csuper";
-        model.in1 = 1;
-        model.evtout = 1;
-        model.rpar = scs_m_1;
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.in1 = new ScilabDouble(1);
+        this.model.evtout = new ScilabDouble(1);
+        this.model.rpar = scs_m_1;
         gr_i = [];
-        this.x = standard_define([3,2],model,[],gr_i);
+        this.x = standard_define([3,2],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     Extract_Activation.prototype.details = function Extract_Activation() {
diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle
index f976beaf..401a10ed 100644
--- a/js/Misc/Extract_Activation.pickle
+++ b/js/Misc/Extract_Activation.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'lnk.ct'
 p1
diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js
index c077a1e2..bb85aa33 100644
--- a/js/Misc/HYSTHERESIS.js
+++ b/js/Misc/HYSTHERESIS.js
@@ -5,18 +5,18 @@ function HYSTHERESIS() {
         ipar = [0];
         this.nzz = 2;
         rpar = [[1],[0],[1],[0]];
-        model = scicos_model();
-        model.sim = list("hystheresis",4);
-        model.in1 = in1;
-        model.out = 1;
-        model.rpar = rpar;
-        model.nzcross = this.nzz;
-        model.nmode = 1;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("hystheresis",4);
+        this.model.in1 = new ScilabDouble(in1);
+        this.model.out = new ScilabDouble(1);
+        this.model.rpar = rpar;
+        this.model.nzcross = new ScilabDouble(this.nzz);
+        this.model.nmode = new ScilabDouble(1);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[string(rpar)],[string(sign(this.nzz))]];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     HYSTHERESIS.prototype.details = function HYSTHERESIS() {
@@ -41,7 +41,7 @@ function HYSTHERESIS() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.high_lim,this.low_lim,this.out_high,this.out_low,this.nzz,exprs] = scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -51,13 +51,13 @@ function HYSTHERESIS() {
                 message("switch on value must be larger than switch off value");
             } else {
                 graphics.exprs = exprs;
-                model.rpar = transpose([this.high_lim,this.low_lim,this.out_high,this.out_low]);
+                this.model.rpar = transpose([this.high_lim,this.low_lim,this.out_high,this.out_low]);
                 if (this.nzz>0) {
                     this.nzz = 2;
                 }
-                model.nzcross = this.nzz;
+                this.model.nzcross = new ScilabDouble(this.nzz);
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle
index 46931193..790c93e8 100644
--- a/js/Misc/HYSTHERESIS.pickle
+++ b/js/Misc/HYSTHERESIS.pickle
@@ -14,8 +14,10 @@ aS'high_lim'
 p6
 aS'x'
 p7
-atp8
-Rp9
+aS'model'
+p8
+atp9
+Rp10
 .(dp0
 S'arg1'
 p1
diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js
index 11ad9e4c..029257a9 100644
--- a/js/Misc/IMPSPLIT_f.js
+++ b/js/Misc/IMPSPLIT_f.js
@@ -1,16 +1,16 @@
 /* autogenerated from "macros/Misc/IMPSPLIT_f.sci" */
 function IMPSPLIT_f() {
     IMPSPLIT_f.prototype.define = function IMPSPLIT_f() {
-        model = scicos_model();
-        model.sim = "limpsplit";
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("limpsplit");
         mo = modelica();
         mo.model = "limpsplit";
         mo.inputs = "n";
         mo.outputs = [["n"],["n"]];
-        model.equations = mo;
-        model.in1 = ones(size(mo.inputs,"*"),1);
-        model.out = ones(size(mo.outputs,"*"),1);
-        this.x = standard_define([1,1]/3,model,[],[]);
+        this.model.equations = new ScilabDouble(mo);
+        this.model.in1 = new ScilabDouble(ones(size(mo.inputs,"*"),1));
+        this.model.out = new ScilabDouble(ones(size(mo.outputs,"*"),1));
+        this.x = standard_define([1,1]/3,this.model,[],[]);
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I","I"];
         return new BasicBlock(this.x);
diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle
index efd88680..5a701c06 100644
--- a/js/Misc/IMPSPLIT_f.pickle
+++ b/js/Misc/IMPSPLIT_f.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js
index 597217ca..fbd68077 100644
--- a/js/Misc/LOGICAL_OP.js
+++ b/js/Misc/LOGICAL_OP.js
@@ -4,16 +4,16 @@ function LOGICAL_OP() {
         in1 = [[-1],[-1]];
         ipar = [0];
         this.nin = 2;
-        model = scicos_model();
-        model.sim = list("logicalop",4);
-        model.in1 = in1;
-        model.out = -1;
-        model.ipar = ipar;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("logicalop",4);
+        this.model.in1 = in1;
+        this.model.out = new ScilabDouble(-1);
+        this.model.ipar = ipar;
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[string(this.nin)],[string(ipar)]];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     LOGICAL_OP.prototype.details = function LOGICAL_OP() {
@@ -36,7 +36,7 @@ function LOGICAL_OP() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         if (size(exprs,1)==2) {
             exprs = [[exprs],[sci2exp(1)],[sci2exp(0)]];
         }
@@ -66,26 +66,26 @@ function LOGICAL_OP() {
                     this.tp = 1;
                 }
                 if (this.Datatype==1) {
-                    model.sim = list("logicalop",4);
-                    model.ipar = [this.rule];
+                    this.model.sim = list("logicalop",4);
+                    this.model.ipar = [this.rule];
                 } else {
                     if (this.Datatype==3) {
-                        model.sim = list("logicalop_i32",4);
+                        this.model.sim = list("logicalop_i32",4);
                     } else if (this.Datatype==4) {
-                        model.sim = list("logicalop_i16",4);
+                        this.model.sim = list("logicalop_i16",4);
                     } else if (this.Datatype==5) {
-                        model.sim = list("logicalop_i8",4);
+                        this.model.sim = list("logicalop_i8",4);
                     } else if (this.Datatype==6) {
-                        model.sim = list("logicalop_ui32",4);
+                        this.model.sim = list("logicalop_ui32",4);
                     } else if (this.Datatype==7) {
-                        model.sim = list("logicalop_ui16",4);
+                        this.model.sim = list("logicalop_ui16",4);
                     } else if (this.Datatype==8) {
-                        model.sim = list("logicalop_ui8",4);
+                        this.model.sim = list("logicalop_ui8",4);
                     } else {
                         message("Datatype is not supported");
                         ok = false;
                     }
-                    model.ipar = [[this.rule],[this.tp]];
+                    this.model.ipar = [[this.rule],[this.tp]];
                 }
                 if (ok) {
                     it = this.Datatype*ones(this.nin,1);
@@ -93,10 +93,10 @@ function LOGICAL_OP() {
                     in1 = [-ones(this.nin,1),-2*ones(this.nin,1)];
                     if ((this.rule!=5)&&(this.nin==1)) {
                         out = [1,1];
-                        [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+                        [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
                     } else {
                         out = [-1,-2];
-                        [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+                        [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
                     }
                 }
                 if (ok) {
@@ -116,7 +116,7 @@ function LOGICAL_OP() {
                     graphics.exprs = exprs;
                     graphics.style = ["blockWithLabel;displayedLabel="+label];
                     this.x.graphics = graphics;
-                    this.x.model = model;
+                    this.x.model = this.model;
                     break;
                 }
             }
diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle
index 8096a120..80f571a8 100644
--- a/js/Misc/LOGICAL_OP.pickle
+++ b/js/Misc/LOGICAL_OP.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'Datatype'
+S'nin'
 p2
-aS'x'
+aS'Datatype'
 p3
-aS'nin'
-p4
 aS'tp'
-p5
+p4
 aS'rule'
+p5
+aS'x'
 p6
-atp7
-Rp8
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js
index 8a23fe8b..d7396e0f 100644
--- a/js/Misc/MBLOCK.js
+++ b/js/Misc/MBLOCK.js
@@ -10,24 +10,24 @@ function MBLOCK() {
         this.pprop = [[0],[0]];
         nameF = "generic";
         exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]);
-        model = scicos_model();
-        model.blocktype = "c";
-        model.dep_ut = [false,true];
-        model.rpar = [];
+        this.model = scicos_model();
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,true];
+        this.model.rpar = [];
         for (i=1;i<=lstsize(paramv);i+=1) {
-            model.rpar = [[model.rpar],[paramv[i-1].slice()]];
+            this.model.rpar = [[this.model.rpar],[paramv[i-1].slice()]];
         }
         mo = modelica();
         mo.model = nameF;
         mo.parameters = list(param,paramv);
-        model.sim = list(mo.model,30004);
+        this.model.sim = list(mo.model,30004);
         mo.inputs = this.in1;
         mo.outputs = this.out;
-        model.in1 = ones(size(mo.inputs,"r"),1);
-        model.out = ones(size(mo.outputs,"r"),1);
-        model.equations = mo;
+        this.model.in1 = new ScilabDouble(ones(size(mo.inputs,"r"),1));
+        this.model.out = new ScilabDouble(ones(size(mo.outputs,"r"),1));
+        this.model.equations = mo;
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         this.x.graphics.in_implicit = this.intype;
         this.x.graphics.out_implicit = this.outtype;
         return new BasicBlock(this.x);
@@ -57,14 +57,14 @@ function MBLOCK() {
         this.Tfunam = arguments[0]["Tfunam"]
         this.lab_1 = inverse(arguments[0]["lab_1"])
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
         if (this.type[exprs-1]==15) {
             paramv = list();
             this.pprop = [];
-            for (i=1;i<=size(model.rpar,"*");i+=1) {
-                paramv[$+1-1] = string(model.rpar[i-1]);
+            for (i=1;i<=size(this.model.rpar,"*");i+=1) {
+                paramv[$+1-1] = string(this.model.rpar[i-1]);
                 this.pprop[$+1-1] = 0;
             }
             exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],exprs[1-1][1-1],exprs[1-1][2-1],exprs[1-1][3-1],exprs[1-1][4-1],exprs[1-1][5-1],paramv,sci2exp(this.pprop.slice()),exprs[1-1][7-1],exprs[2-1]);
@@ -180,7 +180,7 @@ function MBLOCK() {
             if (ok) {
                 intypex = find(this.intype=="I");
                 outtypex = find(this.outtype=="I");
-                [model,graphics,ok] = set_io(model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex);
+                [model,graphics,ok] = set_io(this.model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex);
             }
             if (ok) {
                 Tparam_lab = evstr(this.Tparam);
@@ -234,7 +234,7 @@ function MBLOCK() {
                     tt = mgetl(this.funam);
                 } else {
                     tt = exprs.funtxt;
-                    mo = model.equations;
+                    mo = this.model.equations;
                     if (mo.model!=nameF) {
                         tt = [];
                     }
@@ -254,12 +254,12 @@ function MBLOCK() {
                 } else {
                     mo.parameters = list(transpose(param),paramv);
                 }
-                model.equations = mo;
-                model.rpar = [];
+                this.model.equations = new ScilabDouble(mo);
+                this.model.rpar = [];
                 for (i=1;i<=lstsize(paramv);i+=1) {
-                    model.rpar = [[model.rpar],[paramv[i-1].slice()]];
+                    this.model.rpar = [[this.model.rpar],[paramv[i-1].slice()]];
                 }
-                model.sim[1-1] = this.funam;
+                this.model.sim[('1', 'double')] = new ScilabDouble(this.funam);
                 exprs.in1 = this.lab_1[1-1];
                 exprs.intype = this.lab_1[2-1];
                 exprs.out = this.lab_1[3-1];
@@ -280,7 +280,7 @@ function MBLOCK() {
                 exprs.pprop = this.lab_1[6-1];
                 exprs.nameF = this.lab_1[7-1];
                 exprs.funtxt = tt;
-                this.x.model = model;
+                this.x.model = this.model;
                 graphics.gr_i[1-1][1-1] = "txt=[\'Modelica\';\' "+nameF+" \'];";
                 graphics.in_implicit = this.intype;
                 graphics.out_implicit = this.outtype;
diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle
index ca23a3b3..cad8a7b6 100644
--- a/js/Misc/MBLOCK.pickle
+++ b/js/Misc/MBLOCK.pickle
@@ -24,16 +24,18 @@ aS'funam'
 p11
 aS'x'
 p12
-aS'out'
+aS'model'
 p13
-aS'type'
+aS'out'
 p14
-aS'Tintype'
+aS'type'
 p15
-aS'Tfunam'
+aS'Tintype'
 p16
-atp17
-Rp18
+aS'Tfunam'
+p17
+atp18
+Rp19
 .(dp0
 S'rhs_txt'
 p1
@@ -71,10 +73,9 @@ g11
 sS'lab_2_tmp'
 p15
 g5
-sS'x.model'
+sS"model.sim[('1', 'double')]"
 p16
-g7
-sS'exprs.outtype'
+NsS'exprs.outtype'
 p17
 g11
 sS'exprs.intype'
@@ -131,81 +132,82 @@ g5
 sS'x.graphics.in_implicit'
 p36
 g5
-sS'[ok,tt]'
+sS'x.model'
 p37
+g7
+sS'[ok,tt]'
+p38
 g11
 sS'mo.parameters'
-p38
+p39
 g5
 sS'Tparam_sz'
-p39
+p40
 g11
 sS'pprop'
-p40
+p41
 g23
 sS'model.out'
-p41
+p42
 g11
 sS'exprs.in1'
-p42
+p43
 g11
 sS'model.equations'
-p43
+p44
 g7
 sS'mo.outputs'
-p44
+p45
 g23
 sS'intype'
-p45
+p46
 g5
 sS'x.graphics.out_implicit'
-p46
+p47
 g23
 sS'in1'
-p47
+p48
 g5
 sS'model.rpar'
-p48
+p49
 g23
 sS'model.in1'
-p49
+p50
 g11
 sS'lhs_txt'
-p50
+p51
 g2
 sS'outtype'
-p51
+p52
 g23
 sS'graphics'
-p52
+p53
 g7
 sS'intypex'
-p53
+p54
 g11
 sS'lab_1'
-p54
+p55
 g5
 sS'lab_2'
-p55
-NsS'paramv[$+1-1]'
 p56
+NsS'paramv[$+1-1]'
+p57
 g2
 sS'[model,graphics,ok]'
-p57
+p58
 g11
 sS'ok'
-p58
-S'boolean'
 p59
-sS'model.blocktype'
+S'boolean'
 p60
+sS'model.blocktype'
+p61
 g2
 sS'exprs.param'
-p61
-g11
-sS'model.sim[1-1]'
 p62
-NsS'mo'
+g11
+sS'mo'
 p63
 g7
 sS'x.graphics'
@@ -228,7 +230,7 @@ p69
 g2
 sS'r'
 p70
-g59
+g60
 sS'lab_txt'
 p71
 g2
diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js
index c41ba30f..796c5f41 100644
--- a/js/Misc/MEMORY_f.js
+++ b/js/Misc/MEMORY_f.js
@@ -4,17 +4,17 @@ function MEMORY_f() {
         z = 0;
         in1 = 1;
         exprs = [[string(z)],[string(1)]];
-        model = scicos_model();
-        model.sim = "memo";
-        model.in1 = in1;
-        model.out = in1;
-        model.evtin = 1;
-        model.dstate = 0;
-        model.rpar = z;
-        model.blocktype = "m";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("memo");
+        this.model.in1 = new ScilabDouble(in1);
+        this.model.out = new ScilabDouble(in1);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.dstate = new ScilabDouble(0);
+        this.model.rpar = new ScilabDouble(z);
+        this.model.blocktype = new ScilabString("m");
+        this.model.dep_ut = [false,false];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     MEMORY_f.prototype.details = function MEMORY_f() {
@@ -33,7 +33,7 @@ function MEMORY_f() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.a,this.inh,exprs] = scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),exprs);
             if (!ok) {
@@ -44,7 +44,7 @@ function MEMORY_f() {
             } else {
                 this.inh = 1;
             }
-            [model,graphics,ok] = check_io(model,graphics,-1,-1,this.inh,[]);
+            [model,graphics,ok] = check_io(this.model,graphics,-1,-1,this.inh,[]);
             out = size(this.a,"*");
             if (out==0) {
                 ok = false;
@@ -53,11 +53,11 @@ function MEMORY_f() {
             in1 = out;
             if (ok) {
                 graphics.exprs = exprs;
-                model.rpar = this.a;
-                model.in1 = in1;
-                model.out = out;
+                this.model.rpar = new ScilabDouble(this.a);
+                this.model.in1 = new ScilabDouble(in1);
+                this.model.out = new ScilabDouble(out);
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle
index 01a64319..7bd771a3 100644
--- a/js/Misc/MEMORY_f.pickle
+++ b/js/Misc/MEMORY_f.pickle
@@ -6,10 +6,12 @@ S'a'
 p2
 aS'x'
 p3
-aS'inh'
+aS'model'
 p4
-atp5
-Rp6
+aS'inh'
+p5
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js
index 9d7de2f0..aaaf1dc5 100644
--- a/js/Misc/MPBLOCK.js
+++ b/js/Misc/MPBLOCK.js
@@ -10,24 +10,24 @@ function MPBLOCK() {
         pprop = [];
         nameF = "myModel";
         exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]);
-        model = scicos_model();
-        model.blocktype = "c";
-        model.dep_ut = [true,true];
-        model.rpar = [];
+        this.model = scicos_model();
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,true];
+        this.model.rpar = [];
         for (i=1;i<=lstsize(paramv);i+=1) {
-            model.rpar = [[model.rpar],[paramv[i-1].slice()]];
+            this.model.rpar = [[this.model.rpar],[paramv[i-1].slice()]];
         }
         mo = modelica();
         mo.model = nameF;
         mo.parameters = list(param,paramv);
-        model.sim = list(mo.model,10004);
+        this.model.sim = list(mo.model,10004);
         mo.inputs = this.in1;
         mo.outputs = this.out;
-        model.in1 = ones(size(mo.inputs,"r"),1);
-        model.out = ones(size(mo.outputs,"r"),1);
-        model.equations = mo;
+        this.model.in1 = new ScilabDouble(ones(size(mo.inputs,"r"),1));
+        this.model.out = new ScilabDouble(ones(size(mo.outputs,"r"),1));
+        this.model.equations = mo;
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         this.x.graphics.in_implicit = this.intype;
         this.x.graphics.out_implicit = this.outtype;
         return new BasicBlock(this.x);
@@ -42,14 +42,14 @@ function MPBLOCK() {
     }
     MPBLOCK.prototype.set = function MPBLOCK() {
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
         if (this.type[exprs-1]==15) {
             paramv = list();
             pprop = [];
-            for (i=1;i<=size(model.rpar,"*");i+=1) {
-                paramv[$+1-1] = string(model.rpar[i-1]);
+            for (i=1;i<=size(this.model.rpar,"*");i+=1) {
+                paramv[$+1-1] = string(this.model.rpar[i-1]);
                 pprop[$+1-1] = 0;
             }
             exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],exprs[1-1][1-1],exprs[1-1][2-1],exprs[1-1][3-1],exprs[1-1][4-1],exprs[1-1][5-1],paramv,sci2exp(pprop.slice()),exprs[1-1][7-1],exprs[2-1]);
@@ -165,7 +165,7 @@ function MPBLOCK() {
             if (ok) {
                 intypex = find(this.intype=="I");
                 outtypex = find(this.outtype=="I");
-                [model,graphics,ok] = set_io(model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex);
+                [model,graphics,ok] = set_io(this.model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex);
             }
             if (ok) {
                 Tparam_lab = evstr(Tparam);
@@ -231,12 +231,12 @@ function MPBLOCK() {
                         mo.parameters = list(transpose(param),paramv);
                     }
                 }
-                model.equations = mo;
-                model.rpar = [];
+                this.model.equations = new ScilabDouble(mo);
+                this.model.rpar = [];
                 for (i=1;i<=lstsize(paramv);i+=1) {
-                    model.rpar = [[model.rpar],[double(paramv[i-1].slice())]];
+                    this.model.rpar = [[this.model.rpar],[double(paramv[i-1].slice())]];
                 }
-                model.sim[1-1] = this.funam;
+                this.model.sim[('1', 'double')] = new ScilabDouble(this.funam);
                 exprs.in1 = lab_1[1-1];
                 exprs.intype = lab_1[2-1];
                 exprs.out = lab_1[3-1];
@@ -257,7 +257,7 @@ function MPBLOCK() {
                 exprs.pprop = lab_1[6-1];
                 exprs.nameF = lab_1[7-1];
                 exprs.funtxt = "";
-                this.x.model = model;
+                this.x.model = this.model;
                 graphics.gr_i[1-1][1-1] = "txt=[\' "+nameF+" \'];";
                 graphics.in_implicit = this.intype;
                 graphics.out_implicit = this.outtype;
diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle
index 8111b876..254048a6 100644
--- a/js/Misc/MPBLOCK.pickle
+++ b/js/Misc/MPBLOCK.pickle
@@ -12,12 +12,14 @@ aS'funam'
 p5
 aS'x'
 p6
-aS'type'
+aS'model'
 p7
-aS'out'
+aS'type'
 p8
-atp9
-Rp10
+aS'out'
+p9
+atp10
+Rp11
 .(dp0
 S'rhs_txt'
 p1
@@ -109,87 +111,87 @@ g5
 sS'paramv'
 p34
 g5
-sS'gr_i'
+sS"model.sim[('1', 'double')]"
 p35
+NsS'gr_i'
+p36
 g5
 sS'x.graphics.in_implicit'
-p36
+p37
 g5
 sS'x.model'
-p37
+p38
 g9
 sS'mo.parameters'
-p38
+p39
 g5
 sS'Tparam_sz'
-p39
+p40
 g7
 sS'pprop'
-p40
+p41
 g5
 sS'model.out'
-p41
+p42
 g7
 sS'exprs.in1'
-p42
+p43
 g7
 sS'model.equations'
-p43
+p44
 g9
 sS'mo.outputs'
-p44
+p45
 g23
 sS'intype'
-p45
+p46
 g5
 sS'x.graphics.out_implicit'
-p46
+p47
 g23
 sS'in1'
-p47
+p48
 g5
 sS'model.rpar'
-p48
+p49
 g23
 sS'model.in1'
-p49
+p50
 g7
 sS'lhs_txt'
-p50
+p51
 g2
 sS'outtype'
-p51
+p52
 g23
 sS'graphics'
-p52
+p53
 g9
 sS'intypex'
-p53
+p54
 g7
 sS'lab_1'
-p54
+p55
 g5
 sS'lab_2'
-p55
-NsS'paramv[$+1-1]'
 p56
+NsS'paramv[$+1-1]'
+p57
 g2
 sS'[model,graphics,ok]'
-p57
+p58
 g7
 sS'ok'
-p58
-S'boolean'
 p59
-sS'model.blocktype'
+S'boolean'
 p60
+sS'model.blocktype'
+p61
 g2
 sS'exprs.param'
-p61
-g7
-sS'model.sim[1-1]'
 p62
-NsS'mo'
+g7
+sS'mo'
 p63
 g9
 sS'x.graphics'
@@ -212,7 +214,7 @@ p69
 g2
 sS'r'
 p70
-g59
+g60
 sS'lab_txt'
 p71
 g2
diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js
index acb871f7..4b4f51bb 100644
--- a/js/Misc/PAL_f.js
+++ b/js/Misc/PAL_f.js
@@ -3,15 +3,15 @@ function PAL_f() {
     PAL_f.prototype.define = function PAL_f() {
         scs = scicos_diagram();
         scs.props.title = "Palette";
-        model = scicos_model();
-        model.sim = "palette";
-        model.in1 = [];
-        model.out = [];
-        model.rpar = scs;
-        model.blocktype = "h";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("palette");
+        this.model.in1 = [];
+        this.model.out = [];
+        this.model.rpar = new ScilabDouble(scs);
+        this.model.blocktype = new ScilabString("h");
+        this.model.dep_ut = [false,false];
         gr_i = [];
-        this.x = standard_define([2,2],model,[],gr_i);
+        this.x = standard_define([2,2],this.model,[],gr_i);
         this.x.graphics.id = scs.props.title[1-1];
         return new BasicBlock(this.x);
     }
diff --git a/js/Misc/PAL_f.pickle b/js/Misc/PAL_f.pickle
index 5419ab57..3c09443d 100644
--- a/js/Misc/PAL_f.pickle
+++ b/js/Misc/PAL_f.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js
index 968e7ba2..375b3739 100644
--- a/js/Misc/PENDULUM_ANIM.js
+++ b/js/Misc/PENDULUM_ANIM.js
@@ -8,17 +8,17 @@ function PENDULUM_ANIM() {
         this.xmax = 5;
         this.ymin = -5;
         this.ymax = 5;
-        model = scicos_model();
-        model.sim = list("anim_pen",5);
-        model.in1 = [[1],[1]];
-        model.evtin = 1;
-        model.dstate = 0;
-        model.rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
-        exprs = string(model.rpar);
+        this.model = scicos_model();
+        this.model.sim = list("anim_pen",5);
+        this.model.in1 = [[1],[1]];
+        this.model.evtin = new ScilabDouble(1);
+        this.model.dstate = new ScilabDouble(0);
+        this.model.rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
+        exprs = string(this.model.rpar);
         gr_i = [];
-        this.x = standard_define([3,3],model,exprs,gr_i);
+        this.x = standard_define([3,3],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() {
@@ -47,8 +47,8 @@ function PENDULUM_ANIM() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
-        dstate = model.dstate;
+        this.model = arg1.model;
+        dstate = this.model.dstate;
         while (true) {
             [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -71,10 +71,10 @@ function PENDULUM_ANIM() {
                 message(mess);
             } else {
                 rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
-                model.rpar = rpar;
+                this.model.rpar = rpar;
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle
index 5dc54d6a..9da37d3f 100644
--- a/js/Misc/PENDULUM_ANIM.pickle
+++ b/js/Misc/PENDULUM_ANIM.pickle
@@ -16,10 +16,12 @@ aS'xmin'
 p7
 aS'x'
 p8
-aS'ymin'
+aS'model'
 p9
-atp10
-Rp11
+aS'ymin'
+p10
+atp11
+Rp12
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js
index 37ed141f..55ea69c5 100644
--- a/js/Misc/RATELIMITER.js
+++ b/js/Misc/RATELIMITER.js
@@ -4,16 +4,16 @@ function RATELIMITER() {
         this.minp = -1;
         this.maxp = 1;
         rpar = [[this.maxp],[this.minp]];
-        model = scicos_model();
-        model.sim = list("ratelimiter",4);
-        model.in1 = 1;
-        model.out = 1;
-        model.rpar = rpar;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("ratelimiter",4);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.rpar = rpar;
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[string(this.maxp)],[string(this.minp)]];
         gr_i = [];
-        this.x = standard_define([3.5,2],model,exprs,gr_i);
+        this.x = standard_define([3.5,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     RATELIMITER.prototype.details = function RATELIMITER() {
@@ -32,7 +32,7 @@ function RATELIMITER() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.maxp,this.minp,exprs] = scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),exprs);
             if (!ok) {
@@ -42,10 +42,10 @@ function RATELIMITER() {
                 message("We must have max_slope> 0 > min_slope.");
             } else {
                 rpar = [[this.maxp],[this.minp]];
-                model.rpar = rpar;
+                this.model.rpar = rpar;
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle
index b1b68570..d2560e45 100644
--- a/js/Misc/RATELIMITER.pickle
+++ b/js/Misc/RATELIMITER.pickle
@@ -6,10 +6,12 @@ S'minp'
 p2
 aS'x'
 p3
-aS'maxp'
+aS'model'
 p4
-atp5
-Rp6
+aS'maxp'
+p5
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js
index 3243c91f..9cf2543e 100644
--- a/js/Misc/RELATIONALOP.js
+++ b/js/Misc/RELATIONALOP.js
@@ -3,16 +3,16 @@ function RELATIONALOP() {
     RELATIONALOP.prototype.define = function RELATIONALOP() {
         ipar = [2];
         label = "&lt";
-        model = scicos_model();
-        model.sim = list("relationalop",4);
-        model.in1 = [[1],[1]];
-        model.out = 1;
-        model.ipar = ipar;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("relationalop",4);
+        this.model.in1 = [[1],[1]];
+        this.model.out = new ScilabDouble(1);
+        this.model.ipar = ipar;
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = [[string(ipar)],[string(0)]];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label];
         return new BasicBlock(this.x);
     }
@@ -34,7 +34,7 @@ function RELATIONALOP() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         if (size(exprs,1)==2) {
             exprs = [[exprs],[sci2exp(1)]];
         }
@@ -52,19 +52,19 @@ function RELATIONALOP() {
                 ok = false;
             }
             if ((this.Datatype==1)) {
-                model.sim = list("relational_op",4);
+                this.model.sim = list("relational_op",4);
             } else if ((this.Datatype==3||this.Datatype==9)) {
-                model.sim = list("relational_op_i32",4);
+                this.model.sim = list("relational_op_i32",4);
             } else if ((this.Datatype==4)) {
-                model.sim = list("relational_op_i16",4);
+                this.model.sim = list("relational_op_i16",4);
             } else if ((this.Datatype==5)) {
-                model.sim = list("relational_op_i8",4);
+                this.model.sim = list("relational_op_i8",4);
             } else if ((this.Datatype==6)) {
-                model.sim = list("relational_op_ui32",4);
+                this.model.sim = list("relational_op_ui32",4);
             } else if ((this.Datatype==7)) {
-                model.sim = list("relational_op_ui16",4);
+                this.model.sim = list("relational_op_ui16",4);
             } else if ((this.Datatype==8)) {
-                model.sim = list("relational_op_ui8",4);
+                this.model.sim = list("relational_op_ui8",4);
             } else {
                 message("Datatype is not supported");
                 ok = false;
@@ -74,7 +74,7 @@ function RELATIONALOP() {
                 ot = this.Datatype;
                 in1 = [[-1,-2],[-1,-2]];
                 out = [-1,-2];
-                [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+                [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
             }
             if (ok) {
                 if (this.rule==0) {
@@ -92,11 +92,11 @@ function RELATIONALOP() {
                 }
                 graphics.exprs = exprs;
                 graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label];
-                model.ipar = [this.rule];
-                model.nzcross = this.zcr;
-                model.nmode = this.zcr;
+                this.model.ipar = [this.rule];
+                this.model.nzcross = new ScilabDouble(this.zcr);
+                this.model.nmode = new ScilabDouble(this.zcr);
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle
index e7d1051e..ee99972f 100644
--- a/js/Misc/RELATIONALOP.pickle
+++ b/js/Misc/RELATIONALOP.pickle
@@ -6,12 +6,14 @@ S'Datatype'
 p2
 aS'x'
 p3
-aS'zcr'
+aS'model'
 p4
-aS'rule'
+aS'zcr'
 p5
-atp6
-Rp7
+aS'rule'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js
index cb64d887..5cd7069b 100644
--- a/js/Misc/SPLIT_f.js
+++ b/js/Misc/SPLIT_f.js
@@ -1,13 +1,13 @@
 /* autogenerated from "macros/Misc/SPLIT_f.sci" */
 function SPLIT_f() {
     SPLIT_f.prototype.define = function SPLIT_f() {
-        model = scicos_model();
-        model.sim = "lsplit";
-        model.in1 = -1;
-        model.out = [[-1],[-1],[-1]];
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
-        this.x = standard_define([1,1]/3,model,[],[]);
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("lsplit");
+        this.model.in1 = new ScilabDouble(-1);
+        this.model.out = [[-1],[-1],[-1]];
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
+        this.x = standard_define([1,1]/3,this.model,[],[]);
         return new BasicBlock(this.x);
     }
     SPLIT_f.prototype.details = function SPLIT_f() {
diff --git a/js/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle
index c7dbe9ad..79869450 100644
--- a/js/Misc/SPLIT_f.pickle
+++ b/js/Misc/SPLIT_f.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js
index 5aab1088..0643d0d6 100644
--- a/js/Misc/SUPER_f.js
+++ b/js/Misc/SUPER_f.js
@@ -11,15 +11,15 @@ function SUPER_f() {
         out.graphics.sz = [20,20];
         scs.objs[1-1] = in1;
         scs.objs[2-1] = out;
-        model = scicos_model();
-        model.sim = "super";
-        model.in1 = 1;
-        model.out = 1;
-        model.rpar = scs;
-        model.blocktype = "h";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("super");
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.rpar = new ScilabDouble(scs);
+        this.model.blocktype = new ScilabString("h");
+        this.model.dep_ut = [false,false];
         gr_i = [];
-        this.x = standard_define([2,2],model,[],gr_i);
+        this.x = standard_define([2,2],this.model,[],gr_i);
         return new SuperBlock(this.x);
     }
     SUPER_f.prototype.details = function SUPER_f() {
diff --git a/js/Misc/SUPER_f.pickle b/js/Misc/SUPER_f.pickle
index 637c3eec..869f3e19 100644
--- a/js/Misc/SUPER_f.pickle
+++ b/js/Misc/SUPER_f.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'arg1'
 p1
diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js
index 85cd9cf1..8e36e155 100644
--- a/js/Misc/TEXT_f.js
+++ b/js/Misc/TEXT_f.js
@@ -3,16 +3,16 @@ function TEXT_f() {
     TEXT_f.prototype.define = function TEXT_f() {
         this.font = 2;
         this.siz = 1;
-        model = scicos_model();
-        model.sim = "text";
-        model.rpar = "Text";
-        model.ipar = [[this.font],[this.siz]];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("text");
+        this.model.rpar = new ScilabString("Text");
+        this.model.ipar = [[this.font],[this.siz]];
         exprs = [["Text"],[string(this.font)],[string(this.siz)]];
         graphics = scicos_graphics();
         graphics.orig = [0,0];
         graphics.sz = [2,1];
         graphics.exprs = exprs;
-        this.x = mlist(["Text","graphics","model","void","gui"],graphics,model," ","TEXT_f");
+        this.x = mlist(["Text","graphics","model","void","gui"],graphics,this.model," ","TEXT_f");
         return new TextBlock(this.x);
     }
     TEXT_f.prototype.details = function TEXT_f() {
@@ -34,7 +34,7 @@ function TEXT_f() {
         graphics = arg1.graphics;
         orig = graphics.orig;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         if (size(exprs,"*")==1) {
             exprs = [[exprs],["3"],["1"]];
         }
@@ -67,9 +67,9 @@ function TEXT_f() {
                 graphics.sz = sz;
                 this.x.graphics = graphics;
                 ipar = [[this.font],[this.siz]];
-                model.rpar = this.txt;
-                model.ipar = ipar;
-                this.x.model = model;
+                this.model.rpar = new ScilabDouble(this.txt);
+                this.model.ipar = ipar;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Misc/TEXT_f.pickle b/js/Misc/TEXT_f.pickle
index 00917182..0f0dda2e 100644
--- a/js/Misc/TEXT_f.pickle
+++ b/js/Misc/TEXT_f.pickle
@@ -6,12 +6,14 @@ S'font'
 p2
 aS'x'
 p3
-aS'txt'
+aS'model'
 p4
-aS'siz'
+aS'txt'
 p5
-atp6
-Rp7
+aS'siz'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js
index 51dc7208..3c1e294c 100644
--- a/js/Misc/c_block.js
+++ b/js/Misc/c_block.js
@@ -11,22 +11,22 @@ function c_block() {
         auto = [];
         this.rpar = [];
         this.funam = "toto";
-        model = scicos_model();
-        model.sim = list(" ",2001);
-        model.in1 = in1;
-        model.out = out;
-        model.evtin = clkin;
-        model.evtout = clkout;
-        model.state = x0;
-        model.dstate = z0;
-        model.rpar = this.rpar;
-        model.ipar = 0;
-        model.blocktype = typ;
-        model.firing = auto;
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list(" ",2001);
+        this.model.in1 = new ScilabDouble(in1);
+        this.model.out = new ScilabDouble(out);
+        this.model.evtin = clkin;
+        this.model.evtout = clkout;
+        this.model.state = x0;
+        this.model.dstate = z0;
+        this.model.rpar = this.rpar;
+        this.model.ipar = new ScilabDouble(0);
+        this.model.blocktype = new ScilabString(typ);
+        this.model.firing = auto;
+        this.model.dep_ut = [true,false];
         label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([]));
         gr_i = [];
-        this.x = standard_define([3,2],model,label,gr_i);
+        this.x = standard_define([3,2],this.model,label,gr_i);
         return new BasicBlock(this.x);
     }
     c_block.prototype.details = function c_block() {
@@ -48,7 +48,7 @@ function c_block() {
         this.funam = arguments[0]["funam"]
         this.lab = arguments[0]["lab"]
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         label = graphics.exprs;
         while (true) {
@@ -66,19 +66,19 @@ function c_block() {
             this.o = int(this.o.slice());
             no = size(this.o,1);
             tt = label[2-1];
-            if (model.sim[1-1]!=this.funam||size(model.in1,"*")!=size(this.i,"*")||size(model.out,"*")!=size(this.o,"*")) {
+            if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) {
                 tt = [];
             }
             [ok,tt] = CFORTR(this.funam,tt,this.i,this.o);
             if (!ok) {
                 break;
             }
-            [model,graphics,ok] = check_io(model,graphics,this.i,this.o,[],[]);
+            [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]);
             if (ok) {
-                model.sim[1-1] = this.funam;
-                model.rpar = this.rpar;
+                this.model.sim[('1', 'double')] = new ScilabString(this.funam);
+                this.model.rpar = this.rpar;
                 label[2-1] = tt;
-                this.x.model = model;
+                this.x.model = this.model;
                 graphics.exprs = label;
                 this.x.graphics = graphics;
                 break;
diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle
index 8c4e56b0..e00e2815 100644
--- a/js/Misc/c_block.pickle
+++ b/js/Misc/c_block.pickle
@@ -4,18 +4,20 @@ p0
 ((lp1
 S'i'
 p2
-aS'lab'
+aS'o'
 p3
 aS'rpar'
 p4
-aS'o'
+aS'lab'
 p5
 aS'funam'
 p6
 aS'x'
 p7
-atp8
-Rp9
+aS'model'
+p8
+atp9
+Rp10
 .(dp0
 S'label[1-1]'
 p1
@@ -115,18 +117,18 @@ g9
 sS'typ'
 p36
 g13
-sS'[model,graphics,ok]'
+sS"model.sim[('1', 'double')]"
 p37
+NsS'[model,graphics,ok]'
+p38
 g9
 sS'model.blocktype'
-p38
+p39
 g13
 sS'i'
-p39
-g9
-sS'model.sim[1-1]'
 p40
-NsS'no'
+g9
+sS'no'
 p41
 g9
 sS'o'
diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js
index 39673360..e1653c52 100644
--- a/js/Misc/fortran_block.js
+++ b/js/Misc/fortran_block.js
@@ -1,23 +1,23 @@
 /* autogenerated from "macros/Misc/fortran_block.sci" */
 function fortran_block() {
     fortran_block.prototype.define = function fortran_block() {
-        model = scicos_model();
-        model.sim = list(" ",1001);
-        model.in1 = 1;
-        model.out = 1;
-        model.evtin = [];
-        model.evtout = [];
-        model.state = [];
-        model.dstate = [];
-        model.rpar = [];
-        model.ipar = 0;
-        model.blocktype = "c";
-        model.firing = [];
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list(" ",1001);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.evtin = [];
+        this.model.evtout = [];
+        this.model.state = [];
+        this.model.dstate = [];
+        this.model.rpar = [];
+        this.model.ipar = new ScilabDouble(0);
+        this.model.blocktype = new ScilabString("c");
+        this.model.firing = [];
+        this.model.dep_ut = [true,false];
         this.funam = "forty";
-        label = list([[sci2exp(model.in1)],[sci2exp(model.out)],[strcat(sci2exp(model.rpar))],[this.funam]],list([]));
+        label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([]));
         gr_i = [];
-        this.x = standard_define([4,2],model,label,gr_i);
+        this.x = standard_define([4,2],this.model,label,gr_i);
         return new BasicBlock(this.x);
     }
     fortran_block.prototype.details = function fortran_block() {
@@ -39,7 +39,7 @@ function fortran_block() {
         this.funam = arguments[0]["funam"]
         this.lab = arguments[0]["lab"]
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         label = graphics.exprs;
         while (true) {
@@ -57,19 +57,19 @@ function fortran_block() {
             this.o = int(this.o.slice());
             no = size(this.o,1);
             tt = label[2-1];
-            if (model.sim[1-1]!=this.funam||size(model.in1,"*")!=size(this.i,"*")||size(model.out,"*")!=size(this.o,"*")) {
+            if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) {
                 tt = [];
             }
             [ok,tt] = FORTR(this.funam,tt,this.i,this.o);
             if (!ok) {
                 break;
             }
-            [model,graphics,ok] = check_io(model,graphics,this.i,this.o,[],[]);
+            [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]);
             if (ok) {
-                model.sim[1-1] = this.funam;
-                model.rpar = this.rpar;
+                this.model.sim[('1', 'double')] = new ScilabString(this.funam);
+                this.model.rpar = this.rpar;
                 label[2-1] = tt;
-                this.x.model = model;
+                this.x.model = this.model;
                 graphics.exprs = label;
                 this.x.graphics = graphics;
                 break;
diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle
index 7d55f9e0..a1ae09c9 100644
--- a/js/Misc/fortran_block.pickle
+++ b/js/Misc/fortran_block.pickle
@@ -4,18 +4,20 @@ p0
 ((lp1
 S'i'
 p2
-aS'lab'
+aS'o'
 p3
 aS'rpar'
 p4
-aS'o'
+aS'lab'
 p5
 aS'funam'
 p6
 aS'x'
 p7
-atp8
-Rp9
+aS'model'
+p8
+atp9
+Rp10
 .(dp0
 S'label[1-1]'
 p1
@@ -94,18 +96,18 @@ g13
 sS'typ'
 p29
 g3
-sS'[model,graphics,ok]'
+sS"model.sim[('1', 'double')]"
 p30
+NsS'[model,graphics,ok]'
+p31
 g13
 sS'model.blocktype'
-p31
+p32
 g9
 sS'i'
-p32
-g13
-sS'model.sim[1-1]'
 p33
-NsS'no'
+g13
+sS'no'
 p34
 g13
 sS'o'
diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js
index e275af9e..9beb288c 100644
--- a/js/Misc/func_block.js
+++ b/js/Misc/func_block.js
@@ -1,15 +1,15 @@
 /* autogenerated from "macros/Misc/func_block.sci" */
 function func_block() {
     func_block.prototype.define = function func_block() {
-        model = scicos_model();
-        model.sim = " ";
-        model.in1 = 1;
-        model.out = 1;
-        model.blocktype = "c";
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString(" ");
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [true,false];
         exprs = "v=sin(u);y=u*v";
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     func_block.prototype.details = function func_block() {
@@ -21,16 +21,16 @@ function func_block() {
         return options;
     }
     func_block.prototype.set = function func_block() {
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
         this.x = arg1;
-        model = this.x.model;
+        this.model = this.x.model;
         [ok,mac,exprs] = this.genfunc[exprs-1];
         if (ok) {
-            model.sim = mac;
+            this.model.sim = new ScilabDouble(mac);
             graphics.exprs = exprs;
-            this.x.model = model;
+            this.x.model = this.model;
             this.x.graphics = graphics;
         }
         return new BasicBlock(this.x);
diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle
index 1e2bda67..a9ca4a5b 100644
--- a/js/Misc/func_block.pickle
+++ b/js/Misc/func_block.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'genfunc'
+aS'model'
 p3
-atp4
-Rp5
+aS'genfunc'
+p4
+atp5
+Rp6
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js
index 5325cc7e..a7cf464a 100644
--- a/js/Misc/generic_block.js
+++ b/js/Misc/generic_block.js
@@ -1,24 +1,24 @@
 /* autogenerated from "macros/Misc/generic_block.sci" */
 function generic_block() {
     generic_block.prototype.define = function generic_block() {
-        model = scicos_model();
+        this.model = scicos_model();
         this.function_name = "sinblk";
         this.funtyp = 1;
-        model.sim = list(this.function_name,this.funtyp);
-        model.in1 = 1;
-        model.out = 1;
-        model.evtin = [];
-        model.evtout = [];
-        model.state = [];
-        model.dstate = [];
-        model.rpar = [];
-        model.ipar = [];
-        model.blocktype = "c";
-        model.firing = [];
-        model.dep_ut = [true,false];
-        label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(model.in1)],[sci2exp(model.out)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.firing)],["y"],["n"]];
+        this.model.sim = list(this.function_name,this.funtyp);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.evtin = [];
+        this.model.evtout = [];
+        this.model.state = [];
+        this.model.dstate = [];
+        this.model.rpar = [];
+        this.model.ipar = [];
+        this.model.blocktype = new ScilabString("c");
+        this.model.firing = [];
+        this.model.dep_ut = [true,false];
+        label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]];
         gr_i = [];
-        this.x = standard_define([2,2],model,label,gr_i);
+        this.x = standard_define([2,2],this.model,label,gr_i);
         return new BasicBlock(this.x);
     }
     generic_block.prototype.details = function generic_block() {
@@ -58,7 +58,7 @@ function generic_block() {
         this.dept = parseBoolean(arguments[0]["dept"])
         this.lab = arguments[0]["lab"]
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         label = graphics.exprs;
         if (size(label,"*")==14) {
@@ -104,20 +104,20 @@ function generic_block() {
             }
             dep_ut = [this.depu,this.dept];
             if (ok) {
-                [model,graphics,ok] = check_io(model,graphics,this.i,this.o,this.ci,this.co);
+                [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co);
             }
             if (ok) {
                 if (this.funtyp==3) {
                     needcompile = 4;
                 }
-                model.sim = list(this.function_name,this.funtyp);
-                model.state = this.xx;
-                model.dstate = this.z;
-                model.rpar = this.rpar;
-                model.ipar = this.ipar;
-                model.firing = this.auto0;
-                model.dep_ut = dep_ut;
-                arg1.model = model;
+                this.model.sim = list(this.function_name,this.funtyp);
+                this.model.state = this.xx;
+                this.model.dstate = this.z;
+                this.model.rpar = this.rpar;
+                this.model.ipar = new ScilabDouble(this.ipar);
+                this.model.firing = new ScilabDouble(this.auto0);
+                this.model.dep_ut = dep_ut;
+                arg1.model = this.model;
                 graphics.exprs = label;
                 arg1.graphics = graphics;
                 this.x = arg1;
diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle
index 062e236f..a9ee5efa 100644
--- a/js/Misc/generic_block.pickle
+++ b/js/Misc/generic_block.pickle
@@ -28,12 +28,14 @@ aS'ipar'
 p13
 aS'x'
 p14
-aS'z'
+aS'model'
 p15
-aS'function_name'
+aS'z'
 p16
-atp17
-Rp18
+aS'function_name'
+p17
+atp18
+Rp19
 .(dp0
 S'ci'
 p1
diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js
index bdd9308a..238255e7 100644
--- a/js/Misc/generic_block2.js
+++ b/js/Misc/generic_block2.js
@@ -1,24 +1,24 @@
 /* autogenerated from "macros/Misc/generic_block2.sci" */
 function generic_block2() {
     generic_block2.prototype.define = function generic_block2() {
-        model = scicos_model();
+        this.model = scicos_model();
         this.function_name = "sinblk";
         this.funtyp = 1;
-        model.sim = list(this.function_name,this.funtyp);
-        model.in1 = 1;
-        model.out = 1;
-        model.evtin = [];
-        model.evtout = [];
-        model.state = [];
-        model.dstate = [];
-        model.rpar = [];
-        model.ipar = [];
-        model.blocktype = "c";
-        model.firing = [];
-        model.dep_ut = [true,false];
-        label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(model.in1)],[sci2exp(model.out)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]];
+        this.model.sim = list(this.function_name,this.funtyp);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.evtin = [];
+        this.model.evtout = [];
+        this.model.state = [];
+        this.model.dstate = [];
+        this.model.rpar = [];
+        this.model.ipar = [];
+        this.model.blocktype = new ScilabString("c");
+        this.model.firing = [];
+        this.model.dep_ut = [true,false];
+        label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]];
         gr_i = [];
-        this.x = standard_define([2,2],model,label,gr_i);
+        this.x = standard_define([2,2],this.model,label,gr_i);
         return new BasicBlock(this.x);
     }
     generic_block2.prototype.details = function generic_block2() {
@@ -62,7 +62,7 @@ function generic_block2() {
         this.dept = parseBoolean(arguments[0]["dept"])
         this.lab = arguments[0]["lab"]
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         label = graphics.exprs;
         if (size(label,"*")==14) {
@@ -108,22 +108,22 @@ function generic_block2() {
             }
             dep_ut = [this.depu,this.dept];
             if (ok) {
-                [model,graphics,ok] = check_io(model,graphics,this.i,this.o,this.ci,this.co);
+                [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co);
             }
             if (ok) {
                 if (this.funtyp==3) {
                     needcompile = 4;
                 }
-                model.sim = list(this.function_name,this.funtyp);
-                model.state = this.xx;
-                model.dstate = this.z;
-                model.rpar = this.rpar;
-                model.ipar = this.ipar;
-                model.firing = this.auto0;
-                model.nzcross = this.nzcr;
-                model.nmode = this.nmode;
-                model.dep_ut = dep_ut;
-                arg1.model = model;
+                this.model.sim = list(this.function_name,this.funtyp);
+                this.model.state = this.xx;
+                this.model.dstate = this.z;
+                this.model.rpar = this.rpar;
+                this.model.ipar = new ScilabDouble(this.ipar);
+                this.model.firing = new ScilabDouble(this.auto0);
+                this.model.nzcross = new ScilabDouble(this.nzcr);
+                this.model.nmode = new ScilabDouble(this.nmode);
+                this.model.dep_ut = dep_ut;
+                arg1.model = this.model;
                 graphics.exprs = label;
                 arg1.graphics = graphics;
                 this.x = arg1;
diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle
index bbb617c2..385adc45 100644
--- a/js/Misc/generic_block2.pickle
+++ b/js/Misc/generic_block2.pickle
@@ -30,14 +30,16 @@ aS'ipar'
 p14
 aS'x'
 p15
-aS'z'
+aS'model'
 p16
-aS'nmode'
+aS'z'
 p17
-aS'function_name'
+aS'nmode'
 p18
-atp19
-Rp20
+aS'function_name'
+p19
+atp20
+Rp21
 .(dp0
 S'ci'
 p1
diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js
index 137032a3..d2f1d8c3 100644
--- a/js/Misc/generic_block3.js
+++ b/js/Misc/generic_block3.js
@@ -1,20 +1,20 @@
 /* autogenerated from "macros/Misc/generic_block3.sci" */
 function generic_block3() {
     generic_block3.prototype.define = function generic_block3() {
-        model = scicos_model();
+        this.model = scicos_model();
         this.function_name = "sinblk";
         this.funtyp = 4;
-        model.sim = list(this.function_name,this.funtyp);
-        model.in1 = 1;
-        model.in2 = 1;
-        model.intyp = 1;
-        model.out = 1;
-        model.out2 = 1;
-        model.outtyp = 1;
-        model.dep_ut = [true,false];
-        label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([model.in1,model.in2])],[sci2exp(model.intyp)],[sci2exp([model.out,model.out2]),sci2exp(model.outtyp)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.odstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.opar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]];
+        this.model.sim = list(this.function_name,this.funtyp);
+        this.model.in1 = new ScilabDouble(1);
+        this.model.in2 = new ScilabDouble(1);
+        this.model.intyp = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.outtyp = new ScilabDouble(1);
+        this.model.dep_ut = [true,false];
+        label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]];
         gr_i = [];
-        this.x = standard_define([4,2],model,label,gr_i);
+        this.x = standard_define([4,2],this.model,label,gr_i);
         return new BasicBlock(this.x);
     }
     generic_block3.prototype.details = function generic_block3() {
@@ -66,7 +66,7 @@ function generic_block3() {
         this.dept = parseBoolean(arguments[0]["dept"])
         this.lab = arguments[0]["lab"]
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         label = graphics.exprs;
         if (size(label,"*")==14) {
@@ -118,24 +118,24 @@ function generic_block3() {
             }
             dep_ut = [this.depu,this.dept];
             if (ok) {
-                [model,graphics,ok] = set_io(model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co);
+                [model,graphics,ok] = set_io(this.model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co);
             }
             if (ok) {
                 if (this.funtyp==3) {
                     needcompile = 4;
                 }
-                model.sim = list(this.function_name,this.funtyp);
-                model.state = this.xx;
-                model.dstate = this.z;
-                model.odstate = this.oz;
-                model.rpar = this.rpar;
-                model.ipar = this.ipar;
-                model.opar = this.opar;
-                model.firing = this.auto0;
-                model.nzcross = this.nzcr;
-                model.nmode = this.nmode;
-                model.dep_ut = dep_ut;
-                arg1.model = model;
+                this.model.sim = list(this.function_name,this.funtyp);
+                this.model.state = this.xx;
+                this.model.dstate = this.z;
+                this.model.odstate = new ScilabDouble(this.oz);
+                this.model.rpar = this.rpar;
+                this.model.ipar = new ScilabDouble(this.ipar);
+                this.model.opar = new ScilabDouble(this.opar);
+                this.model.firing = new ScilabDouble(this.auto0);
+                this.model.nzcross = new ScilabDouble(this.nzcr);
+                this.model.nmode = new ScilabDouble(this.nmode);
+                this.model.dep_ut = dep_ut;
+                arg1.model = this.model;
                 graphics.exprs = label;
                 arg1.graphics = graphics;
                 this.x = arg1;
diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle
index cbb0d2a5..0019316c 100644
--- a/js/Misc/generic_block3.pickle
+++ b/js/Misc/generic_block3.pickle
@@ -44,10 +44,12 @@ aS'ipar'
 p21
 aS'x'
 p22
-aS'ot'
+aS'model'
 p23
-atp24
-Rp25
+aS'ot'
+p24
+atp25
+Rp26
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js
index 4e016a08..a68de77f 100644
--- a/js/Misc/scifunc_block.js
+++ b/js/Misc/scifunc_block.js
@@ -10,23 +10,23 @@ function scifunc_block() {
         typ = "c";
         auto = [];
         this.rpar = [];
-        model = scicos_model();
-        model.sim = list("scifunc",3);
-        model.in1 = in1;
-        model.out = out;
-        model.evtin = clkin;
-        model.evtout = clkout;
-        model.state = x0;
-        model.dstate = z0;
-        model.rpar = this.rpar;
-        model.ipar = 0;
-        model.opar = list();
-        model.blocktype = typ;
-        model.firing = auto;
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("scifunc",3);
+        this.model.in1 = new ScilabDouble(in1);
+        this.model.out = new ScilabDouble(out);
+        this.model.evtin = clkin;
+        this.model.evtout = clkout;
+        this.model.state = x0;
+        this.model.dstate = z0;
+        this.model.rpar = this.rpar;
+        this.model.ipar = new ScilabDouble(0);
+        this.model.opar = list();
+        this.model.blocktype = new ScilabString(typ);
+        this.model.firing = auto;
+        this.model.dep_ut = [true,false];
         exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     scifunc_block.prototype.details = function scifunc_block() {
@@ -59,7 +59,7 @@ function scifunc_block() {
         this.lab = arguments[0]["lab"]
         needcompile = 0;
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
         if (size(exprs[1-1],"*")==8) {
@@ -88,23 +88,23 @@ function scifunc_block() {
             if (!ok) {
                 break;
             }
-            [model,graphics,ok] = check_io(model,graphics,this.i,this.o,this.ci,this.co);
+            [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co);
             if (ok) {
                 auto = this.auto0;
-                model.state = this.xx;
-                model.dstate = this.z;
-                model.rpar = this.rpar;
-                if (model.ipar!=0) {
-                    model.opar = model.ipar;
-                    model.ipar = 0;
+                this.model.state = this.xx;
+                this.model.dstate = this.z;
+                this.model.rpar = this.rpar;
+                if (this.model.ipar!=0) {
+                    this.model.opar = new ScilabDouble(this.model.ipar);
+                    this.model.ipar = new ScilabDouble(0);
                 }
-                if (or(model.opar!=tt)) {
+                if (or(this.model.opar!=tt)) {
                     needcompile = 4;
                 }
-                model.opar = tt;
-                model.firing = auto;
-                model.dep_ut = dep_ut;
-                this.x.model = model;
+                this.model.opar = new ScilabDouble(tt);
+                this.model.firing = new ScilabDouble(auto);
+                this.model.dep_ut = new ScilabDouble(dep_ut);
+                this.x.model = this.model;
                 exprs[2-1] = tt;
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle
index fc2d3cfd..e4976df1 100644
--- a/js/Misc/scifunc_block.pickle
+++ b/js/Misc/scifunc_block.pickle
@@ -22,10 +22,12 @@ aS'lab'
 p10
 aS'x'
 p11
-aS'z'
+aS'model'
 p12
-atp13
-Rp14
+aS'z'
+p13
+atp14
+Rp15
 .(dp0
 S'exprs[1-1]'
 p1
diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js
index f53b1d5d..869b6256 100644
--- a/js/Misc/scifunc_block_m.js
+++ b/js/Misc/scifunc_block_m.js
@@ -11,27 +11,27 @@ function scifunc_block_m() {
         auto = [];
         this.rpar = [];
         it = 1;
-        model = scicos_model();
-        model.sim = list("scifunc",3);
-        model.in1 = in1;
-        model.in2 = in1;
-        model.intyp = it;
-        model.out = out;
-        model.out2 = out;
-        model.outtyp = it;
-        model.evtin = clkin;
-        model.evtout = clkout;
-        model.state = x0;
-        model.dstate = z0;
-        model.rpar = this.rpar;
-        model.ipar = 0;
-        model.opar = list();
-        model.blocktype = typ;
-        model.firing = auto;
-        model.dep_ut = [true,false];
+        this.model = scicos_model();
+        this.model.sim = list("scifunc",3);
+        this.model.in1 = new ScilabDouble(in1);
+        this.model.in2 = new ScilabDouble(in1);
+        this.model.intyp = new ScilabDouble(it);
+        this.model.out = new ScilabDouble(out);
+        this.model.out2 = new ScilabDouble(out);
+        this.model.outtyp = new ScilabDouble(it);
+        this.model.evtin = clkin;
+        this.model.evtout = clkout;
+        this.model.state = x0;
+        this.model.dstate = z0;
+        this.model.rpar = this.rpar;
+        this.model.ipar = new ScilabDouble(0);
+        this.model.opar = list();
+        this.model.blocktype = new ScilabString(typ);
+        this.model.firing = auto;
+        this.model.dep_ut = [true,false];
         exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
         gr_i = [];
-        this.x = standard_define([4,2],model,exprs,gr_i);
+        this.x = standard_define([4,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     scifunc_block_m.prototype.details = function scifunc_block_m() {
@@ -64,7 +64,7 @@ function scifunc_block_m() {
         this.lab = arguments[0]["lab"]
         needcompile = 0;
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
         while (true) {
@@ -90,23 +90,23 @@ function scifunc_block_m() {
             if (!ok) {
                 break;
             }
-            [model,graphics,ok] = set_io(model,graphics,list(this.i,it),list(this.o,ot),this.ci,this.co);
+            [model,graphics,ok] = set_io(this.model,graphics,list(this.i,it),list(this.o,ot),this.ci,this.co);
             if (ok) {
                 auto = this.auto0;
-                model.state = this.xx;
-                model.dstate = this.z;
-                model.rpar = this.rpar;
-                if (model.ipar!=0) {
-                    model.opar = model.ipar;
-                    model.ipar = 0;
+                this.model.state = this.xx;
+                this.model.dstate = this.z;
+                this.model.rpar = this.rpar;
+                if (this.model.ipar!=0) {
+                    this.model.opar = new ScilabDouble(this.model.ipar);
+                    this.model.ipar = new ScilabDouble(0);
                 }
-                if (or(model.opar!=tt)) {
+                if (or(this.model.opar!=tt)) {
                     needcompile = 4;
                 }
-                model.opar = tt;
-                model.firing = auto;
-                model.dep_ut = dep_ut;
-                this.x.model = model;
+                this.model.opar = new ScilabDouble(tt);
+                this.model.firing = new ScilabDouble(auto);
+                this.model.dep_ut = new ScilabDouble(dep_ut);
+                this.x.model = this.model;
                 exprs[2-1] = tt;
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle
index e1528369..f9726e27 100644
--- a/js/Misc/scifunc_block_m.pickle
+++ b/js/Misc/scifunc_block_m.pickle
@@ -22,10 +22,12 @@ aS'lab'
 p10
 aS'x'
 p11
-aS'z'
+aS'model'
 p12
-atp13
-Rp14
+aS'z'
+p13
+atp14
+Rp15
 .(dp0
 S'exprs[1-1]'
 p1