From aabd535925f24c6203eb1a0dcc5b28d9670133de Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Wed, 11 Jul 2018 10:44:34 +0530 Subject: show type for matrix also --- js/Hydraulics/Bache.js | 4 ++-- js/Hydraulics/PerteDP.js | 4 ++-- js/Hydraulics/PuitsP.js | 4 ++-- js/Hydraulics/SourceP.js | 4 ++-- js/Hydraulics/VanneReglante.js | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'js/Hydraulics') diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 885a069a..114846c1 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -15,7 +15,7 @@ function Bache() { this.z0 = 30; this.T0 = 290; this.p_rho = 0; - this.model.rpar = [[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]; + 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]; @@ -70,7 +70,7 @@ function Bache() { if (!ok) { break; } - this.model.rpar = [[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]; + 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.equations.parameters[2] = list(new ScilabDouble([this.Patm]), new ScilabDouble([this.A]), new ScilabDouble([this.ze1]), new ScilabDouble([this.ze2]), new ScilabDouble([this.zs1]), new ScilabDouble([this.zs2]), new ScilabDouble([this.z0]), new ScilabDouble([this.T0]), new ScilabDouble([this.p_rho])); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 23766274..ddbaa5fe 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -10,7 +10,7 @@ function PerteDP() { this.z1 = 0; this.z2 = 0; this.p_rho = 0; - this.model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]]; + 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]; @@ -59,7 +59,7 @@ function PerteDP() { if (!ok) { break; } - this.model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]]; + this.model.rpar = new ScilabDouble([this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]); this.model.equations.parameters[2] = list(new ScilabDouble([this.L]), new ScilabDouble([this.D]), new ScilabDouble([this.lambda]), new ScilabDouble([this.z1]), new ScilabDouble([this.z2]), new ScilabDouble([this.p_rho])); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index dba184ae..7b5b3cdb 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -6,7 +6,7 @@ function PuitsP() { this.T0 = 290; this.H0 = 100000; this.option_temperature = 1; - this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]]; + 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]; @@ -48,7 +48,7 @@ function PuitsP() { if (!ok) { break; } - this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]]; + this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.equations.parameters[2] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 8aa2bc68..71adc5ad 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -6,7 +6,7 @@ function SourceP() { this.T0 = 290; this.H0 = 100000; this.option_temperature = 1; - this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]]; + 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]; @@ -50,7 +50,7 @@ function SourceP() { if (!ok) { break; } - this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]]; + this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.equations.parameters[2] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 94b6ca1f..96d37553 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -6,7 +6,7 @@ function VanneReglante() { this.model.out = [1]; this.Cvmax = 8005.42; this.p_rho = 0; - this.model.rpar = [[this.Cvmax],[this.p_rho]]; + 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]; @@ -47,7 +47,7 @@ function VanneReglante() { if (!ok) { break; } - this.model.rpar = [[this.Cvmax],[this.p_rho]]; + this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]); this.model.equations.parameters[2] = list(new ScilabDouble([this.Cvmax]), new ScilabDouble([this.p_rho])); graphics.exprs = exprs; this.x.graphics = graphics; -- cgit