diff options
Diffstat (limited to 'js/Hydraulics/Bache.js')
| -rw-r--r-- | js/Hydraulics/Bache.js | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 54150992..fb253e57 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -3,9 +3,9 @@ function Bache() { Bache.prototype.define = function Bache() { in1 = 2; out = 3; - model = scicos_model(); - model.in1 = [-transpose([1:in1])]; - model.out = [-transpose([1:out])]; + this.model = scicos_model(); + this.model.in1 = [-transpose([1:in1])]; + this.model.out = [-transpose([1:out])]; this.Patm = 1.013e5; this.A = 1; this.ze1 = 40; @@ -15,21 +15,21 @@ function Bache() { this.z0 = 30; this.T0 = 290; this.p_rho = 0; - model.rpar = [[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]; - model.sim = "Bache"; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model.rpar = [[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]; + this.model.sim = new ScilabString("Bache"); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; mo = modelica(); mo.model = "Bache"; mo.inputs = ["Ce1","Ce2"]; 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]]); - model.equations = mo; - model.in1 = ones(size(mo.inputs,"*"),1); - model.out = ones(size(mo.outputs,"*"),1); + 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)); 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)]]; gr_i = []; - this.x = standard_define([2,2],model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; return new BasicBlock(this.x); @@ -64,17 +64,17 @@ function Bache() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + 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); if (!ok) { break; } - model.rpar = [[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]; - model.equations.parameters[2-1] = list(this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho); + this.model.rpar = [[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]; + this.model.equations.parameters[('2', 'double')] = list(this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho); graphics.exprs = exprs; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } return new BasicBlock(this.x); |