add return value from scicos_getvalue to global vars

12 files changed, 123 insertions, 71 deletions

diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index 08fa3a32..8f7e596a 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -6,16 +6,16 @@ function Bache() {
         model = scicos_model();
         model.in1 = [-transpose([1:in1])];
         model.out = [-transpose([1:out])];
-        Patm = 1.013e5;
-        A = 1;
-        ze1 = 40;
-        ze2 = 0;
-        zs1 = 40;
-        zs2 = 0;
-        z0 = 30;
-        T0 = 290;
-        p_rho = 0;
-        model.rpar = [[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]];
+        this.Patm = 1.013e5;
+        this.A = 1;
+        this.ze1 = 40;
+        this.ze2 = 0;
+        this.zs1 = 40;
+        this.zs2 = 0;
+        this.z0 = 30;
+        this.T0 = 290;
+        this.p_rho = 0;
+        model.rpar = [[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]];
         model.sim = "Bache";
         model.blocktype = "c";
         model.dep_ut = [true,false];
@@ -23,11 +23,11 @@ function Bache() {
         mo.model = "Bache";
         mo.inputs = ["Ce1","Ce2"];
         mo.outputs = ["Cs1","Cs2","yNiveau"];
-        mo.parameters = list([["Patm"],["A"],["ze1"],["ze2"],["zs1"],["zs2"],["z0"],["T0"],["p_rho"]],[[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]]);
+        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]]);
         model.equations = mo;
         model.in1 = ones(size(mo.inputs,"*"),1);
         model.out = ones(size(mo.outputs,"*"),1);
-        exprs = [[string(Patm)],[string(A)],[string(ze1)],[string(ze2)],[string(zs1)],[string(zs2)],[string(z0)],[string(T0)],[string(p_rho)]];
+        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)]];
         gr_i = [];
         this.x = standard_define([2,2],model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = [["I"],["I"]];
@@ -45,12 +45,12 @@ function Bache() {
         exprs = graphics.exprs;
         model = arg1.model;
         while (true) {
-            [ok,Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho,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),exprs);
+            [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,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),exprs);
             if (!ok) {
                 break;
             }
-            model.rpar = [[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]];
-            model.equations.parameters[2-1] = list(Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho);
+            model.rpar = [[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]];
+            model.equations.parameters[2-1] = list(this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho);
             graphics.exprs = exprs;
             this.x.graphics = graphics;
             this.x.model = model;
diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle
index 0d1dde24..b16a6531 100644
--- a/js/Hydraulics/Bache.pickle
+++ b/js/Hydraulics/Bache.pickle
@@ -2,8 +2,26 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'A'
 p2
-atp3
-Rp4
+aS'zs1'
+p3
+aS'zs2'
+p4
+aS'z0'
+p5
+aS'T0'
+p6
+aS'ze2'
+p7
+aS'ze1'
+p8
+aS'p_rho'
+p9
+aS'x'
+p10
+aS'Patm'
+p11
+atp12
+Rp13
 .
\ No newline at end of file
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index dbe576ae..ec1f7bd2 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -62,11 +62,11 @@ function Flowmeter() {
         this.x = arg1;
         exprs = this.x.graphics.exprs;
         while (false) {
-            [ok,Qini,exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),exprs);
+            [ok,this.Qini,exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),exprs);
             if (!ok) {
                 break;
             }
-            this.x.model.equations.parameters[2-1] = list(Qini);
+            this.x.model.equations.parameters[2-1] = list(this.Qini);
             this.x.graphics.exprs = exprs;
             break;
         }
diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle
index 0d1dde24..cecb7abc 100644
--- a/js/Hydraulics/Flowmeter.pickle
+++ b/js/Hydraulics/Flowmeter.pickle
@@ -4,6 +4,8 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'Qini'
+p3
+atp4
+Rp5
 .
\ No newline at end of file
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 63244eac..c7238aaf 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -4,13 +4,13 @@ function PerteDP() {
         model = scicos_model();
         model.in1 = [1];
         model.out = [1];
-        L = 10;
-        D = 0.2;
-        lambda = 0.03;
-        z1 = 0;
-        z2 = 0;
-        p_rho = 0;
-        model.rpar = [[L],[D],[lambda],[z1],[z2],[p_rho]];
+        this.L = 10;
+        this.D = 0.2;
+        this.lambda = 0.03;
+        this.z1 = 0;
+        this.z2 = 0;
+        this.p_rho = 0;
+        model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]];
         model.sim = "PerteDP";
         model.blocktype = "c";
         model.dep_ut = [true,false];
@@ -18,11 +18,11 @@ function PerteDP() {
         mo.model = "PerteDP";
         mo.inputs = "C1";
         mo.outputs = "C2";
-        mo.parameters = list([["L"],["D"],["lambda"],["z1"],["z2"],["p_rho"]],[[L],[D],[lambda],[z1],[z2],[p_rho]]);
+        mo.parameters = list([["L"],["D"],["lambda"],["z1"],["z2"],["p_rho"]],[[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]]);
         model.equations = mo;
         model.in1 = ones(size(mo.inputs,"*"),1);
         model.out = ones(size(mo.outputs,"*"),1);
-        exprs = [[string(L)],[string(D)],[string(lambda)],[string(z1)],[string(z2)],[string(p_rho)]];
+        exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]];
         gr_i = [];
         this.x = standard_define([2,1],model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
@@ -40,12 +40,12 @@ function PerteDP() {
         exprs = graphics.exprs;
         model = arg1.model;
         while (true) {
-            [ok,L,D,lambda,z1,z2,p_rho,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),exprs);
+            [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,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),exprs);
             if (!ok) {
                 break;
             }
-            model.rpar = [[L],[D],[lambda],[z1],[z2],[p_rho]];
-            model.equations.parameters[2-1] = list(L,D,lambda,z1,z2,p_rho);
+            model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]];
+            model.equations.parameters[2-1] = list(this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho);
             graphics.exprs = exprs;
             this.x.graphics = graphics;
             this.x.model = model;
diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle
index 0d1dde24..ed68bd4b 100644
--- a/js/Hydraulics/PerteDP.pickle
+++ b/js/Hydraulics/PerteDP.pickle
@@ -2,8 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'D'
 p2
-atp3
-Rp4
+aS'L'
+p3
+aS'p_rho'
+p4
+aS'x'
+p5
+aS'z1'
+p6
+aS'z2'
+p7
+aS'lambda'
+p8
+atp9
+Rp10
 .
\ No newline at end of file
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index 5d71f566..ef66a542 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -2,21 +2,21 @@
 function PuitsP() {
     PuitsP.prototype.define = function PuitsP() {
         model = scicos_model();
-        P0 = 100000;
-        T0 = 290;
-        H0 = 100000;
-        option_temperature = 1;
-        model.rpar = [[P0],[T0],[H0],[option_temperature]];
+        this.P0 = 100000;
+        this.T0 = 290;
+        this.H0 = 100000;
+        this.option_temperature = 1;
+        model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
         model.sim = "Puits";
         model.blocktype = "c";
         model.dep_ut = [true,false];
         mo = modelica();
         mo.model = "Puits";
         mo.inputs = ["C"];
-        mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[P0],[T0],[H0],[option_temperature]]);
+        mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]);
         model.equations = mo;
         model.in1 = ones(size(mo.inputs,"*"),1);
-        exprs = [[string(P0)],[string(T0)],[string(H0)],[string(option_temperature)]];
+        exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
         gr_i = [];
         this.x = standard_define([2.5,2],model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = ["I"];
@@ -33,12 +33,12 @@ function PuitsP() {
         exprs = graphics.exprs;
         model = arg1.model;
         while (true) {
-            [ok,P0,T0,H0,option_temperature,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),exprs);
+            [ok,this.P0,this.T0,this.H0,this.option_temperature,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),exprs);
             if (!ok) {
                 break;
             }
-            model.rpar = [[P0],[T0],[H0],[option_temperature]];
-            model.equations.parameters[2-1] = list(P0,T0,H0,option_temperature);
+            model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
+            model.equations.parameters[2-1] = list(this.P0,this.T0,this.H0,this.option_temperature);
             graphics.exprs = exprs;
             this.x.graphics = graphics;
             this.x.model = model;
diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle
index 0d1dde24..89f3ca0c 100644
--- a/js/Hydraulics/PuitsP.pickle
+++ b/js/Hydraulics/PuitsP.pickle
@@ -4,6 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'P0'
+p3
+aS'option_temperature'
+p4
+aS'H0'
+p5
+aS'T0'
+p6
+atp7
+Rp8
 .
\ No newline at end of file
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index 29e06507..31c0e886 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -2,11 +2,11 @@
 function SourceP() {
     SourceP.prototype.define = function SourceP() {
         model = scicos_model();
-        P0 = 300000;
-        T0 = 290;
-        H0 = 100000;
-        option_temperature = 1;
-        model.rpar = [[P0],[T0],[H0],[option_temperature]];
+        this.P0 = 300000;
+        this.T0 = 290;
+        this.H0 = 100000;
+        this.option_temperature = 1;
+        model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
         model.sim = "Source";
         model.blocktype = "c";
         model.dep_ut = [true,false];
@@ -14,11 +14,11 @@ function SourceP() {
         mo.model = "Source";
         mo.inputs = [];
         mo.outputs = ["C"];
-        mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[P0],[T0],[H0],[option_temperature]]);
+        mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]);
         model.equations = mo;
         model.in1 = ones(size(mo.inputs,"*"),1);
         model.out = ones(size(mo.outputs,"*"),1);
-        exprs = [[string(P0)],[string(T0)],[string(H0)],[string(option_temperature)]];
+        exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]];
         gr_i = [];
         this.x = standard_define([2.5,2],model,exprs,list(gr_i,0));
         this.x.graphics.out_implicit = ["I"];
@@ -35,12 +35,12 @@ function SourceP() {
         exprs = graphics.exprs;
         model = arg1.model;
         while (true) {
-            [ok,P0,T0,H0,option_temperature,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),exprs);
+            [ok,this.P0,this.T0,this.H0,this.option_temperature,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),exprs);
             if (!ok) {
                 break;
             }
-            model.rpar = [[P0],[T0],[H0],[option_temperature]];
-            model.equations.parameters[2-1] = list(P0,T0,H0,option_temperature);
+            model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]];
+            model.equations.parameters[2-1] = list(this.P0,this.T0,this.H0,this.option_temperature);
             graphics.exprs = exprs;
             this.x.graphics = graphics;
             this.x.model = model;
diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle
index 0d1dde24..89f3ca0c 100644
--- a/js/Hydraulics/SourceP.pickle
+++ b/js/Hydraulics/SourceP.pickle
@@ -4,6 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'P0'
+p3
+aS'option_temperature'
+p4
+aS'H0'
+p5
+aS'T0'
+p6
+atp7
+Rp8
 .
\ No newline at end of file
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index 6a2b11d3..cef2b23d 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -4,9 +4,9 @@ function VanneReglante() {
         model = scicos_model();
         model.in1 = [[1],[1]];
         model.out = [1];
-        Cvmax = 8005.42;
-        p_rho = 0;
-        model.rpar = [[Cvmax],[p_rho]];
+        this.Cvmax = 8005.42;
+        this.p_rho = 0;
+        model.rpar = [[this.Cvmax],[this.p_rho]];
         model.sim = "VanneReglante";
         model.blocktype = "c";
         model.dep_ut = [true,false];
@@ -14,11 +14,11 @@ function VanneReglante() {
         mo.model = "VanneReglante";
         mo.inputs = ["C1","Ouv"];
         mo.outputs = "C2";
-        mo.parameters = list([["Cvmax"],["p_rho"]],[[Cvmax],[p_rho]]);
+        mo.parameters = list([["Cvmax"],["p_rho"]],[[this.Cvmax],[this.p_rho]]);
         model.equations = mo;
         model.in1 = ones(size(mo.inputs,"*"),1);
         model.out = ones(size(mo.outputs,"*"),1);
-        exprs = [[string(Cvmax)],[string(p_rho)]];
+        exprs = [[string(this.Cvmax)],[string(this.p_rho)]];
         gr_i = [];
         this.x = standard_define([2,2],model,exprs,list(gr_i,0));
         this.x.graphics.in_implicit = [["I"],["E"]];
@@ -36,12 +36,12 @@ function VanneReglante() {
         exprs = graphics.exprs;
         model = arg1.model;
         while (true) {
-            [ok,Cvmax,p_rho,exprs] = scicos_getvalue("Paramètres de la vanne reglante",[["Cvmax"],["p_rho"]],list("vec",-1,"vec",-1),exprs);
+            [ok,this.Cvmax,this.p_rho,exprs] = scicos_getvalue("Paramètres de la vanne reglante",[["Cvmax"],["p_rho"]],list("vec",-1,"vec",-1),exprs);
             if (!ok) {
                 break;
             }
-            model.rpar = [[Cvmax],[p_rho]];
-            model.equations.parameters[2-1] = list(Cvmax,p_rho);
+            model.rpar = [[this.Cvmax],[this.p_rho]];
+            model.equations.parameters[2-1] = list(this.Cvmax,this.p_rho);
             graphics.exprs = exprs;
             this.x.graphics = graphics;
             this.x.model = model;
diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle
index 0d1dde24..945c34b4 100644
--- a/js/Hydraulics/VanneReglante.pickle
+++ b/js/Hydraulics/VanneReglante.pickle
@@ -4,6 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'p_rho'
+p3
+aS'Cvmax'
+p4
+atp5
+Rp6
 .
\ No newline at end of file