diff options
author | Sunil Shetye | 2018-07-15 00:26:52 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-15 07:11:58 +0530 |
commit | 92f8a251bbaeddf6ec034722a3079d865517d650 (patch) | |
tree | fb1b9f51c3456c04c02ac3ab144b65bdd392e98b /js/Electrical | |
parent | c394c9628cd411c95def024d47f10d953e160ec5 (diff) | |
download | sci2js-92f8a251bbaeddf6ec034722a3079d865517d650.tar.gz sci2js-92f8a251bbaeddf6ec034722a3079d865517d650.tar.bz2 sci2js-92f8a251bbaeddf6ec034722a3079d865517d650.zip |
handle boolean differently
Diffstat (limited to 'js/Electrical')
48 files changed, 246 insertions, 222 deletions
diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index a28ddf88..d42829ae 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -39,7 +39,7 @@ function CCS() { this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",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/Electrical/CCS.pickle b/js/Electrical/CCS.pickle index e1251121..e4144780 100644 --- a/js/Electrical/CCS.pickle +++ b/js/Electrical/CCS.pickle @@ -92,26 +92,27 @@ p29 g11 sS'model.dep_ut' p30 -g6 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g6 sS'gr_i' -p32 +p33 g6 sS'PortName' -p33 +p34 g11 sS'x' -p34 +p35 g2 sS'model' -p35 +p36 g2 sS'ParametersName' -p36 +p37 g6 sS'mo' -p37 +p38 g8 s.
\ No newline at end of file diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 0896afe9..845ee04d 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -39,7 +39,7 @@ function CVS() { this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",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/Electrical/CVS.pickle b/js/Electrical/CVS.pickle index e1251121..e4144780 100644 --- a/js/Electrical/CVS.pickle +++ b/js/Electrical/CVS.pickle @@ -92,26 +92,27 @@ p29 g11 sS'model.dep_ut' p30 -g6 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g6 sS'gr_i' -p32 +p33 g6 sS'PortName' -p33 +p34 g11 sS'x' -p34 +p35 g2 sS'model' -p35 +p36 g2 sS'ParametersName' -p36 +p37 g6 sS'mo' -p37 +p38 g8 s.
\ No newline at end of file diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index f6f5f7b8..c542eb02 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -7,7 +7,7 @@ function Capacitor() { this.model.rpar = new ScilabDouble([this.C],[this.v]); this.model.sim = new ScilabString(["Capacitor"]); 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 = "Capacitor"; mo.inputs = "p"; diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index 8afd2cda..8e48a96f 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.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 g14 sS'exprs' -p29 +p30 g5 sS'gr_i' -p30 +p31 g12 sS'v' -p31 +p32 g8 sS'y' -p32 +p33 g12 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 s.
\ No newline at end of file diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index d2f80fb1..b63e2cc1 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -8,7 +8,7 @@ function ConstantVoltage() { this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["ConstantVoltage"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "ConstantVoltage"; mo.inputs = "p"; diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 7a66a82b..f05caaee 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -82,22 +82,23 @@ p25 g8 sS'model.dep_ut' p26 -g13 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p27 +sS'model.equations.parameters[2-1]' +p28 g15 sS'exprs' -p28 +p29 g5 sS'gr_i' -p29 +p30 g13 sS'y' -p30 +p31 g13 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index c0468b36..a2f3b791 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -6,7 +6,7 @@ function CurrentSensor() { this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["CurrentSensor"]); 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 = "CurrentSensor"; mo.inputs = "p"; diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle index 7cc82643..152bc012 100644 --- a/js/Electrical/CurrentSensor.pickle +++ b/js/Electrical/CurrentSensor.pickle @@ -45,32 +45,33 @@ p12 g2 sS'model.dep_ut' p13 -g7 -sS'model.out' +S'vector_boolean' p14 +sS'model.out' +p15 g9 sS'gr_i' -p15 +p16 g7 sS'x.graphics.in_implicit' -p16 +p17 g7 sS'model.in' -p17 +p18 g4 sS'y' -p18 +p19 g7 sS'x' -p19 -NsS'model' p20 -S'object' +NsS'model' p21 -sS'typ' +S'object' p22 +sS'typ' +p23 g7 sS'mo.outputs' -p23 +p24 g9 s.
\ No newline at end of file diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index 65e930f2..5cd03621 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -11,7 +11,7 @@ function Diode() { this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["Diode"]); 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 = "Diode"; mo.inputs = "p"; diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle index 10292bf2..786733de 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -98,22 +98,23 @@ p29 g5 sS'model.dep_ut' p30 -g12 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g10 sS'gr_i' -p32 +p33 g12 sS'Vt' -p33 +p34 g5 sS'y' -p34 +p35 g12 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index dc6565bc..6674fde9 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -6,7 +6,7 @@ function Ground() { this.model.out = new ScilabDouble([]); this.model.sim = new ScilabString(["Ground"]); 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 = "Ground"; mo.inputs = "p"; diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle index fd8415fa..c429dc77 100644 --- a/js/Electrical/Ground.pickle +++ b/js/Electrical/Ground.pickle @@ -44,29 +44,30 @@ p11 g2 sS'model.dep_ut' p12 -g8 -sS'model.out' +S'vector_boolean' p13 +sS'model.out' +p14 g8 sS'gr_i' -p14 +p15 g8 sS'x.graphics.in_implicit' -p15 +p16 g8 sS'model.in' -p16 +p17 g8 sS'y' -p17 +p18 g8 sS'x' -p18 -NsS'model' p19 -S'object' +NsS'model' p20 -sS'typ' +S'object' p21 +sS'typ' +p22 g8 s.
\ No newline at end of file diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 4f0a53fc..9aeea7ab 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -39,7 +39,7 @@ function Gyrator() { this.exprs = [["1"],["1"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",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/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle index f219c232..6ae47a7e 100644 --- a/js/Electrical/Gyrator.pickle +++ b/js/Electrical/Gyrator.pickle @@ -105,25 +105,26 @@ p32 g8 sS'model.dep_ut' p33 -g20 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g8 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g8 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g8 sS'MO' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index 962bfdcc..f1df4307 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -39,7 +39,7 @@ function IdealTransformer() { this.exprs = ["1"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",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/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 1b921a73..2228b43d 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -103,25 +103,26 @@ p32 g14 sS'model.dep_ut' p33 -g8 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g8 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g14 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g8 sS'MO' -p40 +p41 g14 s.
\ No newline at end of file diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 13b55641..1028683b 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -8,7 +8,7 @@ function Inductor() { this.model.rpar = new ScilabDouble([this.L]); this.model.sim = new ScilabString(["Inductor"]); 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 = "Inductor"; mo.inputs = "p"; diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index 6d73f4a8..fa521d31 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -82,22 +82,23 @@ p25 g16 sS'model.dep_ut' p26 -g8 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p27 +sS'model.equations.parameters[2-1]' +p28 g13 sS'exprs' -p28 +p29 g5 sS'gr_i' -p29 +p30 g8 sS'y' -p30 +p31 g8 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 1cf40079..6ab8def6 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -6,7 +6,7 @@ function MOTOR() { this.model.in = new ScilabDouble([1]); this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); this.exprs = ""; this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle index 9ea67544..fc3dbc05 100644 --- a/js/Electrical/MOTOR.pickle +++ b/js/Electrical/MOTOR.pickle @@ -31,30 +31,31 @@ S'matrix' p6 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 g6 sS'gr_i' p10 -g8 -sS'x.graphics.in_implicit' +S'vector' p11 -g8 -sS'model.in' +sS'x.graphics.in_implicit' p12 -g8 -sS'y' +g11 +sS'model.in' p13 -g8 -sS'x' +g11 +sS'y' p14 -NsS'model' +g11 +sS'x' p15 -S'object' +NsS'model' p16 -sS'typ' +S'object' p17 -g8 +sS'typ' +p18 +g11 s.
\ No newline at end of file diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 2b8792b1..ce637283 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -13,7 +13,7 @@ function NMOS() { this.RDS = 1.e+7; this.model.sim = new ScilabString(["NMOS"]); 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 = "NMOS"; mo.outputs = [["D"],["B"],["S"]]; diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index 40c50c53..7201b86f 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -117,25 +117,26 @@ p32 g4 sS'model.dep_ut' p33 -g16 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p34 +sS'model.equations.parameters[2-1]' +p35 g18 sS'exprs' -p35 +p36 g23 sS'gr_i' -p36 +p37 g16 sS'Vt' -p37 +p38 g2 sS'y' -p38 +p39 g16 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 s.
\ No newline at end of file diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index f86ae303..cd19be1e 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -39,7 +39,7 @@ function NPN() { this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NPN\",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/Electrical/NPN.pickle b/js/Electrical/NPN.pickle index d473e586..1fb6d728 100644 --- a/js/Electrical/NPN.pickle +++ b/js/Electrical/NPN.pickle @@ -135,25 +135,26 @@ p32 g8 sS'model.dep_ut' p33 -g20 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g8 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g8 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g8 sS'MO' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 00bbdc6a..e93e98cd 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -6,7 +6,7 @@ function OpAmp() { this.model = scicos_model(); this.model.sim = new ScilabString(["OpAmp"]); 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 = this.model.sim; mo.inputs = [["in_p"],["in_n"]]; diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index f8d3e7a6..bb3307a5 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -90,22 +90,23 @@ p27 g2 sS'model.dep_ut' p28 -g18 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p29 +sS'model.equations.parameters[2-1]' +p30 g14 sS'exprs' -p30 +p31 g5 sS'gr_i' -p31 +p32 g18 sS'y' -p32 +p33 g18 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 s.
\ No newline at end of file diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 81ffddc7..b0f62361 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -13,7 +13,7 @@ function PMOS() { this.RDS = 1.e+7; this.model.sim = new ScilabString(["PMOS"]); 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 = "PMOS"; mo.outputs = [["D"],["B"],["S"]]; diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index 40c50c53..7201b86f 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -117,25 +117,26 @@ p32 g4 sS'model.dep_ut' p33 -g16 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p34 +sS'model.equations.parameters[2-1]' +p35 g18 sS'exprs' -p35 +p36 g23 sS'gr_i' -p36 +p37 g16 sS'Vt' -p37 +p38 g2 sS'y' -p38 +p39 g16 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 s.
\ No newline at end of file diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 38ed38e9..676cf5fd 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -39,7 +39,7 @@ function PNP() { this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PNP\",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/Electrical/PNP.pickle b/js/Electrical/PNP.pickle index d473e586..1fb6d728 100644 --- a/js/Electrical/PNP.pickle +++ b/js/Electrical/PNP.pickle @@ -135,25 +135,26 @@ p32 g8 sS'model.dep_ut' p33 -g20 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g8 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g8 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g8 sS'MO' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index b3cc63f8..f5c9b76f 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -7,7 +7,7 @@ function PotentialSensor() { this.model.rpar = new ScilabDouble([]); this.model.sim = new ScilabString(["PotentialSensor"]); 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 = "PotentialSensor"; mo.inputs = "p"; diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle index d78a09c2..4ffd6a0b 100644 --- a/js/Electrical/PotentialSensor.pickle +++ b/js/Electrical/PotentialSensor.pickle @@ -53,23 +53,24 @@ p14 g7 sS'model.dep_ut' p15 -g7 -sS'model.in' +S'vector_boolean' p16 +sS'model.in' +p17 g7 sS'y' -p17 +p18 g7 sS'x' -p18 -NsS'model' p19 -S'object' +NsS'model' p20 -sS'typ' +S'object' p21 +sS'typ' +p22 g7 sS'mo.outputs' -p22 +p23 g7 s.
\ No newline at end of file diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index 412b0f56..ef2dcf5e 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -6,7 +6,7 @@ function Resistor() { this.model.rpar = new ScilabDouble([this.R]); this.model.sim = new ScilabString(["resistor"]); 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 = "Resistor"; mo.inputs = "p"; diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index 7e4c24cf..9e75b190 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -82,22 +82,23 @@ p25 g2 sS'model.dep_ut' p26 -g12 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p27 +sS'model.equations.parameters[2-1]' +p28 g14 sS'exprs' -p28 +p29 g5 sS'gr_i' -p29 +p30 g12 sS'y' -p30 +p31 g12 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 30df974f..87b6e622 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -12,7 +12,7 @@ function SineVoltage() { this.model.rpar = new ScilabDouble([this.V],[this.ph],[this.frq],[this.offset],[this.start]); this.model.sim = new ScilabString(["SineVoltage"]); 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 = "SineVoltage"; mo.inputs = "p"; diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index 569ed239..46bb2f90 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -103,22 +103,23 @@ p30 g12 sS'model.dep_ut' p31 -g8 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p32 +sS'model.equations.parameters[2-1]' +p33 g18 sS'exprs' -p33 +p34 g25 sS'gr_i' -p34 +p35 g8 sS'y' -p35 +p36 g8 sS'x' -p36 -NsS'model' p37 +NsS'model' +p38 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index a6fe5f09..ff334d1c 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -8,7 +8,7 @@ function Switch() { var Z = eval(S); this.model.sim = new ScilabString(["Switch"]); 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 = this.model.sim; mo.inputs = [["p"],["inp"]]; diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index a84cfd60..4ec1aed2 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -94,22 +94,23 @@ p29 g2 sS'model.dep_ut' p30 -g19 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p31 +sS'model.equations.parameters[2-1]' +p32 g14 sS'exprs' -p32 +p33 g5 sS'gr_i' -p33 +p34 g19 sS'y' -p34 +p35 g19 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g2 s.
\ No newline at end of file diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 7d1be7c6..60dfb33b 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -9,7 +9,7 @@ function VVsourceAC() { this.model.rpar = new ScilabDouble([this.FR]); this.model.sim = new ScilabString(["VVsourceAC"]); 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 = "VVsourceAC"; mo.inputs = ["p","VA"]; diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index d2b9a6cb..3b6c49a6 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -86,22 +86,23 @@ 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 g16 sS'exprs' -p30 +p31 g11 sS'gr_i' -p31 +p32 g11 sS'y' -p32 +p33 g11 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g6 s.
\ No newline at end of file diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index 5bf7a900..40e446e7 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -4,7 +4,7 @@ function VariableResistor() { this.model = scicos_model(); this.model.sim = new ScilabString(["VariableResistor"]); 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 = "VariableResistor"; mo.inputs = ["p","R"]; diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle index af8c8af0..645f7075 100644 --- a/js/Electrical/VariableResistor.pickle +++ b/js/Electrical/VariableResistor.pickle @@ -45,31 +45,32 @@ p12 g2 sS'model.dep_ut' p13 -g7 -sS'model.out' +S'vector_boolean' p14 +sS'model.out' +p15 g4 sS'gr_i' -p15 +p16 g7 sS'x.graphics.in_implicit' -p16 +p17 g7 sS'model.in' -p17 +p18 g4 sS'y' -p18 +p19 g7 sS'x' -p19 -NsS'model' p20 +NsS'model' +p21 g10 sS'typ' -p21 +p22 g7 sS'mo.outputs' -p22 +p23 g2 s.
\ No newline at end of file diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 0308bd9a..3434e243 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -6,7 +6,7 @@ function VoltageSensor() { this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["VoltageSensor"]); 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 = "VoltageSensor"; mo.inputs = "p"; diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle index 7cc82643..152bc012 100644 --- a/js/Electrical/VoltageSensor.pickle +++ b/js/Electrical/VoltageSensor.pickle @@ -45,32 +45,33 @@ p12 g2 sS'model.dep_ut' p13 -g7 -sS'model.out' +S'vector_boolean' p14 +sS'model.out' +p15 g9 sS'gr_i' -p15 +p16 g7 sS'x.graphics.in_implicit' -p16 +p17 g7 sS'model.in' -p17 +p18 g4 sS'y' -p18 +p19 g7 sS'x' -p19 -NsS'model' p20 -S'object' +NsS'model' p21 -sS'typ' +S'object' p22 +sS'typ' +p23 g7 sS'mo.outputs' -p23 +p24 g9 s.
\ No newline at end of file diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index a5bf800a..72276f83 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -9,7 +9,7 @@ function VsourceAC() { this.model.rpar = new ScilabDouble([this.VA],[this.FR]); this.model.sim = new ScilabString(["VsourceAC"]); 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 = "VsourceAC"; mo.inputs = "p"; diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index 89aeb7b9..7d0bc6da 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -88,22 +88,23 @@ 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 g16 sS'exprs' -p30 +p31 g22 sS'gr_i' -p31 +p32 g11 sS'y' -p32 +p33 g11 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g6 s.
\ No newline at end of file |