summaryrefslogtreecommitdiff
path: root/js/Hydraulics
diff options
context:
space:
mode:
authorSunil Shetye2018-07-12 23:16:08 +0530
committerSunil Shetye2018-07-13 10:21:08 +0530
commit214ade87a6cef2bf55f9b9f2848ffafc02f37f18 (patch)
tree50fdfe7b1e8850622825e362ca865be3f0911009 /js/Hydraulics
parenta2bfd6050ab2b5b6bbede92393b1f61d4ecc25aa (diff)
downloadsci2js-214ade87a6cef2bf55f9b9f2848ffafc02f37f18.tar.gz
sci2js-214ade87a6cef2bf55f9b9f2848ffafc02f37f18.tar.bz2
sci2js-214ade87a6cef2bf55f9b9f2848ffafc02f37f18.zip
add more global variables
Diffstat (limited to 'js/Hydraulics')
-rw-r--r--js/Hydraulics/Bache.js13
-rw-r--r--js/Hydraulics/Bache.pickle20
-rw-r--r--js/Hydraulics/Flowmeter.js15
-rw-r--r--js/Hydraulics/Flowmeter.pickle14
-rw-r--r--js/Hydraulics/PerteDP.js13
-rw-r--r--js/Hydraulics/PerteDP.pickle22
-rw-r--r--js/Hydraulics/PuitsP.js13
-rw-r--r--js/Hydraulics/PuitsP.pickle16
-rw-r--r--js/Hydraulics/SourceP.js13
-rw-r--r--js/Hydraulics/SourceP.pickle16
-rw-r--r--js/Hydraulics/VanneReglante.js13
-rw-r--r--js/Hydraulics/VanneReglante.pickle16
12 files changed, 107 insertions, 77 deletions
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index cccef914..210d7d51 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -27,9 +27,9 @@ function Bache() {
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)]);
- var 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)]];
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
+ 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.graphics.in_implicit = [["I"],["I"]];
this.x.graphics.out_implicit = [["I"],["I"],["E"]];
return new BasicBlock(this.x);
@@ -61,18 +61,19 @@ function Bache() {
this.z0 = parseFloat(arguments[0]["z0"])
this.T0 = parseFloat(arguments[0]["T0"])
this.p_rho = parseFloat(arguments[0]["p_rho"])
+ this.exprs = arguments[0]["exprs"]
this.x = arg1;
this.graphics = arg1.graphics;
- var exprs = this.graphics.exprs;
+ this.exprs = this.graphics.exprs;
this.model = arg1.model;
while (true) {
- [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+ [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,this.exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
if (!ok) {
break;
}
this.model.rpar = new ScilabDouble([this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]);
this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Patm]), new ScilabDouble([this.A]), new ScilabDouble([this.ze1]), new ScilabDouble([this.ze2]), new ScilabDouble([this.zs1]), new ScilabDouble([this.zs2]), new ScilabDouble([this.z0]), new ScilabDouble([this.T0]), new ScilabDouble([this.p_rho]));
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.x.graphics = this.graphics;
this.x.model = this.model;
break;
diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle
index f8030454..e1dd2964 100644
--- a/js/Hydraulics/Bache.pickle
+++ b/js/Hydraulics/Bache.pickle
@@ -14,20 +14,24 @@ aS'T0'
p6
aS'ze2'
p7
-aS'ze1'
+aS'exprs'
p8
-aS'p_rho'
+aS'ze1'
p9
-aS'graphics'
+aS'gr_i'
p10
-aS'x'
+aS'p_rho'
p11
-aS'model'
+aS'graphics'
p12
-aS'Patm'
+aS'x'
p13
-atp14
-Rp15
+aS'model'
+p14
+aS'Patm'
+p15
+atp16
+Rp17
.(dp0
S'arg1'
p1
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index 8d7a5bbc..6221b688 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -36,15 +36,15 @@ function Flowmeter() {
mo.outputs = MO;
this.model.rpar = new ScilabDouble([PrametersValue]);
mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
- var exprs = "1";
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]);
+ this.exprs = "1";
+ this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabDouble([false,true]);
mo.model = ModelName;
this.model.equations = new ScilabDouble([mo]);
this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]);
this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]);
- this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
+ this.x = standard_define([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);
@@ -59,19 +59,20 @@ function Flowmeter() {
}
Flowmeter.prototype.set = function Flowmeter() {
this.Qini = arguments[0]["Qini"]
+ this.exprs = arguments[0]["exprs"]
this.x = arg1;
this.graphics = arg1.graphics;
- var exprs = this.graphics.exprs;
+ this.exprs = this.graphics.exprs;
this.model = arg1.model;
this.x = arg1;
- var exprs = this.x.graphics.exprs;
+ this.exprs = this.x.graphics.exprs;
while (false) {
- [ok,this.Qini,exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),exprs);
+ [ok,this.Qini,this.exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),this.exprs);
if (!ok) {
break;
}
this.x.model.equations.parameters[2-1] = list(this.Qini);
- this.x.graphics.exprs = exprs;
+ this.x.graphics.exprs = this.exprs;
break;
}
return new BasicBlock(this.x);
diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle
index 7abe7995..6ce9c452 100644
--- a/js/Hydraulics/Flowmeter.pickle
+++ b/js/Hydraulics/Flowmeter.pickle
@@ -2,16 +2,20 @@ c__builtin__
set
p0
((lp1
-S'x'
+S'Qini'
p2
-aS'model'
+aS'exprs'
p3
-aS'Qini'
+aS'gr_i'
p4
aS'graphics'
p5
-atp6
-Rp7
+aS'x'
+p6
+aS'model'
+p7
+atp8
+Rp9
.(dp0
S'x.model.equations.parameters[2-1]'
p1
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index dfca2054..728d0f24 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -22,9 +22,9 @@ function PerteDP() {
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)]);
- var exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]];
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]);
- this.x = standard_define([2,1],this.model,exprs,list(gr_i,0));
+ 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.graphics.in_implicit = ["I"];
this.x.graphics.out_implicit = ["I"];
return new BasicBlock(this.x);
@@ -50,18 +50,19 @@ function PerteDP() {
this.z1 = parseFloat(arguments[0]["z1"])
this.z2 = parseFloat(arguments[0]["z2"])
this.p_rho = parseFloat(arguments[0]["p_rho"])
+ this.exprs = arguments[0]["exprs"]
this.x = arg1;
this.graphics = arg1.graphics;
- var exprs = this.graphics.exprs;
+ this.exprs = this.graphics.exprs;
this.model = arg1.model;
while (true) {
- [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+ [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,this.exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
if (!ok) {
break;
}
this.model.rpar = new ScilabDouble([this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]);
this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L]), new ScilabDouble([this.D]), new ScilabDouble([this.lambda]), new ScilabDouble([this.z1]), new ScilabDouble([this.z2]), new ScilabDouble([this.p_rho]));
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.x.graphics = this.graphics;
this.x.model = this.model;
break;
diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle
index 01934a26..1470e585 100644
--- a/js/Hydraulics/PerteDP.pickle
+++ b/js/Hydraulics/PerteDP.pickle
@@ -6,22 +6,26 @@ S'D'
p2
aS'L'
p3
-aS'p_rho'
+aS'exprs'
p4
-aS'graphics'
+aS'gr_i'
p5
-aS'x'
+aS'p_rho'
p6
-aS'model'
+aS'graphics'
p7
-aS'z1'
+aS'x'
p8
-aS'z2'
+aS'model'
p9
-aS'lambda'
+aS'z1'
p10
-atp11
-Rp12
+aS'z2'
+p11
+aS'lambda'
+p12
+atp13
+Rp14
.(dp0
S'arg1'
p1
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index 84d90966..c709e833 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -16,9 +16,9 @@ function PuitsP() {
mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]);
this.model.equations = new ScilabDouble([mo]);
this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
- var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]);
- this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0));
+ 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.graphics.in_implicit = ["I"];
return new BasicBlock(this.x);
}
@@ -39,18 +39,19 @@ function PuitsP() {
this.T0 = parseFloat(arguments[0]["T0"])
this.H0 = parseFloat(arguments[0]["H0"])
this.option_temperature = parseFloat(arguments[0]["option_temperature"])
+ this.exprs = arguments[0]["exprs"]
this.x = arg1;
this.graphics = arg1.graphics;
- var exprs = this.graphics.exprs;
+ this.exprs = this.graphics.exprs;
this.model = arg1.model;
while (true) {
- [ok,this.P0,this.T0,this.H0,this.option_temperature,exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+ [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
if (!ok) {
break;
}
this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]);
this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature]));
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.x.graphics = this.graphics;
this.x.model = this.model;
break;
diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle
index 11b085ba..24458909 100644
--- a/js/Hydraulics/PuitsP.pickle
+++ b/js/Hydraulics/PuitsP.pickle
@@ -8,16 +8,20 @@ aS'H0'
p3
aS'T0'
p4
-aS'graphics'
+aS'exprs'
p5
-aS'x'
+aS'gr_i'
p6
-aS'model'
+aS'graphics'
p7
-aS'option_temperature'
+aS'x'
p8
-atp9
-Rp10
+aS'model'
+p9
+aS'option_temperature'
+p10
+atp11
+Rp12
.(dp0
S'arg1'
p1
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index fe20a9fb..e207fede 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -18,9 +18,9 @@ function SourceP() {
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)]);
- var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]);
- this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0));
+ 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.graphics.out_implicit = ["I"];
return new BasicBlock(this.x);
}
@@ -41,18 +41,19 @@ function SourceP() {
this.T0 = parseFloat(arguments[0]["T0"])
this.H0 = parseFloat(arguments[0]["H0"])
this.option_temperature = parseFloat(arguments[0]["option_temperature"])
+ this.exprs = arguments[0]["exprs"]
this.x = arg1;
this.graphics = arg1.graphics;
- var exprs = this.graphics.exprs;
+ this.exprs = this.graphics.exprs;
this.model = arg1.model;
while (true) {
- [ok,this.P0,this.T0,this.H0,this.option_temperature,exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+ [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
if (!ok) {
break;
}
this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]);
this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature]));
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.x.graphics = this.graphics;
this.x.model = this.model;
break;
diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle
index 083335be..553aeaec 100644
--- a/js/Hydraulics/SourceP.pickle
+++ b/js/Hydraulics/SourceP.pickle
@@ -8,16 +8,20 @@ aS'H0'
p3
aS'T0'
p4
-aS'graphics'
+aS'exprs'
p5
-aS'x'
+aS'gr_i'
p6
-aS'model'
+aS'graphics'
p7
-aS'option_temperature'
+aS'x'
p8
-atp9
-Rp10
+aS'model'
+p9
+aS'option_temperature'
+p10
+atp11
+Rp12
.(dp0
S'arg1'
p1
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index 85b21dfc..d3f2711f 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -18,9 +18,9 @@ function VanneReglante() {
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)]);
- var exprs = [[string(this.Cvmax)],[string(this.p_rho)]];
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
+ 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.graphics.in_implicit = [["I"],["E"]];
this.x.graphics.out_implicit = ["I"];
return new BasicBlock(this.x);
@@ -38,18 +38,19 @@ function VanneReglante() {
VanneReglante.prototype.set = function VanneReglante() {
this.Cvmax = parseFloat(arguments[0]["Cvmax"])
this.p_rho = parseFloat(arguments[0]["p_rho"])
+ this.exprs = arguments[0]["exprs"]
this.x = arg1;
this.graphics = arg1.graphics;
- var exprs = this.graphics.exprs;
+ this.exprs = this.graphics.exprs;
this.model = arg1.model;
while (true) {
- [ok,this.Cvmax,this.p_rho,exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs);
+ [ok,this.Cvmax,this.p_rho,this.exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),this.exprs);
if (!ok) {
break;
}
this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]);
this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Cvmax]), new ScilabDouble([this.p_rho]));
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.x.graphics = this.graphics;
this.x.model = this.model;
break;
diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle
index ceb85ccf..11c5fb2b 100644
--- a/js/Hydraulics/VanneReglante.pickle
+++ b/js/Hydraulics/VanneReglante.pickle
@@ -2,18 +2,22 @@ c__builtin__
set
p0
((lp1
-S'x'
+S'Cvmax'
p2
-aS'model'
+aS'exprs'
p3
-aS'p_rho'
+aS'gr_i'
p4
-aS'Cvmax'
+aS'p_rho'
p5
aS'graphics'
p6
-atp7
-Rp8
+aS'x'
+p7
+aS'model'
+p8
+atp9
+Rp10
.(dp0
S'arg1'
p1