support for new standard_define

12 files changed, 12 insertions, 17 deletions

diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index 0a38027e..985822af 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -29,7 +29,7 @@ function Bache() {
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
         this.exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0));
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
         this.x.graphics.in_implicit = [["I"],["I"]];
         this.x.graphics.out_implicit = [["I"],["I"],["E"]];
         return new BasicBlock(this.x);
diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle
index d6882307..2df2dbe9 100644
--- a/js/Hydraulics/Bache.pickle
+++ b/js/Hydraulics/Bache.pickle
@@ -144,8 +144,7 @@ p41
 g15
 sS'x'
 p42
-g8
-sS'model'
+NsS'model'
 p43
 g2
 s.
\ No newline at end of file
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index 7e220e74..626793c5 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -44,7 +44,7 @@ function Flowmeter() {
         this.model.equations = new ScilabDouble([mo]);
         this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]);
         this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]);
-        this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0));
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
         this.x.graphics.in_implicit = Typein;
         this.x.graphics.out_implicit = Typeout;
         return new BasicBlock(this.x);
diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle
index 253671ff..761970c0 100644
--- a/js/Hydraulics/Flowmeter.pickle
+++ b/js/Hydraulics/Flowmeter.pickle
@@ -114,7 +114,7 @@ p36
 g13
 sS'x'
 p37
-g8
+g4
 sS'model'
 p38
 g4
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 15d9712d..991c97f2 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -24,7 +24,7 @@ function PerteDP() {
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
         this.exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]);
-        this.x = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0));
+        this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         this.x.graphics.out_implicit = ["I"];
         return new BasicBlock(this.x);
diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle
index 4040064e..9a6a7868 100644
--- a/js/Hydraulics/PerteDP.pickle
+++ b/js/Hydraulics/PerteDP.pickle
@@ -120,8 +120,7 @@ p35
 g12
 sS'x'
 p36
-g8
-sS'model'
+NsS'model'
 p37
 g2
 sS'lambda'
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index 806f8670..1fa51bff 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -18,7 +18,7 @@ function PuitsP() {
         this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
         this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]);
-        this.x = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0));
+        this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,list(this.gr_i,0));
         this.x.graphics.in_implicit = ["I"];
         return new BasicBlock(this.x);
     }
diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle
index 44da3894..a9dafdc3 100644
--- a/js/Hydraulics/PuitsP.pickle
+++ b/js/Hydraulics/PuitsP.pickle
@@ -101,8 +101,7 @@ p30
 g9
 sS'x'
 p31
-g12
-sS'model'
+NsS'model'
 p32
 g2
 sS'H0'
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index 2e87d24f..f4907aaf 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -20,7 +20,7 @@ function SourceP() {
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
         this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]);
-        this.x = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0));
+        this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,list(this.gr_i,0));
         this.x.graphics.out_implicit = ["I"];
         return new BasicBlock(this.x);
     }
diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle
index ec2ddf49..9cf7d20a 100644
--- a/js/Hydraulics/SourceP.pickle
+++ b/js/Hydraulics/SourceP.pickle
@@ -107,8 +107,7 @@ p32
 g11
 sS'x'
 p33
-g8
-sS'model'
+NsS'model'
 p34
 g2
 sS'H0'
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index 044b38bc..c44ccdbf 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -20,7 +20,7 @@ function VanneReglante() {
         this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
         this.exprs = [[string(this.Cvmax)],[string(this.p_rho)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0));
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
         this.x.graphics.in_implicit = [["I"],["E"]];
         this.x.graphics.out_implicit = ["I"];
         return new BasicBlock(this.x);
diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle
index d1fa2534..01b477cf 100644
--- a/js/Hydraulics/VanneReglante.pickle
+++ b/js/Hydraulics/VanneReglante.pickle
@@ -103,8 +103,7 @@ p32
 g12
 sS'x'
 p33
-g7
-sS'model'
+NsS'model'
 p34
 g2
 s.
\ No newline at end of file