change in1 to in

12 files changed, 168 insertions, 187 deletions

diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index 210d7d51..0a38027e 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -4,7 +4,7 @@ function Bache() {
         var in1 = 2;
         var out = 3;
         this.model = scicos_model();
-        this.model.in1 = new ScilabDouble([-transpose([1:in1])]);
+        this.model.in = new ScilabDouble([-transpose([1:in1])]);
         this.model.out = new ScilabDouble([-transpose([1:out])]);
         this.Patm = 1.013e5;
         this.A = 1;
@@ -25,7 +25,7 @@ function Bache() {
         mo.outputs = ["Cs1","Cs2","yNiveau"];
         mo.parameters = list([["Patm"],["A"],["ze1"],["ze2"],["zs1"],["zs2"],["z0"],["T0"],["p_rho"]],[[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]);
         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.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]);
@@ -62,10 +62,7 @@ function Bache() {
         this.T0 = parseFloat(arguments[0]["T0"])
         this.p_rho = parseFloat(arguments[0]["p_rho"])
         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.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,this.exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],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/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle
index e1dd2964..d6882307 100644
--- a/js/Hydraulics/Bache.pickle
+++ b/js/Hydraulics/Bache.pickle
@@ -53,71 +53,71 @@ p8
 sS'out'
 p9
 g8
-sS'model.in1'
-p10
-g8
 sS'zs1'
-p11
+p10
 g8
 sS'zs2'
-p12
+p11
 g8
 sS'x.graphics'
-p13
+p12
 g2
 sS'z0'
-p14
+p13
 g8
 sS'mo.inputs'
-p15
+p14
 S'vector'
-p16
+p15
 sS'x.graphics.in_implicit'
-p17
+p16
 S'matrix'
-p18
+p17
 sS'mo.parameters'
-p19
+p18
 S'list'
-p20
+p19
 sS'Patm'
-p21
+p20
 g8
 sS'A'
-p22
+p21
 g8
 sS'model.sim'
-p23
+p22
 g5
 sS'model.equations'
-p24
+p23
 g8
 sS'mo.outputs'
-p25
-g16
+p24
+g15
 sS'x.graphics.out_implicit'
-p26
-g18
+p25
+g17
 sS'in1'
-p27
+p26
 g8
 sS'model.rpar'
-p28
-g18
+p27
+g17
 sS'ze2'
-p29
+p28
 g8
 sS'ze1'
-p30
+p29
 g8
 sS'T0'
+p30
+g8
+sS'model.in'
 p31
 g8
 sS'graphics.exprs'
 p32
 NsS'typ'
 p33
-g16
+g15
 sS'model.blocktype'
 p34
 g5
@@ -126,22 +126,22 @@ p35
 g2
 sS'model.dep_ut'
 p36
-g16
+g15
 sS'model.equations.parameters[2-1]'
 p37
-g20
+g19
 sS'exprs'
 p38
-g18
+g17
 sS'gr_i'
 p39
-g16
+g15
 sS'p_rho'
 p40
 g8
 sS'y'
 p41
-g16
+g15
 sS'x'
 p42
 g8
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index 6221b688..7e220e74 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -42,7 +42,7 @@ function Flowmeter() {
         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;
@@ -60,11 +60,7 @@ function Flowmeter() {
     Flowmeter.prototype.set = function Flowmeter() {
         this.Qini = arguments[0]["Qini"]
         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 (false) {
             [ok,this.Qini,this.exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),this.exprs);
diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle
index 6ce9c452..253671ff 100644
--- a/js/Hydraulics/Flowmeter.pickle
+++ b/js/Hydraulics/Flowmeter.pickle
@@ -39,56 +39,56 @@ g8
 sS'model.out'
 p10
 g8
-sS'model.in1'
-p11
-g8
 sS'x.graphics'
-p12
+p11
 g4
 sS'mo.inputs'
-p13
+p12
 S'matrix'
-p14
+p13
 sS'Typeout'
-p15
-g14
+p14
+g13
 sS'x.graphics.in_implicit'
-p16
-g14
+p15
+g13
 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
-g14
+p21
+g13
 sS'Typein'
-p23
-g14
+p22
+g13
 sS'x.graphics.out_implicit'
-p24
-g14
+p23
+g13
 sS'model.rpar'
-p25
+p24
 g8
 sS'P'
+p25
+g13
+sS'model.in'
 p26
-g14
+g8
 sS'graphics'
 p27
 g4
 sS'typ'
 p28
-g21
+g20
 sS'model.blocktype'
 p29
 g6
@@ -97,13 +97,13 @@ p30
 g8
 sS'gr_i'
 p31
-g21
+g20
 sS'MI'
 p32
-g14
+g13
 sS'model.dep_ut'
 p33
-g21
+g20
 sS'exprs'
 p34
 g6
@@ -111,7 +111,7 @@ sS'x.graphics.exprs'
 p35
 NsS'PortName'
 p36
-g14
+g13
 sS'x'
 p37
 g8
@@ -123,5 +123,5 @@ p39
 g6
 sS'MO'
 p40
-g14
+g13
 s.
\ No newline at end of file
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 728d0f24..15d9712d 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -2,7 +2,7 @@
 function PerteDP() {
     PerteDP.prototype.define = function PerteDP() {
         this.model = scicos_model();
-        this.model.in1 = new ScilabDouble([1]);
+        this.model.in = new ScilabDouble([1]);
         this.model.out = new ScilabDouble([1]);
         this.L = 10;
         this.D = 0.2;
@@ -20,7 +20,7 @@ function PerteDP() {
         mo.outputs = "C2";
         mo.parameters = list([["L"],["D"],["lambda"],["z1"],["z2"],["p_rho"]],[[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]]);
         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.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]);
@@ -51,10 +51,7 @@ function PerteDP() {
         this.z2 = parseFloat(arguments[0]["z2"])
         this.p_rho = parseFloat(arguments[0]["p_rho"])
         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.D,this.lambda,this.z1,this.z2,this.p_rho,this.exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
             if (!ok) {
diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle
index 1470e585..4040064e 100644
--- a/js/Hydraulics/PerteDP.pickle
+++ b/js/Hydraulics/PerteDP.pickle
@@ -44,50 +44,50 @@ 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'D'
-p18
+p17
 g8
 sS'mo.outputs'
-p19
+p18
 g5
 sS'x.graphics.out_implicit'
-p20
-g13
+p19
+g12
 sS'L'
-p21
+p20
 g8
 sS'model.rpar'
-p22
+p21
 S'matrix'
+p22
+sS'model.in'
 p23
+g8
 sS'graphics.exprs'
 p24
 NsS'typ'
 p25
-g13
+g12
 sS'z1'
 p26
 g8
@@ -102,22 +102,22 @@ p29
 g2
 sS'model.dep_ut'
 p30
-g13
+g12
 sS'model.equations.parameters[2-1]'
 p31
-g15
+g14
 sS'exprs'
 p32
-g23
+g22
 sS'gr_i'
 p33
-g13
+g12
 sS'p_rho'
 p34
 g8
 sS'y'
 p35
-g13
+g12
 sS'x'
 p36
 g8
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index c709e833..806f8670 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -15,7 +15,7 @@ function PuitsP() {
         mo.inputs = ["C"];
         mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]);
         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.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]);
         this.x = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0));
@@ -40,10 +40,7 @@ function PuitsP() {
         this.H0 = parseFloat(arguments[0]["H0"])
         this.option_temperature = parseFloat(arguments[0]["option_temperature"])
         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.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
             if (!ok) {
diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle
index 24458909..44da3894 100644
--- a/js/Hydraulics/PuitsP.pickle
+++ b/js/Hydraulics/PuitsP.pickle
@@ -36,48 +36,48 @@ S'string'
 p5
 sS'x.model'
 p6
-NsS'model.in1'
+NsS'x.graphics'
 p7
-S'double'
-p8
-sS'x.graphics'
-p9
 g2
 sS'mo.inputs'
-p10
+p8
 S'vector'
-p11
+p9
 sS'x.graphics.in_implicit'
-p12
-g11
+p10
+g9
 sS'option_temperature'
-p13
-g8
+p11
+S'double'
+p12
 sS'mo.parameters'
-p14
+p13
 S'list'
-p15
+p14
 sS'model.sim'
-p16
+p15
 g5
 sS'P0'
-p17
-g8
+p16
+g12
 sS'model.equations'
-p18
-g8
+p17
+g12
 sS'model.rpar'
-p19
+p18
 S'matrix'
-p20
+p19
 sS'T0'
+p20
+g12
+sS'model.in'
 p21
-g8
+g12
 sS'graphics.exprs'
 p22
 NsS'typ'
 p23
-g11
+g9
 sS'model.blocktype'
 p24
 g5
@@ -86,26 +86,26 @@ p25
 g2
 sS'model.dep_ut'
 p26
-g11
+g9
 sS'model.equations.parameters[2-1]'
 p27
-g15
+g14
 sS'exprs'
 p28
-g20
+g19
 sS'gr_i'
 p29
-g11
+g9
 sS'y'
 p30
-g11
+g9
 sS'x'
 p31
-g8
+g12
 sS'model'
 p32
 g2
 sS'H0'
 p33
-g8
+g12
 s.
\ No newline at end of file
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index e207fede..2e87d24f 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -16,7 +16,7 @@ function SourceP() {
         mo.outputs = ["C"];
         mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]);
         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.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]);
@@ -42,10 +42,7 @@ function SourceP() {
         this.H0 = parseFloat(arguments[0]["H0"])
         this.option_temperature = parseFloat(arguments[0]["option_temperature"])
         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.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
             if (!ok) {
diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle
index 553aeaec..ec2ddf49 100644
--- a/js/Hydraulics/SourceP.pickle
+++ b/js/Hydraulics/SourceP.pickle
@@ -40,50 +40,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'vector'
-p12
+p11
 sS'option_temperature'
-p13
+p12
 g8
 sS'mo.parameters'
-p14
+p13
 S'list'
-p15
+p14
 sS'model.sim'
-p16
+p15
 g5
 sS'P0'
-p17
+p16
 g8
 sS'model.equations'
-p18
+p17
 g8
 sS'mo.outputs'
-p19
-g12
+p18
+g11
 sS'x.graphics.out_implicit'
-p20
-g12
+p19
+g11
 sS'model.rpar'
-p21
+p20
 S'matrix'
-p22
+p21
 sS'T0'
+p22
+g8
+sS'model.in'
 p23
 g8
 sS'graphics.exprs'
 p24
 NsS'typ'
 p25
-g12
+g11
 sS'model.blocktype'
 p26
 g5
@@ -92,19 +92,19 @@ p27
 g2
 sS'model.dep_ut'
 p28
-g12
+g11
 sS'model.equations.parameters[2-1]'
 p29
-g15
+g14
 sS'exprs'
 p30
-g22
+g21
 sS'gr_i'
 p31
-g12
+g11
 sS'y'
 p32
-g12
+g11
 sS'x'
 p33
 g8
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index d3f2711f..044b38bc 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -2,7 +2,7 @@
 function VanneReglante() {
     VanneReglante.prototype.define = function VanneReglante() {
         this.model = scicos_model();
-        this.model.in1 = new ScilabDouble([1],[1]);
+        this.model.in = new ScilabDouble([1],[1]);
         this.model.out = new ScilabDouble([1]);
         this.Cvmax = 8005.42;
         this.p_rho = 0;
@@ -16,7 +16,7 @@ function VanneReglante() {
         mo.outputs = "C2";
         mo.parameters = list([["Cvmax"],["p_rho"]],[[this.Cvmax],[this.p_rho]]);
         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.Cvmax)],[string(this.p_rho)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]);
@@ -39,10 +39,7 @@ function VanneReglante() {
         this.Cvmax = parseFloat(arguments[0]["Cvmax"])
         this.p_rho = parseFloat(arguments[0]["p_rho"])
         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.Cvmax,this.p_rho,this.exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),this.exprs);
             if (!ok) {
diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle
index 11c5fb2b..d1fa2534 100644
--- a/js/Hydraulics/VanneReglante.pickle
+++ b/js/Hydraulics/VanneReglante.pickle
@@ -39,44 +39,44 @@ p8
 NsS'model.out'
 p9
 g7
-sS'model.in1'
-p10
-g7
 sS'x.graphics'
-p11
+p10
 g2
 sS'mo.inputs'
-p12
+p11
 S'vector'
-p13
+p12
 sS'x.graphics.in_implicit'
-p14
+p13
 S'matrix'
-p15
+p14
 sS'mo.parameters'
-p16
+p15
 S'list'
-p17
+p16
 sS'model.sim'
-p18
+p17
 g5
 sS'model.equations'
-p19
+p18
 g7
 sS'mo.outputs'
-p20
+p19
 g5
 sS'x.graphics.out_implicit'
-p21
-g13
+p20
+g12
 sS'model.rpar'
+p21
+g14
+sS'model.in'
 p22
-g15
+g7
 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
-g17
+g16
 sS'exprs'
 p29
-g15
+g14
 sS'gr_i'
 p30
-g13
+g12
 sS'p_rho'
 p31
 g7
 sS'y'
 p32
-g13
+g12
 sS'x'
 p33
 g7