summaryrefslogtreecommitdiff
path: root/js/Hydraulics
diff options
context:
space:
mode:
Diffstat (limited to 'js/Hydraulics')
-rw-r--r--js/Hydraulics/Bache.js12
-rw-r--r--js/Hydraulics/Flowmeter.js12
-rw-r--r--js/Hydraulics/PerteDP.js12
-rw-r--r--js/Hydraulics/PuitsP.js10
-rw-r--r--js/Hydraulics/SourceP.js12
-rw-r--r--js/Hydraulics/VanneReglante.js12
6 files changed, 35 insertions, 35 deletions
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index ecaf2f0c..885a069a 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -16,17 +16,17 @@ function Bache() {
this.T0 = 290;
this.p_rho = 0;
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.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]]);
- 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));
+ 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],this.model,exprs,list(gr_i,0));
@@ -71,7 +71,7 @@ function Bache() {
break;
}
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] = 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.model.equations.parameters[2] = 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]));
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index 06d4ec54..dfd7b959 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -31,19 +31,19 @@ function Flowmeter() {
}
this.model = scicos_model();
mo = modelica();
- this.model.sim = new ScilabString(ModelName);
+ this.model.sim = new ScilabString([ModelName]);
mo.inputs = MI;
mo.outputs = MO;
- this.model.rpar = new ScilabDouble(PrametersValue);
+ this.model.rpar = new ScilabDouble([PrametersValue]);
mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
exprs = "1";
gr_i = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [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.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.graphics.in_implicit = Typein;
this.x.graphics.out_implicit = Typeout;
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 23dfe5ff..23766274 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -11,17 +11,17 @@ function PerteDP() {
this.z2 = 0;
this.p_rho = 0;
this.model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]];
- this.model.sim = new ScilabString("PerteDP");
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["PerteDP"]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
mo = modelica();
mo.model = "PerteDP";
mo.inputs = "C1";
mo.outputs = "C2";
mo.parameters = list([["L"],["D"],["lambda"],["z1"],["z2"],["p_rho"]],[[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]]);
- 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));
+ 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 = [];
this.x = standard_define([2,1],this.model,exprs,list(gr_i,0));
@@ -60,7 +60,7 @@ function PerteDP() {
break;
}
this.model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]];
- this.model.equations.parameters[2] = 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.model.equations.parameters[2] = 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]));
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index 807a7c34..dba184ae 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -7,15 +7,15 @@ function PuitsP() {
this.H0 = 100000;
this.option_temperature = 1;
this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
- this.model.sim = new ScilabString("Puits");
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["Puits"]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
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));
+ 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 = [];
this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0));
@@ -49,7 +49,7 @@ function PuitsP() {
break;
}
this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
- this.model.equations.parameters[2] = list(new ScilabDouble(this.P0),new ScilabDouble(this.T0),new ScilabDouble(this.H0),new ScilabDouble(this.option_temperature));
+ this.model.equations.parameters[2] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature]));
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index 0a726fc5..8aa2bc68 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -7,17 +7,17 @@ function SourceP() {
this.H0 = 100000;
this.option_temperature = 1;
this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
- this.model.sim = new ScilabString("Source");
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["Source"]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
mo = modelica();
mo.model = "Source";
mo.inputs = [];
mo.outputs = ["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));
- this.model.out = new ScilabDouble(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.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
gr_i = [];
this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0));
@@ -51,7 +51,7 @@ function SourceP() {
break;
}
this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
- this.model.equations.parameters[2] = list(new ScilabDouble(this.P0),new ScilabDouble(this.T0),new ScilabDouble(this.H0),new ScilabDouble(this.option_temperature));
+ this.model.equations.parameters[2] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature]));
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index d2fffc6d..94b6ca1f 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -7,17 +7,17 @@ function VanneReglante() {
this.Cvmax = 8005.42;
this.p_rho = 0;
this.model.rpar = [[this.Cvmax],[this.p_rho]];
- this.model.sim = new ScilabString("VanneReglante");
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["VanneReglante"]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
mo = modelica();
mo.model = "VanneReglante";
mo.inputs = ["C1","Ouv"];
mo.outputs = "C2";
mo.parameters = list([["Cvmax"],["p_rho"]],[[this.Cvmax],[this.p_rho]]);
- 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));
+ 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 = [];
this.x = standard_define([2,2],this.model,exprs,list(gr_i,0));
@@ -48,7 +48,7 @@ function VanneReglante() {
break;
}
this.model.rpar = [[this.Cvmax],[this.p_rho]];
- this.model.equations.parameters[2] = list(new ScilabDouble(this.Cvmax),new ScilabDouble(this.p_rho));
+ this.model.equations.parameters[2] = list(new ScilabDouble([this.Cvmax]), new ScilabDouble([this.p_rho]));
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
generated by cgit (git 2.34.1) at 2025-03-13 05:14:42 +0000