summaryrefslogtreecommitdiff
path: root/js/Hydraulics/Bache.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Hydraulics/Bache.js')
-rw-r--r--js/Hydraulics/Bache.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index 210d7d51..0a38027e 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -4,7 +4,7 @@ function Bache() {
var in1 = 2;
var out = 3;
this.model = scicos_model();
- this.model.in1 = new ScilabDouble([-transpose([1:in1])]);
+ this.model.in = new ScilabDouble([-transpose([1:in1])]);
this.model.out = new ScilabDouble([-transpose([1:out])]);
this.Patm = 1.013e5;
this.A = 1;
@@ -25,7 +25,7 @@ function Bache() {
mo.outputs = ["Cs1","Cs2","yNiveau"];
mo.parameters = list([["Patm"],["A"],["ze1"],["ze2"],["zs1"],["zs2"],["z0"],["T0"],["p_rho"]],[[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]);
this.model.equations = new ScilabDouble([mo]);
- this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
+ this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
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));"]);
@@ -62,10 +62,7 @@ function Bache() {
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;
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,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) {