diff options
Diffstat (limited to 'js/Electrical')
48 files changed, 566 insertions, 632 deletions
diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index 61b96852..9ca93b6c 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -42,7 +42,7 @@ function CCS() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -58,11 +58,7 @@ function CCS() { return options; } CCS.prototype.set = function CCS() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle index 35f6a110..fc35644a 100644 --- a/js/Electrical/CCS.pickle +++ b/js/Electrical/CCS.pickle @@ -34,47 +34,47 @@ p8 sS'model.out' p9 g8 -sS'model.in1' -p10 -g8 sS'mo.inputs' -p11 +p10 S'matrix' -p12 +p11 sS'Typeout' -p13 -g12 +p12 +g11 sS'x.graphics.in_implicit' -p14 -g12 +p13 +g11 sS'mo.parameters' -p15 +p14 S'list' -p16 +p15 sS'model.sim' -p17 +p16 g4 sS'ModelName' -p18 +p17 g4 sS'y' -p19 +p18 g6 sS'mo.outputs' -p20 -g12 +p19 +g11 sS'Typein' -p21 -g12 +p20 +g11 sS'x.graphics.out_implicit' -p22 -g12 +p21 +g11 sS'model.rpar' -p23 +p22 g6 sS'P' +p23 +g11 +sS'model.in' p24 -g12 +g8 sS'graphics' p25 g2 @@ -86,10 +86,10 @@ p27 g4 sS'MO' p28 -g12 +g11 sS'MI' p29 -g12 +g11 sS'model.dep_ut' p30 g6 @@ -101,7 +101,7 @@ p32 g6 sS'PortName' p33 -g12 +g11 sS'x' p34 g8 diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 052d7100..46e24d85 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -42,7 +42,7 @@ function CVS() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -58,11 +58,7 @@ function CVS() { return options; } CVS.prototype.set = function CVS() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle index 35f6a110..fc35644a 100644 --- a/js/Electrical/CVS.pickle +++ b/js/Electrical/CVS.pickle @@ -34,47 +34,47 @@ p8 sS'model.out' p9 g8 -sS'model.in1' -p10 -g8 sS'mo.inputs' -p11 +p10 S'matrix' -p12 +p11 sS'Typeout' -p13 -g12 +p12 +g11 sS'x.graphics.in_implicit' -p14 -g12 +p13 +g11 sS'mo.parameters' -p15 +p14 S'list' -p16 +p15 sS'model.sim' -p17 +p16 g4 sS'ModelName' -p18 +p17 g4 sS'y' -p19 +p18 g6 sS'mo.outputs' -p20 -g12 +p19 +g11 sS'Typein' -p21 -g12 +p20 +g11 sS'x.graphics.out_implicit' -p22 -g12 +p21 +g11 sS'model.rpar' -p23 +p22 g6 sS'P' +p23 +g11 +sS'model.in' p24 -g12 +g8 sS'graphics' p25 g2 @@ -86,10 +86,10 @@ p27 g4 sS'MO' p28 -g12 +g11 sS'MI' p29 -g12 +g11 sS'model.dep_ut' p30 g6 @@ -101,7 +101,7 @@ p32 g6 sS'PortName' p33 -g12 +g11 sS'x' p34 g8 diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index d11d389c..87a25873 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -14,7 +14,7 @@ function Capacitor() { mo.outputs = "n"; mo.parameters = list(["C","v"],list(this.C,this.v),[0,1]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string([[this.C],[this.v]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); @@ -37,10 +37,7 @@ function Capacitor() { this.C = parseFloat(arguments[0]["C"]) this.v = parseFloat(arguments[0]["v"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.C,this.v,this.exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index f3585d18..49807874 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -36,47 +36,47 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 g5 sS'x.graphics.in_implicit' -p12 +p11 S'vector' -p13 +p12 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'C' -p17 +p16 g8 sS'model.equations' -p18 +p17 g8 sS'mo.outputs' -p19 +p18 g5 sS'x.graphics.out_implicit' -p20 -g13 +p19 +g12 sS'model.rpar' -p21 +p20 S'matrix' +p21 +sS'model.in' p22 +g8 sS'graphics.exprs' p23 NsS'typ' p24 -g13 +g12 sS'model.blocktype' p25 g5 @@ -85,22 +85,22 @@ p26 g2 sS'model.dep_ut' p27 -g13 +g12 sS'model.equations.parameters[2-1]' p28 -g15 +g14 sS'exprs' p29 g5 sS'gr_i' p30 -g13 +g12 sS'v' p31 g8 sS'y' p32 -g13 +g12 sS'x' p33 g8 diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index dc90df63..e2968411 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -4,7 +4,7 @@ function ConstantVoltage() { this.V = 0.01; this.model = scicos_model(); this.model.rpar = new ScilabDouble([this.V]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["ConstantVoltage"]); this.model.blocktype = new ScilabString(["c"]); @@ -33,10 +33,7 @@ function ConstantVoltage() { ConstantVoltage.prototype.set = function ConstantVoltage() { this.V = parseFloat(arguments[0]["V"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.V,this.exprs] = scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 92a04c12..7f12abce 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -33,9 +33,9 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' +sS'graphics' p9 -g8 +g2 sS'x.graphics' p10 g2 @@ -65,15 +65,15 @@ g13 sS'model.rpar' p20 g8 -sS'V' +sS'model.in' p21 g8 -sS'typ' +sS'V' p22 -g13 -sS'graphics' +g8 +sS'typ' p23 -g2 +g13 sS'model.blocktype' p24 g5 diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index 73659ef1..752f7b9b 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -2,7 +2,7 @@ function CurrentSensor() { CurrentSensor.prototype.define = function CurrentSensor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["CurrentSensor"]); this.model.blocktype = new ScilabString(["c"]); @@ -28,7 +28,6 @@ function CurrentSensor() { return options; } CurrentSensor.prototype.set = function CurrentSensor() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle index 31a790d2..01611a18 100644 --- a/js/Electrical/CurrentSensor.pickle +++ b/js/Electrical/CurrentSensor.pickle @@ -19,48 +19,48 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.equations' p3 S'double' p4 -sS'model.equations' -p5 -g4 sS'model.blocktype' -p6 +p5 g2 sS'exprs' -p7 +p6 S'vector' -p8 +p7 sS'x.graphics.out_implicit' -p9 +p8 S'matrix' -p10 +p9 sS'mo' -p11 +p10 g4 sS'mo.inputs' -p12 +p11 g2 sS'mo.model' -p13 +p12 g2 sS'model.dep_ut' -p14 -g8 +p13 +g7 sS'model.out' -p15 -g10 +p14 +g9 sS'gr_i' -p16 -g8 +p15 +g7 sS'x.graphics.in_implicit' +p16 +g7 +sS'model.in' p17 -g8 +g4 sS'y' p18 -g8 +g7 sS'x' p19 g4 @@ -70,8 +70,8 @@ S'object' p21 sS'typ' p22 -g8 +g7 sS'mo.outputs' p23 -g10 +g9 s.
\ No newline at end of file diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index d29202b3..8a7f0ebe 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -7,7 +7,7 @@ function Diode() { this.R = 1.e8; this.model = scicos_model(); this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["Diode"]); this.model.blocktype = new ScilabString(["c"]); @@ -43,10 +43,7 @@ function Diode() { this.Maxexp = parseFloat(arguments[0]["Maxexp"]) this.R = parseFloat(arguments[0]["R"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Ids,this.Vt,this.Maxexp,this.R,this.exprs] = scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle index cb1adba4..03c153b1 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -39,78 +39,78 @@ p6 NsS'model.out' p7 g5 -sS'model.in1' -p8 -g5 sS'x.graphics' -p9 +p8 g2 sS'mo.inputs' -p10 +p9 S'string' -p11 +p10 sS'x.graphics.in_implicit' -p12 +p11 S'vector' -p13 +p12 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 -g11 +p15 +g10 sS'model.equations' -p17 +p16 g5 sS'mo.outputs' -p18 -g11 +p17 +g10 sS'x.graphics.out_implicit' -p19 -g13 +p18 +g12 sS'Ids' -p20 +p19 g5 sS'model.rpar' -p21 +p20 S'matrix' -p22 +p21 sS'mo.model' -p23 -g11 +p22 +g10 sS'R' +p23 +g5 +sS'model.in' p24 g5 sS'graphics.exprs' p25 NsS'typ' p26 -g13 +g12 sS'model.equations.parameters' p27 -g15 +g14 sS'model.blocktype' p28 -g11 +g10 sS'mo' p29 g5 sS'model.dep_ut' p30 -g13 +g12 sS'exprs' p31 -g11 +g10 sS'gr_i' p32 -g13 +g12 sS'Vt' p33 g5 sS'y' p34 -g13 +g12 sS'x' p35 g5 diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index e7c04710..e9d19555 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -2,7 +2,7 @@ function Ground() { Ground.prototype.define = function Ground() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([]); this.model.sim = new ScilabString(["Ground"]); this.model.blocktype = new ScilabString(["c"]); @@ -27,7 +27,6 @@ function Ground() { return options; } Ground.prototype.set = function Ground() { - this.x = arg1; return new GroundBlock(this.x); } } diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle index bec9342e..7f41ea79 100644 --- a/js/Electrical/Ground.pickle +++ b/js/Electrical/Ground.pickle @@ -19,55 +19,55 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'vector' -p4 sS'model.equations' -p5 +p3 S'double' -p6 +p4 sS'model.blocktype' -p7 +p5 g2 sS'exprs' -p8 +p6 g2 sS'x.graphics.out_implicit' +p7 +S'vector' +p8 +sS'mo' p9 g4 -sS'mo' -p10 -g6 sS'mo.inputs' -p11 +p10 g2 sS'mo.model' -p12 +p11 g2 sS'model.dep_ut' -p13 -g4 +p12 +g8 sS'model.out' -p14 -g4 +p13 +g8 sS'gr_i' -p15 -g4 +p14 +g8 sS'x.graphics.in_implicit' +p15 +g8 +sS'model.in' p16 -g4 +g8 sS'y' p17 -g4 +g8 sS'x' p18 -g6 +g4 sS'model' p19 S'object' p20 sS'typ' p21 -g4 +g8 s.
\ No newline at end of file diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 00c0e951..d376d798 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -42,7 +42,7 @@ function Gyrator() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -63,11 +63,7 @@ function Gyrator() { this.G1 = arguments[0]["G1"] this.G2 = arguments[0]["G2"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.G1,this.G2,this.exprs] = scicos_getvalue([["Set Gyrator block parameters:"],[""],["G1: Gyration conductance"],["G2: Gyration conductance"]],["G1","G2"],list("vec",1,"vec",1),this.exprs); diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle index c683f394..b86e7d42 100644 --- a/js/Electrical/Gyrator.pickle +++ b/js/Electrical/Gyrator.pickle @@ -42,55 +42,55 @@ p10 sS'model.out' p11 g10 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'mo.inputs' -p14 +p13 g8 sS'Typeout' -p15 +p14 g8 sS'x.graphics.in_implicit' -p16 +p15 g8 sS'mo.parameters' -p17 +p16 g2 sS'model.sim' -p18 +p17 g6 sS'ModelName' -p19 +p18 g6 sS'y' -p20 +p19 S'vector' -p21 +p20 sS'mo.outputs' -p22 +p21 g8 sS'Typein' -p23 +p22 g8 sS'x.graphics.out_implicit' -p24 +p23 g8 sS'model.rpar' -p25 +p24 g8 sS'P' -p26 +p25 g8 +sS'model.in' +p26 +g10 sS'graphics' p27 g4 sS'typ' p28 -g21 +g20 sS'model.blocktype' p29 g6 @@ -99,13 +99,13 @@ p30 g10 sS'gr_i' p31 -g21 +g20 sS'MI' p32 g8 sS'model.dep_ut' p33 -g21 +g20 sS'exprs' p34 g8 diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index a24cdbb2..c39d4793 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -42,7 +42,7 @@ function IdealTransformer() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -61,11 +61,7 @@ function IdealTransformer() { IdealTransformer.prototype.set = function IdealTransformer() { this.N = arguments[0]["N"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.N,this.exprs] = scicos_getvalue([["Set Transformer block parameters:"],[""],["N:"+" Turn ratio (N1/N2)"]],["N"],list("vec",1),this.exprs); diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 19ad5954..81920d7d 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -40,49 +40,49 @@ p10 sS'model.out' p11 g10 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'mo.inputs' -p14 +p13 S'matrix' -p15 +p14 sS'Typeout' -p16 -g15 +p15 +g14 sS'x.graphics.in_implicit' -p17 -g15 +p16 +g14 sS'mo.parameters' -p18 +p17 g2 sS'model.sim' -p19 +p18 g6 sS'ModelName' -p20 +p19 g6 sS'y' -p21 +p20 g8 sS'mo.outputs' -p22 -g15 +p21 +g14 sS'Typein' -p23 -g15 +p22 +g14 sS'x.graphics.out_implicit' -p24 -g15 +p23 +g14 sS'model.rpar' -p25 +p24 g8 sS'P' +p25 +g14 +sS'model.in' p26 -g15 +g10 sS'graphics' p27 g4 @@ -100,7 +100,7 @@ p31 g8 sS'MI' p32 -g15 +g14 sS'model.dep_ut' p33 g8 @@ -111,7 +111,7 @@ sS'x.graphics.exprs' p35 NsS'PortName' p36 -g15 +g14 sS'x' p37 g10 @@ -123,5 +123,5 @@ p39 g8 sS'MO' p40 -g15 +g14 s.
\ No newline at end of file diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index fc028e43..3e303f91 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -2,7 +2,7 @@ function Inductor() { Inductor.prototype.define = function Inductor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.L = 1.e-5; this.model.rpar = new ScilabDouble([this.L]); @@ -33,10 +33,7 @@ function Inductor() { Inductor.prototype.set = function Inductor() { this.L = parseFloat(arguments[0]["L"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.L,this.exprs] = scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index b7c3a7df..bfc112c9 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -34,41 +34,41 @@ NsS'model.out' p7 S'vector' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 g5 sS'x.graphics.in_implicit' -p12 +p11 g8 sS'mo.parameters' -p13 +p12 S'list' -p14 +p13 sS'model.sim' -p15 +p14 g5 sS'model.equations' -p16 +p15 S'double' -p17 +p16 sS'mo.outputs' -p18 +p17 g5 sS'x.graphics.out_implicit' -p19 +p18 g8 sS'L' -p20 -g17 +p19 +g16 sS'model.rpar' +p20 +g16 +sS'model.in' p21 -g17 +g8 sS'graphics.exprs' p22 NsS'typ' @@ -79,13 +79,13 @@ p24 g5 sS'mo' p25 -g17 +g16 sS'model.dep_ut' p26 g8 sS'model.equations.parameters[2-1]' p27 -g14 +g13 sS'exprs' p28 g5 @@ -97,7 +97,7 @@ p30 g8 sS'x' p31 -g17 +g16 sS'model' p32 g2 diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 0683c275..90f683f7 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -3,7 +3,7 @@ function MOTOR() { MOTOR.prototype.define = function MOTOR() { this.model = scicos_model(); this.model.out = new ScilabDouble([1],[1]); - this.model.in1 = new ScilabDouble([1]); + 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]); @@ -23,7 +23,6 @@ function MOTOR() { return options; } MOTOR.prototype.set = function MOTOR() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle index 9c6210d5..c2594170 100644 --- a/js/Electrical/MOTOR.pickle +++ b/js/Electrical/MOTOR.pickle @@ -19,35 +19,35 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'vector' -p4 sS'model.blocktype' -p5 +p3 g2 sS'exprs' -p6 +p4 g2 sS'x.graphics.out_implicit' -p7 +p5 S'matrix' -p8 +p6 sS'model.dep_ut' -p9 -g4 +p7 +S'vector' +p8 sS'model.out' +p9 +g6 +sS'gr_i' p10 g8 -sS'gr_i' -p11 -g4 sS'x.graphics.in_implicit' +p11 +g8 +sS'model.in' p12 -g4 +g8 sS'y' p13 -g4 +g8 sS'x' p14 S'double' @@ -58,5 +58,5 @@ S'object' p17 sS'typ' p18 -g4 +g8 s.
\ No newline at end of file diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 7632989f..57be53ba 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -20,7 +20,7 @@ function NMOS() { mo.inputs = "G"; mo.parameters = list([["W"],["L"],["Beta"],["Vt"],["K2"],["K5"],["dW"],["dL"],["RDS"]],[[this.W],[this.L],[this.Beta],[this.Vt],[this.K2],[this.K5],[this.dW],[this.dL],[this.RDS]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); @@ -57,10 +57,7 @@ function NMOS() { this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index 2be5e1af..b98ca894 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -33,41 +33,41 @@ p15 atp16 Rp17 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'double' p2 -sS'graphics' +sS'arg1' p3 -g2 -sS'mo.model' +S'object' p4 -S'string' +sS'graphics' p5 -sS'K2' +g4 +sS'mo.model' p6 -S'double' +S'string' p7 -sS'x.model' +sS'K2' p8 -NsS'K5' +g2 +sS'x.model' p9 -g7 -sS'model.out' +NsS'K5' p10 -g7 -sS'model.in1' +g2 +sS'model.out' p11 -g7 +g2 sS'x.graphics' p12 -g2 +g4 sS'mo.inputs' p13 -g5 +g7 sS'Beta' p14 -g7 +g2 sS'x.graphics.in_implicit' p15 S'vector' @@ -78,13 +78,13 @@ S'list' p18 sS'model.sim' p19 -g5 +g7 sS'model.equations' p20 -g7 +g2 sS'RDS' p21 -g7 +g2 sS'mo.outputs' p22 S'matrix' @@ -94,10 +94,10 @@ p24 g23 sS'L' p25 -g7 +g2 sS'W' p26 -g7 +g2 sS'graphics.exprs' p27 NsS'typ' @@ -105,16 +105,16 @@ p28 g16 sS'dW' p29 -g7 +g2 sS'dL' p30 -g7 +g2 sS'model.blocktype' p31 -g5 +g7 sS'mo' p32 -g2 +g4 sS'model.dep_ut' p33 g16 @@ -129,14 +129,14 @@ p36 g16 sS'Vt' p37 -g7 +g2 sS'y' p38 g16 sS'x' p39 -g7 +g2 sS'model' p40 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index 5246a65a..5f0586f9 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -42,7 +42,7 @@ function NPN() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -93,11 +93,7 @@ function NPN() { this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax,this.exprs] = scicos_getvalue([["Set NPN block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle index aa977a9f..61efb5cd 100644 --- a/js/Electrical/NPN.pickle +++ b/js/Electrical/NPN.pickle @@ -72,55 +72,55 @@ p10 sS'model.out' p11 g10 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'mo.inputs' -p14 +p13 g8 sS'Typeout' -p15 +p14 g8 sS'x.graphics.in_implicit' -p16 +p15 g8 sS'mo.parameters' -p17 +p16 g2 sS'model.sim' -p18 +p17 g6 sS'ModelName' -p19 +p18 g6 sS'y' -p20 +p19 S'vector' -p21 +p20 sS'mo.outputs' -p22 +p21 g8 sS'Typein' -p23 +p22 g8 sS'x.graphics.out_implicit' -p24 +p23 g8 sS'model.rpar' -p25 +p24 g8 sS'P' -p26 +p25 g8 +sS'model.in' +p26 +g10 sS'graphics' p27 g4 sS'typ' p28 -g21 +g20 sS'model.blocktype' p29 g6 @@ -129,13 +129,13 @@ p30 g10 sS'gr_i' p31 -g21 +g20 sS'MI' p32 g8 sS'model.dep_ut' p33 -g21 +g20 sS'exprs' p34 g8 diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 31437ba3..56a1e584 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -13,7 +13,7 @@ function OpAmp() { mo.outputs = ["out"]; mo.parameters = list(S,Z); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble(Z); this.exprs = string(Z); @@ -39,10 +39,7 @@ function OpAmp() { this.SatH = arguments[0]["SatH"] this.SatL = arguments[0]["SatL"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (false) { [ok,this.OLGain,this.SatH,this.SatL,this.exprs] = scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index e96d6dc2..1dc893ad 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -38,50 +38,50 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 S'matrix' -p12 +p11 sS'x.graphics.in_implicit' -p13 -g12 +p12 +g11 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'model.equations' -p17 +p16 g8 sS'mo.outputs' -p18 +p17 S'vector' -p19 +p18 sS'x.graphics.out_implicit' -p20 -g19 +p19 +g18 sS'model.rpar' -p21 -g19 +p20 +g18 sS'S' +p21 +g18 +sS'model.in' p22 -g19 +g8 sS'graphics.exprs' p23 NsS'Z' p24 -g19 +g18 sS'typ' p25 -g19 +g18 sS'model.blocktype' p26 g5 @@ -90,19 +90,19 @@ p27 g2 sS'model.dep_ut' p28 -g19 +g18 sS'model.equations.parameters[2-1]' p29 -g15 +g14 sS'exprs' p30 g5 sS'gr_i' p31 -g19 +g18 sS'y' p32 -g19 +g18 sS'x' p33 g8 diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index ae570801..9c9fd1b2 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -20,7 +20,7 @@ function PMOS() { mo.inputs = "G"; mo.parameters = list([["W"],["L"],["Beta"],["Vt"],["K2"],["K5"],["dW"],["dL"],["RDS"]],[[this.W],[this.L],[this.Beta],[this.Vt],[this.K2],[this.K5],[this.dW],[this.dL],[this.RDS]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); @@ -57,10 +57,7 @@ function PMOS() { this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index 2be5e1af..b98ca894 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -33,41 +33,41 @@ p15 atp16 Rp17 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'double' p2 -sS'graphics' +sS'arg1' p3 -g2 -sS'mo.model' +S'object' p4 -S'string' +sS'graphics' p5 -sS'K2' +g4 +sS'mo.model' p6 -S'double' +S'string' p7 -sS'x.model' +sS'K2' p8 -NsS'K5' +g2 +sS'x.model' p9 -g7 -sS'model.out' +NsS'K5' p10 -g7 -sS'model.in1' +g2 +sS'model.out' p11 -g7 +g2 sS'x.graphics' p12 -g2 +g4 sS'mo.inputs' p13 -g5 +g7 sS'Beta' p14 -g7 +g2 sS'x.graphics.in_implicit' p15 S'vector' @@ -78,13 +78,13 @@ S'list' p18 sS'model.sim' p19 -g5 +g7 sS'model.equations' p20 -g7 +g2 sS'RDS' p21 -g7 +g2 sS'mo.outputs' p22 S'matrix' @@ -94,10 +94,10 @@ p24 g23 sS'L' p25 -g7 +g2 sS'W' p26 -g7 +g2 sS'graphics.exprs' p27 NsS'typ' @@ -105,16 +105,16 @@ p28 g16 sS'dW' p29 -g7 +g2 sS'dL' p30 -g7 +g2 sS'model.blocktype' p31 -g5 +g7 sS'mo' p32 -g2 +g4 sS'model.dep_ut' p33 g16 @@ -129,14 +129,14 @@ p36 g16 sS'Vt' p37 -g7 +g2 sS'y' p38 g16 sS'x' p39 -g7 +g2 sS'model' p40 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 295f7c44..2716a49b 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -42,7 +42,7 @@ function PNP() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -93,11 +93,7 @@ function PNP() { this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax,this.exprs] = scicos_getvalue([["Set PNP block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle index aa977a9f..61efb5cd 100644 --- a/js/Electrical/PNP.pickle +++ b/js/Electrical/PNP.pickle @@ -72,55 +72,55 @@ p10 sS'model.out' p11 g10 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'mo.inputs' -p14 +p13 g8 sS'Typeout' -p15 +p14 g8 sS'x.graphics.in_implicit' -p16 +p15 g8 sS'mo.parameters' -p17 +p16 g2 sS'model.sim' -p18 +p17 g6 sS'ModelName' -p19 +p18 g6 sS'y' -p20 +p19 S'vector' -p21 +p20 sS'mo.outputs' -p22 +p21 g8 sS'Typein' -p23 +p22 g8 sS'x.graphics.out_implicit' -p24 +p23 g8 sS'model.rpar' -p25 +p24 g8 sS'P' -p26 +p25 g8 +sS'model.in' +p26 +g10 sS'graphics' p27 g4 sS'typ' p28 -g21 +g20 sS'model.blocktype' p29 g6 @@ -129,13 +129,13 @@ p30 g10 sS'gr_i' p31 -g21 +g20 sS'MI' p32 g8 sS'model.dep_ut' p33 -g21 +g20 sS'exprs' p34 g8 diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index c6e1bab1..fd73b916 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -2,7 +2,7 @@ function PotentialSensor() { PotentialSensor.prototype.define = function PotentialSensor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([]); this.model.sim = new ScilabString(["PotentialSensor"]); @@ -28,7 +28,6 @@ function PotentialSensor() { return options; } PotentialSensor.prototype.set = function PotentialSensor() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle index 1677f93c..be456ea1 100644 --- a/js/Electrical/PotentialSensor.pickle +++ b/js/Electrical/PotentialSensor.pickle @@ -19,58 +19,58 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'vector' -p4 sS'model.equations' -p5 +p3 S'double' -p6 +p4 sS'model.blocktype' -p7 +p5 g2 sS'x.graphics.out_implicit' +p6 +S'vector' +p7 +sS'mo' p8 g4 -sS'mo' -p9 -g6 sS'mo.inputs' -p10 +p9 g2 sS'mo.model' -p11 +p10 g2 sS'model.rpar' -p12 -g4 +p11 +g7 sS'model.out' -p13 -g4 +p12 +g7 sS'gr_i' -p14 -g4 +p13 +g7 sS'x.graphics.in_implicit' -p15 -g4 +p14 +g7 sS'model.dep_ut' +p15 +g7 +sS'model.in' p16 -g4 +g7 sS'y' p17 -g4 +g7 sS'x' p18 -g6 +g4 sS'model' p19 S'object' p20 sS'typ' p21 -g4 +g7 sS'mo.outputs' p22 -g4 +g7 s.
\ No newline at end of file diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index ab3ddf84..03cefee9 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -13,7 +13,7 @@ function Resistor() { mo.outputs = "n"; mo.parameters = list("R",list(this.R)); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string(this.R); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); @@ -33,10 +33,7 @@ function Resistor() { Resistor.prototype.set = function Resistor() { this.R = parseFloat(arguments[0]["R"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.R,this.exprs] = scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index 070fe90f..e7c6f185 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -34,46 +34,46 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 g5 sS'x.graphics.in_implicit' -p12 +p11 S'vector' -p13 +p12 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'model.equations' -p17 +p16 g8 sS'mo.outputs' -p18 +p17 g5 sS'x.graphics.out_implicit' -p19 -g13 +p18 +g12 sS'model.rpar' -p20 +p19 g8 sS'R' +p20 +g8 +sS'model.in' p21 g8 sS'graphics.exprs' p22 NsS'typ' p23 -g13 +g12 sS'model.blocktype' p24 g5 @@ -82,19 +82,19 @@ p25 g2 sS'model.dep_ut' p26 -g13 +g12 sS'model.equations.parameters[2-1]' p27 -g15 +g14 sS'exprs' p28 g5 sS'gr_i' p29 -g13 +g12 sS'y' p30 -g13 +g12 sS'x' p31 g8 diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 13b008b0..ffdbf7f7 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -2,7 +2,7 @@ function SineVoltage() { SineVoltage.prototype.define = function SineVoltage() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.V = 1; this.ph = 0; @@ -46,10 +46,7 @@ function SineVoltage() { this.offset = parseFloat(arguments[0]["offset"]) this.start = parseFloat(arguments[0]["start"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.V,this.ph,this.frq,this.offset,this.start,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index 464dfc6e..db0b4d82 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -29,97 +29,97 @@ S'arg1' p1 S'object' p2 -sS'offset' +sS'graphics' p3 -S'double' -p4 +g2 sS'mo.model' -p5 +p4 S'string' -p6 +p5 sS'x.model' -p7 +p6 NsS'model.out' -p8 +p7 S'vector' -p9 -sS'model.in1' -p10 -g9 +p8 sS'x.graphics' -p11 +p9 g2 sS'mo.inputs' +p10 +g5 +sS'offset' +p11 +S'double' p12 -g6 sS'start' p13 -g4 +g12 sS'frq' p14 -g4 +g12 sS'x.graphics.in_implicit' p15 -g9 +g8 sS'ph' p16 -g4 +g12 sS'mo.parameters' p17 S'list' p18 sS'model.sim' p19 -g6 +g5 sS'V' p20 -g4 +g12 sS'model.equations' p21 -g4 +g12 sS'mo.outputs' p22 -g6 +g5 sS'x.graphics.out_implicit' p23 -g9 +g8 sS'model.rpar' p24 S'matrix' p25 -sS'graphics.exprs' +sS'model.in' p26 -NsS'typ' +g8 +sS'graphics.exprs' p27 -g9 -sS'model.blocktype' +NsS'typ' p28 -g6 -sS'graphics' +g8 +sS'model.blocktype' p29 -g2 -sS'model.dep_ut' +g5 +sS'mo' p30 -g9 -sS'model.equations.parameters[2-1]' +g12 +sS'model.dep_ut' p31 +g8 +sS'model.equations.parameters[2-1]' +p32 g18 sS'exprs' -p32 +p33 g25 sS'gr_i' -p33 -g9 -sS'y' p34 -g9 -sS'x' +g8 +sS'y' p35 -g4 -sS'model' +g8 +sS'x' p36 -g2 -sS'mo' +g12 +sS'model' p37 -g4 +g2 s.
\ No newline at end of file diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index 5fc20dd9..d91773cc 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -15,7 +15,7 @@ function Switch() { mo.outputs = "n"; mo.parameters = list(S,Z); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble([Z]); this.exprs = string(Z); @@ -39,10 +39,7 @@ function Switch() { this.Ron = parseFloat(arguments[0]["Ron"]) this.Roff = parseFloat(arguments[0]["Roff"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Ron,this.Roff,this.exprs] = scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index 4c2ce9dd..5f734625 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -36,42 +36,42 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 S'matrix' -p12 +p11 sS'x.graphics.in_implicit' -p13 -g12 +p12 +g11 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'model.equations' -p17 +p16 g8 sS'mo.outputs' -p18 +p17 g5 sS'x.graphics.out_implicit' -p19 +p18 S'vector' -p20 +p19 sS'model.rpar' -p21 +p20 g8 sS'S' +p21 +g11 +sS'model.in' p22 -g12 +g8 sS'graphics.exprs' p23 NsS'Z' @@ -79,7 +79,7 @@ p24 g8 sS'typ' p25 -g20 +g19 sS'model.blocktype' p26 g5 @@ -94,19 +94,19 @@ p29 g2 sS'model.dep_ut' p30 -g20 +g19 sS'model.equations.parameters[2-1]' p31 -g15 +g14 sS'exprs' p32 g5 sS'gr_i' p33 -g20 +g19 sS'y' p34 -g20 +g19 sS'x' p35 g8 diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 907daeb0..0caef248 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -2,7 +2,7 @@ function VVsourceAC() { VVsourceAC.prototype.define = function VVsourceAC() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); var VA = 220; this.FR = 50; @@ -35,10 +35,7 @@ function VVsourceAC() { VVsourceAC.prototype.set = function VVsourceAC() { this.FR = parseFloat(arguments[0]["FR"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index b1563a7d..ea61b826 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -41,38 +41,38 @@ NsS'model.out' p10 S'vector' p11 -sS'model.in1' -p12 -S'matrix' -p13 sS'x.graphics' -p14 +p12 g6 sS'mo.inputs' -p15 +p13 g11 sS'x.graphics.in_implicit' -p16 +p14 g11 sS'mo.parameters' -p17 +p15 S'list' -p18 +p16 sS'VA' -p19 +p17 g2 sS'model.equations' -p20 +p18 g2 sS'mo.outputs' -p21 +p19 g4 sS'x.graphics.out_implicit' -p22 +p20 g11 sS'model.rpar' -p23 +p21 g11 +sS'model.in' +p22 +S'matrix' +p23 sS'graphics.exprs' p24 NsS'typ' @@ -89,7 +89,7 @@ p28 g11 sS'model.equations.parameters[2-1]' p29 -g18 +g16 sS'exprs' p30 g11 diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index 2efac33a..bd77b219 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -10,7 +10,7 @@ function VariableResistor() { mo.inputs = ["p","R"]; mo.outputs = "n"; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); @@ -28,7 +28,6 @@ function VariableResistor() { return options; } VariableResistor.prototype.set = function VariableResistor() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle index 4e1a30e9..2aeed4ce 100644 --- a/js/Electrical/VariableResistor.pickle +++ b/js/Electrical/VariableResistor.pickle @@ -19,57 +19,57 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.equations' p3 S'double' p4 -sS'model.equations' -p5 -g4 sS'model.blocktype' -p6 +p5 g2 sS'exprs' -p7 +p6 S'vector' -p8 +p7 sS'x.graphics.out_implicit' -p9 -g8 +p8 +g7 sS'mo' -p10 +p9 S'object' -p11 +p10 sS'mo.inputs' -p12 -g8 +p11 +g7 sS'mo.model' -p13 +p12 g2 sS'model.dep_ut' -p14 -g8 +p13 +g7 sS'model.out' -p15 +p14 g4 sS'gr_i' -p16 -g8 +p15 +g7 sS'x.graphics.in_implicit' +p16 +g7 +sS'model.in' p17 -g8 +g4 sS'y' p18 -g8 +g7 sS'x' p19 g4 sS'model' p20 -g11 +g10 sS'typ' p21 -g8 +g7 sS'mo.outputs' p22 g2 diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 5500324e..26f366ce 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -2,7 +2,7 @@ function VoltageSensor() { VoltageSensor.prototype.define = function VoltageSensor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["VoltageSensor"]); this.model.blocktype = new ScilabString(["c"]); @@ -28,7 +28,6 @@ function VoltageSensor() { return options; } VoltageSensor.prototype.set = function VoltageSensor() { - this.x = arg1; return new VoltageSensorBlock(this.x); } } diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle index 31a790d2..01611a18 100644 --- a/js/Electrical/VoltageSensor.pickle +++ b/js/Electrical/VoltageSensor.pickle @@ -19,48 +19,48 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.equations' p3 S'double' p4 -sS'model.equations' -p5 -g4 sS'model.blocktype' -p6 +p5 g2 sS'exprs' -p7 +p6 S'vector' -p8 +p7 sS'x.graphics.out_implicit' -p9 +p8 S'matrix' -p10 +p9 sS'mo' -p11 +p10 g4 sS'mo.inputs' -p12 +p11 g2 sS'mo.model' -p13 +p12 g2 sS'model.dep_ut' -p14 -g8 +p13 +g7 sS'model.out' -p15 -g10 +p14 +g9 sS'gr_i' -p16 -g8 +p15 +g7 sS'x.graphics.in_implicit' +p16 +g7 +sS'model.in' p17 -g8 +g4 sS'y' p18 -g8 +g7 sS'x' p19 g4 @@ -70,8 +70,8 @@ S'object' p21 sS'typ' p22 -g8 +g7 sS'mo.outputs' p23 -g10 +g9 s.
\ No newline at end of file diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index 60e84496..ef8644eb 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -2,7 +2,7 @@ function VsourceAC() { VsourceAC.prototype.define = function VsourceAC() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.VA = 220; this.FR = 50; @@ -37,10 +37,7 @@ function VsourceAC() { this.VA = parseFloat(arguments[0]["VA"]) this.FR = parseFloat(arguments[0]["FR"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.VA,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index 01ffa4e3..a82a09d8 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -43,38 +43,38 @@ NsS'model.out' p10 S'vector' p11 -sS'model.in1' -p12 -g11 sS'x.graphics' -p13 +p12 g6 sS'mo.inputs' -p14 +p13 g4 sS'x.graphics.in_implicit' -p15 +p14 g11 sS'mo.parameters' -p16 +p15 S'list' -p17 +p16 sS'VA' -p18 +p17 g2 sS'model.equations' -p19 +p18 g2 sS'mo.outputs' -p20 +p19 g4 sS'x.graphics.out_implicit' -p21 +p20 g11 sS'model.rpar' -p22 +p21 S'matrix' +p22 +sS'model.in' p23 +g11 sS'graphics.exprs' p24 NsS'typ' @@ -91,10 +91,10 @@ p28 g11 sS'model.equations.parameters[2-1]' p29 -g17 +g16 sS'exprs' p30 -g23 +g22 sS'gr_i' p31 g11 |