From 0047c3bea1d86b12a08544f6f0833c63e77f6eac Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Wed, 11 Jul 2018 15:19:38 +0530 Subject: support vector also --- js/Hydraulics/Bache.js | 6 +++--- js/Hydraulics/Flowmeter.js | 2 +- js/Hydraulics/PerteDP.js | 6 +++--- js/Hydraulics/PuitsP.js | 2 +- js/Hydraulics/SourceP.js | 2 +- js/Hydraulics/VanneReglante.js | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'js/Hydraulics') diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 82ed4cb1..68683e2e 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -4,8 +4,8 @@ function Bache() { var in1 = 2; var out = 3; this.model = scicos_model(); - this.model.in1 = [-transpose([1:in1])]; - this.model.out = [-transpose([1:out])]; + this.model.in1 = new ScilabDouble([-transpose([1:in1])]); + this.model.out = new ScilabDouble([-transpose([1:out])]); this.Patm = 1.013e5; this.A = 1; this.ze1 = 40; @@ -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 = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Bache"; mo.inputs = ["Ce1","Ce2"]; diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 540ed624..e5efb188 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -39,7 +39,7 @@ function Flowmeter() { var exprs = "1"; var gr_i = []; this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + 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)]); diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index f83950f2..4a57604e 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -2,8 +2,8 @@ function PerteDP() { PerteDP.prototype.define = function PerteDP() { this.model = scicos_model(); - this.model.in1 = [1]; - this.model.out = [1]; + this.model.in1 = new ScilabDouble([1]); + this.model.out = new ScilabDouble([1]); this.L = 10; this.D = 0.2; this.lambda = 0.03; @@ -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 = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "PerteDP"; mo.inputs = "C1"; diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 873fb972..ab5be777 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 = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Puits"; mo.inputs = ["C"]; diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 955403fb..b622899e 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 = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Source"; mo.inputs = []; diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 7ae90b14..1810e7f5 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -3,13 +3,13 @@ function VanneReglante() { VanneReglante.prototype.define = function VanneReglante() { this.model = scicos_model(); this.model.in1 = new ScilabDouble([1],[1]); - this.model.out = [1]; + this.model.out = new ScilabDouble([1]); this.Cvmax = 8005.42; this.p_rho = 0; 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 = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "VanneReglante"; mo.inputs = ["C1","Ouv"]; -- cgit