diff options
Diffstat (limited to 'js/Electrical')
-rw-r--r-- | js/Electrical/Capacitor.js | 2 | ||||
-rw-r--r-- | js/Electrical/Capacitor.pickle | 28 | ||||
-rw-r--r-- | js/Electrical/ConstantVoltage.js | 2 | ||||
-rw-r--r-- | js/Electrical/ConstantVoltage.pickle | 30 | ||||
-rw-r--r-- | js/Electrical/Inductor.js | 2 | ||||
-rw-r--r-- | js/Electrical/Inductor.pickle | 30 | ||||
-rw-r--r-- | js/Electrical/NMOS.js | 2 | ||||
-rw-r--r-- | js/Electrical/NMOS.pickle | 62 | ||||
-rw-r--r-- | js/Electrical/OpAmp.js | 2 | ||||
-rw-r--r-- | js/Electrical/OpAmp.pickle | 48 | ||||
-rw-r--r-- | js/Electrical/PMOS.js | 2 | ||||
-rw-r--r-- | js/Electrical/PMOS.pickle | 62 | ||||
-rw-r--r-- | js/Electrical/Resistor.js | 2 | ||||
-rw-r--r-- | js/Electrical/Resistor.pickle | 28 | ||||
-rw-r--r-- | js/Electrical/SineVoltage.js | 2 | ||||
-rw-r--r-- | js/Electrical/SineVoltage.pickle | 44 | ||||
-rw-r--r-- | js/Electrical/Switch.js | 2 | ||||
-rw-r--r-- | js/Electrical/Switch.pickle | 44 | ||||
-rw-r--r-- | js/Electrical/VVsourceAC.js | 2 | ||||
-rw-r--r-- | js/Electrical/VVsourceAC.pickle | 28 | ||||
-rw-r--r-- | js/Electrical/VsourceAC.js | 2 | ||||
-rw-r--r-- | js/Electrical/VsourceAC.pickle | 38 |
22 files changed, 232 insertions, 232 deletions
diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index 50314eeb..8096f50d 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -46,7 +46,7 @@ function Capacitor() { break; } this.model.rpar = new ScilabDouble(this.C); - this.model.equations.parameters[('2', 'double')] = list(this.C,this.v); + this.model.equations.parameters[2] = list(new ScilabDouble(this.C),new ScilabDouble(this.v)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index 2696f9fb..7c4bbd09 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -33,9 +33,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 g5 @@ -56,36 +56,36 @@ g8 sS'model.equations' p18 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p19 +g15 +sS'mo.outputs' +p20 g5 sS'x.graphics.out_implicit' -p20 +p21 g13 sS'model.rpar' -p21 -S'matrix' p22 -sS'graphics.exprs' +S'matrix' p23 -NsS'typ' +sS'graphics.exprs' p24 +NsS'typ' +p25 g13 sS'model.blocktype' -p25 +p26 g5 sS'mo' -p26 -g2 -sS'x.graphics' p27 g2 sS'model.dep_ut' p28 g13 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p29 -g15 +g5 sS'gr_i' p30 g13 diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index cd1c4d24..ab61e88f 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -42,7 +42,7 @@ function ConstantVoltage() { break; } this.model.rpar = new ScilabDouble(this.V); - this.model.equations.parameters[('2', 'double')] = list(this.V); + this.model.equations.parameters[2] = list(new ScilabDouble(this.V)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 7e8e6a7b..61da6484 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -30,9 +30,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 g5 @@ -50,39 +50,39 @@ g5 sS'model.equations' p17 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 +g15 +sS'mo.outputs' +p19 g5 sS'x.graphics.out_implicit' -p19 +p20 g13 sS'model.rpar' -p20 +p21 g8 sS'V' -p21 +p22 g8 sS'typ' -p22 +p23 g13 sS'graphics' -p23 +p24 g2 sS'model.blocktype' -p24 +p25 g5 sS'mo' -p25 -g8 -sS'x.graphics' p26 -g2 +g8 sS'model.dep_ut' p27 g13 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p28 -g15 +g5 sS'gr_i' p29 g13 diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 545ff3b0..86ad7fbb 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -42,7 +42,7 @@ function Inductor() { break; } this.model.rpar = new ScilabDouble(this.L); - this.model.equations.parameters[('2', 'double')] = list(this.L); + this.model.equations.parameters[2] = list(new ScilabDouble(this.L)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index 4e548cd4..7ae983ab 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -31,9 +31,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 g5 @@ -51,38 +51,38 @@ sS'model.equations' p16 S'double' p17 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 +g14 +sS'mo.outputs' +p19 g5 sS'x.graphics.out_implicit' -p19 +p20 g8 sS'L' -p20 +p21 g17 sS'model.rpar' -p21 +p22 g17 sS'graphics.exprs' -p22 -NsS'typ' p23 +NsS'typ' +p24 g8 sS'model.blocktype' -p24 +p25 g5 sS'mo' -p25 -g17 -sS'x.graphics' p26 -g2 +g17 sS'model.dep_ut' p27 g8 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p28 -g14 +g5 sS'gr_i' p29 g8 diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index a85923f3..1ed6e464 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -65,7 +65,7 @@ function NMOS() { if (!ok) { break; } - this.model.equations.parameters[('2', 'double')] = list(this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS); + this.model.equations.parameters[2] = list(new ScilabDouble(this.W),new ScilabDouble(this.L),new ScilabDouble(this.Beta),new ScilabDouble(this.Vt),new ScilabDouble(this.K2),new ScilabDouble(this.K5),new ScilabDouble(this.dW),new ScilabDouble(this.dL),new ScilabDouble(this.RDS)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index af7c5f1a..92dc0817 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -53,80 +53,80 @@ g7 sS'model.in1' p11 g7 -sS'exprs' +sS'x.graphics' p12 -S'matrix' -p13 +g2 sS'mo.inputs' -p14 +p13 g5 sS'Beta' -p15 +p14 g7 sS'x.graphics.in_implicit' -p16 +p15 S'vector' -p17 +p16 sS'mo.parameters' -p18 +p17 S'list' -p19 +p18 sS'model.sim' -p20 +p19 g5 sS'model.equations' -p21 +p20 g7 sS'RDS' -p22 +p21 g7 +sS'model.equations.parameters[2]' +p22 +g18 sS'mo.outputs' p23 -g13 -sS'x.graphics.out_implicit' +S'matrix' p24 -g13 -sS'L' +sS'x.graphics.out_implicit' p25 +g24 +sS'L' +p26 g7 sS'W' -p26 +p27 g7 sS'graphics.exprs' -p27 -NsS'typ' p28 -g17 -sS'dW' +NsS'typ' p29 +g16 +sS'dW' +p30 g7 sS'dL' -p30 +p31 g7 sS'model.blocktype' -p31 +p32 g5 sS'mo' -p32 -g2 -sS'x.graphics' p33 g2 sS'model.dep_ut' p34 -g17 -sS"model.equations.parameters[('2', 'double')]" +g16 +sS'exprs' p35 -g19 +g24 sS'gr_i' p36 -g17 +g16 sS'Vt' p37 g7 sS'y' p38 -g17 +g16 sS'x' p39 g7 diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 00935c08..630e5f77 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -47,7 +47,7 @@ function OpAmp() { if (!ok) { break; } - this.model.equations.parameters[('2', 'double')] = list(this.OLGain,this.SatH,this.SatL); + this.model.equations.parameters[2] = list(new ScilabDouble(this.OLGain),new ScilabDouble(this.SatH),new ScilabDouble(this.SatL)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index f88b9204..32c77948 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -35,9 +35,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 S'matrix' @@ -55,48 +55,48 @@ g5 sS'model.equations' p17 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 -S'vector' +g15 +sS'mo.outputs' p19 -sS'x.graphics.out_implicit' +S'vector' p20 -g19 -sS'model.rpar' +sS'x.graphics.out_implicit' p21 -g19 -sS'S' +g20 +sS'model.rpar' p22 -g19 -sS'graphics.exprs' +g20 +sS'S' p23 -NsS'Z' +g20 +sS'graphics.exprs' p24 -g19 -sS'typ' +NsS'Z' p25 -g19 -sS'model.blocktype' +g20 +sS'typ' p26 +g20 +sS'model.blocktype' +p27 g5 sS'mo' -p27 -g2 -sS'x.graphics' p28 g2 sS'model.dep_ut' p29 -g19 -sS"model.equations.parameters[('2', 'double')]" +g20 +sS'exprs' p30 -g15 +g5 sS'gr_i' p31 -g19 +g20 sS'y' p32 -g19 +g20 sS'x' p33 g8 diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 077514cd..551367d6 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -65,7 +65,7 @@ function PMOS() { if (!ok) { break; } - this.model.equations.parameters[('2', 'double')] = list(this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS); + this.model.equations.parameters[2] = list(new ScilabDouble(this.W),new ScilabDouble(this.L),new ScilabDouble(this.Beta),new ScilabDouble(this.Vt),new ScilabDouble(this.K2),new ScilabDouble(this.K5),new ScilabDouble(this.dW),new ScilabDouble(this.dL),new ScilabDouble(this.RDS)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index af7c5f1a..92dc0817 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -53,80 +53,80 @@ g7 sS'model.in1' p11 g7 -sS'exprs' +sS'x.graphics' p12 -S'matrix' -p13 +g2 sS'mo.inputs' -p14 +p13 g5 sS'Beta' -p15 +p14 g7 sS'x.graphics.in_implicit' -p16 +p15 S'vector' -p17 +p16 sS'mo.parameters' -p18 +p17 S'list' -p19 +p18 sS'model.sim' -p20 +p19 g5 sS'model.equations' -p21 +p20 g7 sS'RDS' -p22 +p21 g7 +sS'model.equations.parameters[2]' +p22 +g18 sS'mo.outputs' p23 -g13 -sS'x.graphics.out_implicit' +S'matrix' p24 -g13 -sS'L' +sS'x.graphics.out_implicit' p25 +g24 +sS'L' +p26 g7 sS'W' -p26 +p27 g7 sS'graphics.exprs' -p27 -NsS'typ' p28 -g17 -sS'dW' +NsS'typ' p29 +g16 +sS'dW' +p30 g7 sS'dL' -p30 +p31 g7 sS'model.blocktype' -p31 +p32 g5 sS'mo' -p32 -g2 -sS'x.graphics' p33 g2 sS'model.dep_ut' p34 -g17 -sS"model.equations.parameters[('2', 'double')]" +g16 +sS'exprs' p35 -g19 +g24 sS'gr_i' p36 -g17 +g16 sS'Vt' p37 g7 sS'y' p38 -g17 +g16 sS'x' p39 g7 diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index b1e2354c..3cdf9f1f 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -42,7 +42,7 @@ function Resistor() { break; } this.model.rpar = new ScilabDouble(this.R); - this.model.equations.parameters[('2', 'double')] = list(this.R); + this.model.equations.parameters[2] = list(new ScilabDouble(this.R)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index fffa69db..6b547a6b 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -31,9 +31,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 g5 @@ -51,38 +51,38 @@ g5 sS'model.equations' p17 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 +g15 +sS'mo.outputs' +p19 g5 sS'x.graphics.out_implicit' -p19 +p20 g13 sS'model.rpar' -p20 +p21 g8 sS'R' -p21 +p22 g8 sS'graphics.exprs' -p22 -NsS'typ' p23 +NsS'typ' +p24 g13 sS'model.blocktype' -p24 +p25 g5 sS'mo' -p25 -g2 -sS'x.graphics' p26 g2 sS'model.dep_ut' p27 g13 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p28 -g15 +g5 sS'gr_i' p29 g13 diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 4b6f5c2b..acf54cb3 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -55,7 +55,7 @@ function SineVoltage() { break; } this.model.rpar = [[this.V],[this.ph],[this.frq],[this.offset],[this.start]]; - this.model.equations.parameters[('2', 'double')] = list(this.V,this.ph,this.frq,this.offset,this.start); + this.model.equations.parameters[2] = list(new ScilabDouble(this.V),new ScilabDouble(this.ph),new ScilabDouble(this.frq),new ScilabDouble(this.offset),new ScilabDouble(this.start)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index 4024e82e..43dfea75 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -40,38 +40,40 @@ p9 sS'model.in1' p10 g9 -sS'exprs' +sS'x.graphics' p11 -S'matrix' -p12 +g2 sS'mo.inputs' -p13 +p12 g6 sS'start' -p14 +p13 g4 sS'frq' -p15 +p14 g4 sS'x.graphics.in_implicit' -p16 +p15 g9 sS'ph' -p17 +p16 g4 sS'mo.parameters' -p18 +p17 S'list' -p19 +p18 sS'model.sim' -p20 +p19 g6 sS'V' -p21 +p20 g4 sS'model.equations' -p22 +p21 g4 +sS'model.equations.parameters[2]' +p22 +g18 sS'mo.outputs' p23 g6 @@ -80,27 +82,25 @@ p24 g9 sS'model.rpar' p25 -g12 -sS'graphics.exprs' +S'matrix' p26 -NsS'typ' +sS'graphics.exprs' p27 +NsS'typ' +p28 g9 sS'model.blocktype' -p28 +p29 g6 sS'graphics' -p29 -g2 -sS'x.graphics' p30 g2 sS'model.dep_ut' p31 g9 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p32 -g19 +g26 sS'gr_i' p33 g9 diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index 3eafb101..524b91d6 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -47,7 +47,7 @@ function Switch() { if (!ok) { break; } - this.model.equations.parameters[('2', 'double')] = list(this.Ron,this.Roff); + this.model.equations.parameters[2] = list(new ScilabDouble(this.Ron),new ScilabDouble(this.Roff)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index d9d650a9..c5cb0a1a 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -33,9 +33,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 S'matrix' @@ -53,54 +53,54 @@ g5 sS'model.equations' p17 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 +g15 +sS'mo.outputs' +p19 g5 sS'x.graphics.out_implicit' -p19 -S'vector' p20 -sS'model.rpar' +S'vector' p21 +sS'model.rpar' +p22 g8 sS'S' -p22 +p23 g12 sS'graphics.exprs' -p23 -NsS'Z' p24 +NsS'Z' +p25 g8 sS'typ' -p25 -g20 -sS'model.blocktype' p26 +g21 +sS'model.blocktype' +p27 g5 sS'Roff' -p27 +p28 g8 sS'Ron' -p28 +p29 g8 sS'mo' -p29 -g2 -sS'x.graphics' p30 g2 sS'model.dep_ut' p31 -g20 -sS"model.equations.parameters[('2', 'double')]" +g21 +sS'exprs' p32 -g15 +g5 sS'gr_i' p33 -g20 +g21 sS'y' p34 -g20 +g21 sS'x' p35 g8 diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index d693c9e1..bbe4a54e 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -44,7 +44,7 @@ function VVsourceAC() { break; } this.model.rpar = [this.FR]; - this.model.equations.parameters[('2', 'double')] = list(this.FR); + this.model.equations.parameters[2] = list(new ScilabDouble(this.FR)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index 6894b5be..37940c47 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -39,9 +39,9 @@ sS'model.in1' p12 S'matrix' p13 -sS'exprs' +sS'x.graphics' p14 -g11 +g6 sS'mo.inputs' p15 g11 @@ -58,35 +58,35 @@ g2 sS'model.equations' p20 g2 -sS'mo.outputs' +sS'model.equations.parameters[2]' p21 +g18 +sS'mo.outputs' +p22 g4 sS'x.graphics.out_implicit' -p22 +p23 g11 sS'model.rpar' -p23 +p24 g11 sS'graphics.exprs' -p24 -NsS'typ' p25 +NsS'typ' +p26 g11 sS'model.blocktype' -p26 +p27 g4 sS'mo' -p27 -g2 -sS'x.graphics' p28 -g6 +g2 sS'model.dep_ut' p29 g11 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p30 -g18 +g11 sS'gr_i' p31 g11 diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index c1cf8acc..cda321e2 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -46,7 +46,7 @@ function VsourceAC() { break; } this.model.rpar = [[this.VA],[this.FR]]; - this.model.equations.parameters[('2', 'double')] = list(this.VA,this.FR); + this.model.equations.parameters[2] = list(new ScilabDouble(this.VA),new ScilabDouble(this.FR)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index 7941df3c..20868c5c 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -40,26 +40,28 @@ p11 sS'model.in1' p12 g11 -sS'exprs' +sS'x.graphics' p13 -S'matrix' -p14 +g6 sS'mo.inputs' -p15 +p14 g4 sS'x.graphics.in_implicit' -p16 +p15 g11 sS'mo.parameters' -p17 +p16 S'list' -p18 +p17 sS'VA' -p19 +p18 g2 sS'model.equations' -p20 +p19 g2 +sS'model.equations.parameters[2]' +p20 +g17 sS'mo.outputs' p21 g4 @@ -68,27 +70,25 @@ p22 g11 sS'model.rpar' p23 -g14 -sS'graphics.exprs' +S'matrix' p24 -NsS'typ' +sS'graphics.exprs' p25 +NsS'typ' +p26 g11 sS'model.blocktype' -p26 +p27 g4 sS'mo' -p27 -g2 -sS'x.graphics' p28 -g6 +g2 sS'model.dep_ut' p29 g11 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p30 -g18 +g24 sS'gr_i' p31 g11 |