6 files changed, 119 insertions, 119 deletions

diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index da1506e2..3114935f 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/Bache.sci" */
 function Bache() {
-Bache.prototype.get = function Bache() {
-}
-Bache.prototype.set = function Bache() {
-x=arg1;
-graphics=arg1.graphics;
-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);
-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);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 Bache.prototype.define = function Bache() {
 in1=2;
 out=3;
@@ -55,4 +35,24 @@ x.graphics.out_implicit=["I","I","E"];
 }
 Bache.prototype.details = function Bache() {
 }
+Bache.prototype.get = function Bache() {
+}
+Bache.prototype.set = function Bache() {
+x=arg1;
+graphics=arg1.graphics;
+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);
+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);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index 0af6226d..61f91774 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Hydraulics/Flowmeter.sci" */
 function Flowmeter() {
-Flowmeter.prototype.get = function Flowmeter() {
-}
-Flowmeter.prototype.set = function Flowmeter() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
-while (false) {
-[ok,Qini,exprs]=scicos_getvalue(["Set Flowmeter block parameters:","","Qini: "],"Qini",list("vec",1),exprs);
-if (!ok) {
-break
-}
-x.model.equations.parameters[2-1]=list(Qini);
-x.graphics.exprs=exprs;
-break
-}
-}
 Flowmeter.prototype.define = function Flowmeter() {
 ModelName="Flowmeter";
 PrametersValue=1;
@@ -69,4 +50,23 @@ x.graphics.out_implicit=Typeout;
 }
 Flowmeter.prototype.details = function Flowmeter() {
 }
+Flowmeter.prototype.get = function Flowmeter() {
+}
+Flowmeter.prototype.set = function Flowmeter() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+x=arg1;
+exprs=x.graphics.exprs;
+while (false) {
+[ok,Qini,exprs]=scicos_getvalue(["Set Flowmeter block parameters:","","Qini: "],"Qini",list("vec",1),exprs);
+if (!ok) {
+break
+}
+x.model.equations.parameters[2-1]=list(Qini);
+x.graphics.exprs=exprs;
+break
+}
+}
 }
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 9d1c12b5..fad593fe 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/PerteDP.sci" */
 function PerteDP() {
-PerteDP.prototype.get = function PerteDP() {
-}
-PerteDP.prototype.set = function PerteDP() {
-x=arg1;
-graphics=arg1.graphics;
-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);
-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);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 PerteDP.prototype.define = function PerteDP() {
 model=scicos_model();
 model.in1=[1];
@@ -50,4 +30,24 @@ x.graphics.out_implicit=["I"];
 }
 PerteDP.prototype.details = function PerteDP() {
 }
+PerteDP.prototype.get = function PerteDP() {
+}
+PerteDP.prototype.set = function PerteDP() {
+x=arg1;
+graphics=arg1.graphics;
+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);
+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);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index af19b6bd..f2739743 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/PuitsP.sci" */
 function PuitsP() {
-PuitsP.prototype.get = function PuitsP() {
-}
-PuitsP.prototype.set = function PuitsP() {
-x=arg1;
-graphics=arg1.graphics;
-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);
-if (!ok) {
-break
-}
-model.rpar=[P0,T0,H0,option_temperature];
-model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 PuitsP.prototype.define = function PuitsP() {
 model=scicos_model();
 P0=100000;
@@ -43,4 +23,24 @@ x.graphics.in_implicit=["I"];
 }
 PuitsP.prototype.details = function PuitsP() {
 }
+PuitsP.prototype.get = function PuitsP() {
+}
+PuitsP.prototype.set = function PuitsP() {
+x=arg1;
+graphics=arg1.graphics;
+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);
+if (!ok) {
+break
+}
+model.rpar=[P0,T0,H0,option_temperature];
+model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index 882d3183..34997c0a 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/SourceP.sci" */
 function SourceP() {
-SourceP.prototype.get = function SourceP() {
-}
-SourceP.prototype.set = function SourceP() {
-x=arg1;
-graphics=arg1.graphics;
-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);
-if (!ok) {
-break
-}
-model.rpar=[P0,T0,H0,option_temperature];
-model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 SourceP.prototype.define = function SourceP() {
 model=scicos_model();
 P0=300000;
@@ -45,4 +25,24 @@ x.graphics.out_implicit=["I"];
 }
 SourceP.prototype.details = function SourceP() {
 }
+SourceP.prototype.get = function SourceP() {
+}
+SourceP.prototype.set = function SourceP() {
+x=arg1;
+graphics=arg1.graphics;
+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);
+if (!ok) {
+break
+}
+model.rpar=[P0,T0,H0,option_temperature];
+model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index 4ce72db6..411ceca0 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/VanneReglante.sci" */
 function VanneReglante() {
-VanneReglante.prototype.get = function VanneReglante() {
-}
-VanneReglante.prototype.set = function VanneReglante() {
-x=arg1;
-graphics=arg1.graphics;
-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);
-if (!ok) {
-break
-}
-model.rpar=[Cvmax,p_rho];
-model.equations.parameters[2-1]=list(Cvmax,p_rho);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 VanneReglante.prototype.define = function VanneReglante() {
 model=scicos_model();
 model.in1=[1,1];
@@ -46,4 +26,24 @@ x.graphics.out_implicit=["I"];
 }
 VanneReglante.prototype.details = function VanneReglante() {
 }
+VanneReglante.prototype.get = function VanneReglante() {
+}
+VanneReglante.prototype.set = function VanneReglante() {
+x=arg1;
+graphics=arg1.graphics;
+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);
+if (!ok) {
+break
+}
+model.rpar=[Cvmax,p_rho];
+model.equations.parameters[2-1]=list(Cvmax,p_rho);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }