diff options
Diffstat (limited to 'js/Hydraulics')
-rw-r--r-- | js/Hydraulics/Bache.js | 2 | ||||
-rw-r--r-- | js/Hydraulics/Bache.pickle | 17 | ||||
-rw-r--r-- | js/Hydraulics/Flowmeter.js | 2 | ||||
-rw-r--r-- | js/Hydraulics/Flowmeter.pickle | 17 | ||||
-rw-r--r-- | js/Hydraulics/PerteDP.js | 2 | ||||
-rw-r--r-- | js/Hydraulics/PerteDP.pickle | 19 | ||||
-rw-r--r-- | js/Hydraulics/PuitsP.js | 2 | ||||
-rw-r--r-- | js/Hydraulics/PuitsP.pickle | 17 | ||||
-rw-r--r-- | js/Hydraulics/SourceP.js | 2 | ||||
-rw-r--r-- | js/Hydraulics/SourceP.pickle | 17 | ||||
-rw-r--r-- | js/Hydraulics/VanneReglante.js | 2 | ||||
-rw-r--r-- | js/Hydraulics/VanneReglante.pickle | 17 |
12 files changed, 61 insertions, 55 deletions
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 985822af..7d023475 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -18,7 +18,7 @@ function Bache() { this.model.rpar = new ScilabDouble([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 = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Bache"; mo.inputs = ["Ce1","Ce2"]; diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle index 2df2dbe9..c4842111 100644 --- a/js/Hydraulics/Bache.pickle +++ b/js/Hydraulics/Bache.pickle @@ -126,25 +126,26 @@ p35 g2 sS'model.dep_ut' p36 -g15 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p37 +sS'model.equations.parameters[2-1]' +p38 g19 sS'exprs' -p38 +p39 g17 sS'gr_i' -p39 +p40 g15 sS'p_rho' -p40 +p41 g8 sS'y' -p41 +p42 g15 sS'x' -p42 -NsS'model' p43 +NsS'model' +p44 g2 s.
\ No newline at end of file diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 626793c5..7c6a1701 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -39,7 +39,7 @@ function Flowmeter() { this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle index 761970c0..17e70da6 100644 --- a/js/Hydraulics/Flowmeter.pickle +++ b/js/Hydraulics/Flowmeter.pickle @@ -103,25 +103,26 @@ p32 g13 sS'model.dep_ut' p33 -g20 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g6 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g13 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g6 sS'MO' -p40 +p41 g13 s.
\ No newline at end of file diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 991c97f2..1fdb0f97 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -13,7 +13,7 @@ function PerteDP() { this.model.rpar = new ScilabDouble([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 = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "PerteDP"; mo.inputs = "C1"; diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle index 9a6a7868..b854926d 100644 --- a/js/Hydraulics/PerteDP.pickle +++ b/js/Hydraulics/PerteDP.pickle @@ -102,28 +102,29 @@ p29 g2 sS'model.dep_ut' p30 -g12 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p31 +sS'model.equations.parameters[2-1]' +p32 g14 sS'exprs' -p32 +p33 g22 sS'gr_i' -p33 +p34 g12 sS'p_rho' -p34 +p35 g8 sS'y' -p35 +p36 g12 sS'x' -p36 -NsS'model' p37 +NsS'model' +p38 g2 sS'lambda' -p38 +p39 g8 s.
\ No newline at end of file diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 1fa51bff..04757d92 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -9,7 +9,7 @@ function PuitsP() { this.model.rpar = new ScilabDouble([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 = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Puits"; mo.inputs = ["C"]; diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle index a9dafdc3..c3099d29 100644 --- a/js/Hydraulics/PuitsP.pickle +++ b/js/Hydraulics/PuitsP.pickle @@ -86,25 +86,26 @@ p25 g2 sS'model.dep_ut' p26 -g9 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p27 +sS'model.equations.parameters[2-1]' +p28 g14 sS'exprs' -p28 +p29 g19 sS'gr_i' -p29 +p30 g9 sS'y' -p30 +p31 g9 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 sS'H0' -p33 +p34 g12 s.
\ No newline at end of file diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index f4907aaf..e7ad3820 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -9,7 +9,7 @@ function SourceP() { this.model.rpar = new ScilabDouble([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 = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Source"; mo.inputs = []; diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle index 9cf7d20a..4d269b4a 100644 --- a/js/Hydraulics/SourceP.pickle +++ b/js/Hydraulics/SourceP.pickle @@ -92,25 +92,26 @@ p27 g2 sS'model.dep_ut' p28 -g11 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p29 +sS'model.equations.parameters[2-1]' +p30 g14 sS'exprs' -p30 +p31 g21 sS'gr_i' -p31 +p32 g11 sS'y' -p32 +p33 g11 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 sS'H0' -p35 +p36 g8 s.
\ No newline at end of file diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index c44ccdbf..30a07f29 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -9,7 +9,7 @@ function VanneReglante() { this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]); this.model.sim = new ScilabString(["VanneReglante"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VanneReglante"; mo.inputs = ["C1","Ouv"]; diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle index 01b477cf..662d2cf8 100644 --- a/js/Hydraulics/VanneReglante.pickle +++ b/js/Hydraulics/VanneReglante.pickle @@ -85,25 +85,26 @@ p26 g2 sS'model.dep_ut' p27 -g12 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p28 +sS'model.equations.parameters[2-1]' +p29 g16 sS'exprs' -p29 +p30 g14 sS'gr_i' -p30 +p31 g12 sS'p_rho' -p31 +p32 g7 sS'y' -p32 +p33 g12 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 s.
\ No newline at end of file |