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.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index 653b0273..012be294 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -15,7 +15,7 @@ zs2=0;
z0=30;
T0=290;
p_rho=0;
-model.rpar=[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho];
+model.rpar=[[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]];
model.sim="Bache";
model.blocktype="c";
model.dep_ut=[true,false];
@@ -23,15 +23,15 @@ 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"],[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho]);
+mo.parameters=list([["Patm"],["A"],["ze1"],["ze2"],["zs1"],["zs2"],["z0"],["T0"],["p_rho"]],[[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]]);
model.equations=mo;
model.in1=ones(size(mo.inputs,"*"),1);
model.out=ones(size(mo.outputs,"*"),1);
-exprs=[string(Patm),string(A),string(ze1),string(ze2),string(zs1),string(zs2),string(z0),string(T0),string(p_rho)];
+exprs=[[string(Patm)],[string(A)],[string(ze1)],[string(ze2)],[string(zs1)],[string(zs2)],[string(z0)],[string(T0)],[string(p_rho)]];
gr_i=[];
x=standard_define([2,2],model,exprs,list(gr_i,0));
-x.graphics.in_implicit=["I","I"];
-x.graphics.out_implicit=["I","I","E"];
+x.graphics.in_implicit=[["I"],["I"]];
+x.graphics.out_implicit=[["I"],["I"],["E"]];
}
Bache.prototype.details = function Bache() {
}
@@ -43,11 +43,11 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,Patm,A,ze1,ze2,zs1,zs2,z0,T0,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,Patm,A,ze1,ze2,zs1,zs2,z0,T0,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=[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho];
+model.rpar=[[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]];
model.equations.parameters[2-1]=list(Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho);
graphics.exprs=exprs;
x.graphics=graphics;