diff options
author | Sunil Shetye | 2018-07-11 13:05:13 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-11 15:21:08 +0530 |
commit | 079d0b4a3ec15a4d7d2644484d116df9d1c694bb (patch) | |
tree | 785ed59b5b238203a9e91f3e323da59d1083d86e /js/Hydraulics | |
parent | 0e9bc36f45fa1bb598c6ebb0febc1989439a8d98 (diff) | |
download | sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.gz sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.bz2 sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.zip |
fix assignment to list
Diffstat (limited to 'js/Hydraulics')
-rw-r--r-- | js/Hydraulics/Bache.js | 14 | ||||
-rw-r--r-- | js/Hydraulics/Flowmeter.js | 46 | ||||
-rw-r--r-- | js/Hydraulics/PerteDP.js | 10 | ||||
-rw-r--r-- | js/Hydraulics/PuitsP.js | 10 | ||||
-rw-r--r-- | js/Hydraulics/SourceP.js | 10 | ||||
-rw-r--r-- | js/Hydraulics/VanneReglante.js | 10 |
6 files changed, 50 insertions, 50 deletions
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 114846c1..82ed4cb1 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -1,8 +1,8 @@ /* autogenerated from "macros/Hydraulics/Bache.sci" */ function Bache() { Bache.prototype.define = function Bache() { - in1 = 2; - out = 3; + var in1 = 2; + var out = 3; this.model = scicos_model(); this.model.in1 = [-transpose([1:in1])]; this.model.out = [-transpose([1:out])]; @@ -19,7 +19,7 @@ function Bache() { this.model.sim = new ScilabString(["Bache"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - mo = modelica(); + var mo = modelica(); mo.model = "Bache"; mo.inputs = ["Ce1","Ce2"]; mo.outputs = ["Cs1","Cs2","yNiveau"]; @@ -27,8 +27,8 @@ 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)]); - 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 = []; + 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 = []; 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"]]; @@ -62,8 +62,8 @@ function Bache() { this.T0 = parseFloat(arguments[0]["T0"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index dfd7b959..540ed624 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -1,43 +1,43 @@ /* autogenerated from "macros/Hydraulics/Flowmeter.sci" */ function Flowmeter() { Flowmeter.prototype.define = function Flowmeter() { - ModelName = "Flowmeter"; - PrametersValue = 1; - ParametersName = "Qini"; + var ModelName = "Flowmeter"; + var PrametersValue = 1; + var ParametersName = "Qini"; this.model = scicos_model(); - Typein = []; - Typeout = []; - MI = []; - MO = []; - P = [[50,105,-1,90],[0,10,2,0],[101,10,-2,0]]; - PortName = [["Mesure"],["C1"],["C2"]]; + var Typein = []; + var Typeout = []; + var MI = []; + var MO = []; + var P = [[50,105,-1,90],[0,10,2,0],[101,10,-2,0]]; + var PortName = [["Mesure"],["C1"],["C2"]]; for (i=1;i<=size(P,"r");i+=1) { if (P[i-1][3-1]==1) { - Typein = [[Typein],["E"]]; - MI = [[MI],[PortName[i-1]]]; + var Typein = [[Typein],["E"]]; + var MI = [[MI],[PortName[i-1]]]; } if (P[i-1][3-1]==2) { - Typein = [[Typein],["I"]]; - MI = [[MI],[PortName[i-1]]]; + var Typein = [[Typein],["I"]]; + var MI = [[MI],[PortName[i-1]]]; } if (P[i-1][3-1]==-1) { - Typeout = [[Typeout],["E"]]; - MO = [[MO],[PortName[i-1]]]; + var Typeout = [[Typeout],["E"]]; + var MO = [[MO],[PortName[i-1]]]; } if (P[i-1][3-1]==-2) { - Typeout = [[Typeout],["I"]]; - MO = [[MO],[PortName[i-1]]]; + var Typeout = [[Typeout],["I"]]; + var MO = [[MO],[PortName[i-1]]]; } } this.model = scicos_model(); - mo = modelica(); + var mo = modelica(); this.model.sim = new ScilabString([ModelName]); mo.inputs = MI; mo.outputs = MO; this.model.rpar = new ScilabDouble([PrametersValue]); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - exprs = "1"; - gr_i = []; + var exprs = "1"; + var gr_i = []; this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [false,true]; mo.model = ModelName; @@ -60,11 +60,11 @@ function Flowmeter() { Flowmeter.prototype.set = function Flowmeter() { this.Qini = arguments[0]["Qini"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; this.x = arg1; - exprs = this.x.graphics.exprs; + var exprs = this.x.graphics.exprs; while (false) { [ok,this.Qini,exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),exprs); if (!ok) { diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index ddbaa5fe..f83950f2 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -14,7 +14,7 @@ function PerteDP() { this.model.sim = new ScilabString(["PerteDP"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - mo = modelica(); + var mo = modelica(); mo.model = "PerteDP"; mo.inputs = "C1"; mo.outputs = "C2"; @@ -22,8 +22,8 @@ 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)]); - exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; - gr_i = []; + var exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; + var gr_i = []; this.x = standard_define([2,1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -51,8 +51,8 @@ function PerteDP() { this.z2 = parseFloat(arguments[0]["z2"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 7b5b3cdb..873fb972 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -10,14 +10,14 @@ function PuitsP() { this.model.sim = new ScilabString(["Puits"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - mo = modelica(); + var mo = modelica(); mo.model = "Puits"; mo.inputs = ["C"]; 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)]); - exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - gr_i = []; + var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; + var gr_i = []; this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); @@ -40,8 +40,8 @@ function PuitsP() { this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 71adc5ad..955403fb 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -10,7 +10,7 @@ function SourceP() { this.model.sim = new ScilabString(["Source"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - mo = modelica(); + var mo = modelica(); mo.model = "Source"; mo.inputs = []; mo.outputs = ["C"]; @@ -18,8 +18,8 @@ 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)]); - exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - gr_i = []; + var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; + var gr_i = []; this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -42,8 +42,8 @@ function SourceP() { this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index e92145ca..7ae90b14 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -10,7 +10,7 @@ function VanneReglante() { this.model.sim = new ScilabString(["VanneReglante"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - mo = modelica(); + var mo = modelica(); mo.model = "VanneReglante"; mo.inputs = ["C1","Ouv"]; mo.outputs = "C2"; @@ -18,8 +18,8 @@ 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)]); - exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; - gr_i = []; + var exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; @@ -39,8 +39,8 @@ function VanneReglante() { this.Cvmax = parseFloat(arguments[0]["Cvmax"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); |