summaryrefslogtreecommitdiff
path: root/js/Hydraulics
diff options
context:
space:
mode:
Diffstat (limited to 'js/Hydraulics')
-rw-r--r--js/Hydraulics/Bache.js30
-rw-r--r--js/Hydraulics/Bache.pickle48
-rw-r--r--js/Hydraulics/Flowmeter.js22
-rw-r--r--js/Hydraulics/Flowmeter.pickle8
-rw-r--r--js/Hydraulics/PerteDP.js30
-rw-r--r--js/Hydraulics/PerteDP.pickle62
-rw-r--r--js/Hydraulics/PuitsP.js24
-rw-r--r--js/Hydraulics/PuitsP.pickle62
-rw-r--r--js/Hydraulics/SourceP.js26
-rw-r--r--js/Hydraulics/SourceP.pickle66
-rw-r--r--js/Hydraulics/VanneReglante.js30
-rw-r--r--js/Hydraulics/VanneReglante.pickle46
12 files changed, 233 insertions, 221 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);
diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle
index 7008cb8e..6e508ab9 100644
--- a/js/Hydraulics/Bache.pickle
+++ b/js/Hydraulics/Bache.pickle
@@ -20,10 +20,12 @@ aS'p_rho'
p9
aS'x'
p10
-aS'Patm'
+aS'model'
p11
-atp12
-Rp13
+aS'Patm'
+p12
+atp13
+Rp14
.(dp0
S'arg1'
p1
@@ -54,23 +56,23 @@ g8
sS'zs2'
p12
g8
-sS'x.graphics'
+sS'exprs'
p13
-g2
-sS'z0'
+S'matrix'
p14
+sS'z0'
+p15
g8
sS'mo.inputs'
-p15
-S'vector'
p16
-sS'x.graphics.in_implicit'
+S'vector'
p17
-S'matrix'
+sS'x.graphics.in_implicit'
p18
+g14
sS'mo.parameters'
p19
-g16
+g17
sS'Patm'
p20
g8
@@ -85,16 +87,16 @@ p23
g8
sS'mo.outputs'
p24
-g16
+g17
sS'x.graphics.out_implicit'
p25
-g18
+g14
sS'in1'
p26
g8
sS'model.rpar'
p27
-g18
+g14
sS'ze2'
p28
g8
@@ -108,31 +110,31 @@ sS'graphics.exprs'
p31
NsS'typ'
p32
-g16
+g17
sS'model.blocktype'
p33
g5
sS'mo'
p34
g2
-sS'model.dep_ut'
+sS'x.graphics'
p35
-g16
-sS'model.equations.parameters[2-1]'
+g2
+sS'model.dep_ut'
p36
-g16
-sS'exprs'
+g17
+sS"model.equations.parameters[('2', 'double')]"
p37
-g18
+g17
sS'gr_i'
p38
-g16
+g17
sS'p_rho'
p39
g8
sS'y'
p40
-g16
+g17
sS'x'
p41
g8
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index fa275941..06d4ec54 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -4,7 +4,7 @@ function Flowmeter() {
ModelName = "Flowmeter";
PrametersValue = 1;
ParametersName = "Qini";
- model = scicos_model();
+ this.model = scicos_model();
Typein = [];
Typeout = [];
MI = [];
@@ -29,22 +29,22 @@ function Flowmeter() {
MO = [[MO],[PortName[i-1]]];
}
}
- model = scicos_model();
+ this.model = scicos_model();
mo = modelica();
- model.sim = ModelName;
+ this.model.sim = new ScilabString(ModelName);
mo.inputs = MI;
mo.outputs = MO;
- model.rpar = PrametersValue;
+ this.model.rpar = new ScilabDouble(PrametersValue);
mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
exprs = "1";
gr_i = [];
- model.blocktype = "c";
- model.dep_ut = [false,true];
+ this.model.blocktype = new ScilabString("c");
+ this.model.dep_ut = [false,true];
mo.model = ModelName;
- model.equations = mo;
- model.in1 = ones(size(MI,"*"),1);
- model.out = ones(size(MO,"*"),1);
- this.x = standard_define([2,2],model,exprs,list(gr_i,0));
+ 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;
return new BasicBlock(this.x);
@@ -62,7 +62,7 @@ function Flowmeter() {
this.x = arg1;
graphics = arg1.graphics;
exprs = graphics.exprs;
- model = arg1.model;
+ this.model = arg1.model;
this.x = arg1;
exprs = this.x.graphics.exprs;
while (false) {
diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle
index 3a232f23..fb9cc3d1 100644
--- a/js/Hydraulics/Flowmeter.pickle
+++ b/js/Hydraulics/Flowmeter.pickle
@@ -4,10 +4,12 @@ p0
((lp1
S'x'
p2
-aS'Qini'
+aS'model'
p3
-atp4
-Rp5
+aS'Qini'
+p4
+atp5
+Rp6
.(dp0
S'x.model.equations.parameters[2-1]'
p1
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index c9fd922e..de0ebb69 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -1,30 +1,30 @@
/* autogenerated from "macros/Hydraulics/PerteDP.sci" */
function PerteDP() {
PerteDP.prototype.define = function PerteDP() {
- model = scicos_model();
- model.in1 = [1];
- model.out = [1];
+ this.model = scicos_model();
+ this.model.in1 = [1];
+ this.model.out = [1];
this.L = 10;
this.D = 0.2;
this.lambda = 0.03;
this.z1 = 0;
this.z2 = 0;
this.p_rho = 0;
- model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]];
- model.sim = "PerteDP";
- model.blocktype = "c";
- model.dep_ut = [true,false];
+ 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.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]]);
- 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.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],model,exprs,list(gr_i,0));
+ 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"];
return new BasicBlock(this.x);
@@ -53,17 +53,17 @@ function PerteDP() {
this.x = arg1;
graphics = arg1.graphics;
exprs = graphics.exprs;
- model = arg1.model;
+ 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);
if (!ok) {
break;
}
- model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]];
- model.equations.parameters[2-1] = list(this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho);
+ this.model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]];
+ this.model.equations.parameters[('2', 'double')] = list(this.L,this.D,this.lambda,this.z1,this.z2,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);
diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle
index ab82549b..755f9964 100644
--- a/js/Hydraulics/PerteDP.pickle
+++ b/js/Hydraulics/PerteDP.pickle
@@ -10,14 +10,16 @@ aS'p_rho'
p4
aS'x'
p5
-aS'z1'
+aS'model'
p6
-aS'z2'
+aS'z1'
p7
-aS'lambda'
+aS'z2'
p8
-atp9
-Rp10
+aS'lambda'
+p9
+atp10
+Rp11
.(dp0
S'arg1'
p1
@@ -39,46 +41,46 @@ p8
sS'model.in1'
p9
g8
-sS'x.graphics'
+sS'exprs'
p10
-g2
-sS'mo.inputs'
+S'matrix'
p11
+sS'mo.inputs'
+p12
g5
sS'x.graphics.in_implicit'
-p12
-S'vector'
p13
-sS'mo.parameters'
+S'vector'
p14
-g13
-sS'model.sim'
+sS'mo.parameters'
p15
+g14
+sS'model.sim'
+p16
g5
sS'model.equations'
-p16
+p17
g8
sS'D'
-p17
+p18
g8
sS'mo.outputs'
-p18
+p19
g5
sS'x.graphics.out_implicit'
-p19
-g13
-sS'L'
p20
+g14
+sS'L'
+p21
g8
sS'model.rpar'
-p21
-S'matrix'
p22
+g11
sS'graphics.exprs'
p23
NsS'typ'
p24
-g13
+g14
sS'z1'
p25
g8
@@ -91,24 +93,24 @@ g5
sS'mo'
p28
g2
-sS'model.dep_ut'
+sS'x.graphics'
p29
-g13
-sS'model.equations.parameters[2-1]'
+g2
+sS'model.dep_ut'
p30
-g13
-sS'exprs'
+g14
+sS"model.equations.parameters[('2', 'double')]"
p31
-g22
+g14
sS'gr_i'
p32
-g13
+g14
sS'p_rho'
p33
g8
sS'y'
p34
-g13
+g14
sS'x'
p35
g8
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index 0eec1711..34c11d39 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -1,24 +1,24 @@
/* autogenerated from "macros/Hydraulics/PuitsP.sci" */
function PuitsP() {
PuitsP.prototype.define = function PuitsP() {
- model = scicos_model();
+ this.model = scicos_model();
this.P0 = 100000;
this.T0 = 290;
this.H0 = 100000;
this.option_temperature = 1;
- model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
- model.sim = "Puits";
- model.blocktype = "c";
- model.dep_ut = [true,false];
+ 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.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]]);
- model.equations = mo;
- model.in1 = 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],model,exprs,list(gr_i,0));
+ 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);
}
@@ -42,17 +42,17 @@ function PuitsP() {
this.x = arg1;
graphics = arg1.graphics;
exprs = graphics.exprs;
- model = arg1.model;
+ 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);
if (!ok) {
break;
}
- model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
- model.equations.parameters[2-1] = list(this.P0,this.T0,this.H0,this.option_temperature);
+ this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
+ this.model.equations.parameters[('2', 'double')] = list(this.P0,this.T0,this.H0,this.option_temperature);
graphics.exprs = exprs;
this.x.graphics = graphics;
- this.x.model = model;
+ this.x.model = this.model;
break;
}
return new BasicBlock(this.x);
diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle
index 376ca2f2..1fa7bcc7 100644
--- a/js/Hydraulics/PuitsP.pickle
+++ b/js/Hydraulics/PuitsP.pickle
@@ -2,18 +2,20 @@ c__builtin__
set
p0
((lp1
-S'x'
+S'P0'
p2
-aS'P0'
+aS'H0'
p3
-aS'option_temperature'
+aS'T0'
p4
-aS'H0'
+aS'x'
p5
-aS'T0'
+aS'model'
p6
-atp7
-Rp8
+aS'option_temperature'
+p7
+atp8
+Rp9
.(dp0
S'arg1'
p1
@@ -32,35 +34,35 @@ NsS'model.in1'
p7
S'double'
p8
-sS'x.graphics'
+sS'exprs'
p9
-g2
-sS'mo.inputs'
+S'matrix'
p10
-S'vector'
+sS'mo.inputs'
p11
-sS'x.graphics.in_implicit'
+S'vector'
p12
-g11
-sS'option_temperature'
+sS'x.graphics.in_implicit'
p13
+g12
+sS'option_temperature'
+p14
g8
sS'mo.parameters'
-p14
-g11
-sS'model.sim'
p15
+g12
+sS'model.sim'
+p16
g5
sS'P0'
-p16
+p17
g8
sS'model.equations'
-p17
+p18
g8
sS'model.rpar'
-p18
-S'matrix'
p19
+g10
sS'T0'
p20
g8
@@ -68,28 +70,28 @@ sS'graphics.exprs'
p21
NsS'typ'
p22
-g11
+g12
sS'model.blocktype'
p23
g5
sS'mo'
p24
g2
-sS'model.dep_ut'
+sS'x.graphics'
p25
-g11
-sS'model.equations.parameters[2-1]'
+g2
+sS'model.dep_ut'
p26
-g11
-sS'exprs'
+g12
+sS"model.equations.parameters[('2', 'double')]"
p27
-g19
+g12
sS'gr_i'
p28
-g11
+g12
sS'y'
p29
-g11
+g12
sS'x'
p30
g8
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index d5030f9b..2ed928b6 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -1,26 +1,26 @@
/* autogenerated from "macros/Hydraulics/SourceP.sci" */
function SourceP() {
SourceP.prototype.define = function SourceP() {
- model = scicos_model();
+ this.model = scicos_model();
this.P0 = 300000;
this.T0 = 290;
this.H0 = 100000;
this.option_temperature = 1;
- model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
- model.sim = "Source";
- model.blocktype = "c";
- model.dep_ut = [true,false];
+ 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.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]]);
- 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.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
gr_i = [];
- this.x = standard_define([2.5,2],model,exprs,list(gr_i,0));
+ 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);
}
@@ -44,17 +44,17 @@ function SourceP() {
this.x = arg1;
graphics = arg1.graphics;
exprs = graphics.exprs;
- model = arg1.model;
+ 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);
if (!ok) {
break;
}
- model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
- model.equations.parameters[2-1] = list(this.P0,this.T0,this.H0,this.option_temperature);
+ this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
+ this.model.equations.parameters[('2', 'double')] = list(this.P0,this.T0,this.H0,this.option_temperature);
graphics.exprs = exprs;
this.x.graphics = graphics;
- this.x.model = model;
+ this.x.model = this.model;
break;
}
return new BasicBlock(this.x);
diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle
index a1a50cb2..7f345a90 100644
--- a/js/Hydraulics/SourceP.pickle
+++ b/js/Hydraulics/SourceP.pickle
@@ -2,18 +2,20 @@ c__builtin__
set
p0
((lp1
-S'x'
+S'P0'
p2
-aS'P0'
+aS'H0'
p3
-aS'option_temperature'
+aS'T0'
p4
-aS'H0'
+aS'x'
p5
-aS'T0'
+aS'model'
p6
-atp7
-Rp8
+aS'option_temperature'
+p7
+atp8
+Rp9
.(dp0
S'arg1'
p1
@@ -35,38 +37,38 @@ p8
sS'model.in1'
p9
g8
-sS'x.graphics'
+sS'exprs'
p10
-g2
-sS'mo.inputs'
+S'matrix'
p11
-S'vector'
+sS'mo.inputs'
p12
-sS'option_temperature'
+S'vector'
p13
+sS'option_temperature'
+p14
g8
sS'mo.parameters'
-p14
-g12
-sS'model.sim'
p15
+g13
+sS'model.sim'
+p16
g5
sS'P0'
-p16
+p17
g8
sS'model.equations'
-p17
+p18
g8
sS'mo.outputs'
-p18
-g12
-sS'x.graphics.out_implicit'
p19
-g12
-sS'model.rpar'
+g13
+sS'x.graphics.out_implicit'
p20
-S'matrix'
+g13
+sS'model.rpar'
p21
+g11
sS'T0'
p22
g8
@@ -74,28 +76,28 @@ sS'graphics.exprs'
p23
NsS'typ'
p24
-g12
+g13
sS'model.blocktype'
p25
g5
sS'mo'
p26
g2
-sS'model.dep_ut'
+sS'x.graphics'
p27
-g12
-sS'model.equations.parameters[2-1]'
+g2
+sS'model.dep_ut'
p28
-g12
-sS'exprs'
+g13
+sS"model.equations.parameters[('2', 'double')]"
p29
-g21
+g13
sS'gr_i'
p30
-g12
+g13
sS'y'
p31
-g12
+g13
sS'x'
p32
g8
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index b4be5f45..c36ad94e 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -1,26 +1,26 @@
/* autogenerated from "macros/Hydraulics/VanneReglante.sci" */
function VanneReglante() {
VanneReglante.prototype.define = function VanneReglante() {
- model = scicos_model();
- model.in1 = [[1],[1]];
- model.out = [1];
+ this.model = scicos_model();
+ this.model.in1 = [[1],[1]];
+ this.model.out = [1];
this.Cvmax = 8005.42;
this.p_rho = 0;
- model.rpar = [[this.Cvmax],[this.p_rho]];
- model.sim = "VanneReglante";
- model.blocktype = "c";
- model.dep_ut = [true,false];
+ this.model.rpar = [[this.Cvmax],[this.p_rho]];
+ 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]]);
- 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.Cvmax)],[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"],["E"]];
this.x.graphics.out_implicit = ["I"];
return new BasicBlock(this.x);
@@ -41,17 +41,17 @@ function VanneReglante() {
this.x = arg1;
graphics = arg1.graphics;
exprs = graphics.exprs;
- model = arg1.model;
+ 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);
if (!ok) {
break;
}
- model.rpar = [[this.Cvmax],[this.p_rho]];
- model.equations.parameters[2-1] = list(this.Cvmax,this.p_rho);
+ this.model.rpar = [[this.Cvmax],[this.p_rho]];
+ this.model.equations.parameters[('2', 'double')] = list(this.Cvmax,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);
diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle
index 8712cb87..6b7df4fd 100644
--- a/js/Hydraulics/VanneReglante.pickle
+++ b/js/Hydraulics/VanneReglante.pickle
@@ -4,12 +4,14 @@ p0
((lp1
S'x'
p2
-aS'p_rho'
+aS'model'
p3
-aS'Cvmax'
+aS'p_rho'
p4
-atp5
-Rp6
+aS'Cvmax'
+p5
+atp6
+Rp7
.(dp0
S'arg1'
p1
@@ -34,20 +36,20 @@ g7
sS'model.in1'
p10
g7
-sS'x.graphics'
+sS'exprs'
p11
-g2
-sS'mo.inputs'
+S'matrix'
p12
-S'vector'
+sS'mo.inputs'
p13
-sS'x.graphics.in_implicit'
+S'vector'
p14
-S'matrix'
+sS'x.graphics.in_implicit'
p15
+g12
sS'mo.parameters'
p16
-g13
+g14
sS'model.sim'
p17
g5
@@ -59,39 +61,39 @@ p19
g5
sS'x.graphics.out_implicit'
p20
-g13
+g14
sS'model.rpar'
p21
-g15
+g12
sS'graphics.exprs'
p22
NsS'typ'
p23
-g13
+g14
sS'model.blocktype'
p24
g5
sS'mo'
p25
g2
-sS'model.dep_ut'
+sS'x.graphics'
p26
-g13
-sS'model.equations.parameters[2-1]'
+g2
+sS'model.dep_ut'
p27
-g13
-sS'exprs'
+g14
+sS"model.equations.parameters[('2', 'double')]"
p28
-g15
+g14
sS'gr_i'
p29
-g13
+g14
sS'p_rho'
p30
g7
sS'y'
p31
-g13
+g14
sS'x'
p32
g7
generated by cgit (git 2.34.1) at 2025-03-13 09:34:12 +0000