summaryrefslogtreecommitdiff
path: root/js/Hydraulics
diff options
context:
space:
mode:
authorSunil Shetye2018-06-25 12:08:56 +0530
committerSunil Shetye2018-06-25 12:45:27 +0530
commit7c70459c10aed0d74ee03896abaf47fefdbf7c8f (patch)
tree6f6acc6a5087295c6e59f0f94bfda5025049d5fa /js/Hydraulics
parent870479a2e4b932426a904b2ebae7e4ee72037326 (diff)
downloadsci2js-7c70459c10aed0d74ee03896abaf47fefdbf7c8f.tar.gz
sci2js-7c70459c10aed0d74ee03896abaf47fefdbf7c8f.tar.bz2
sci2js-7c70459c10aed0d74ee03896abaf47fefdbf7c8f.zip
separate out code for getvalue
Diffstat (limited to 'js/Hydraulics')
-rw-r--r--js/Hydraulics/Bache.js86
-rw-r--r--js/Hydraulics/Flowmeter.js102
-rw-r--r--js/Hydraulics/PerteDP.js76
-rw-r--r--js/Hydraulics/PuitsP.js62
-rw-r--r--js/Hydraulics/SourceP.js66
-rw-r--r--js/Hydraulics/VanneReglante.js68
6 files changed, 230 insertions, 230 deletions
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index 46b88005..e8e30f10 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -1,57 +1,57 @@
/* autogenerated from "macros/Hydraulics/Bache.sci" */
function Bache() {
Bache.prototype.define = function Bache() {
-in1=2;
-out=3;
-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]];
-model.sim="Bache";
-model.blocktype="c";
-model.dep_ut=[true,false];
-mo=modelica();
-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]]);
-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)]];
-gr_i=[];
-x=standard_define([2,2],model,exprs,list(gr_i,0));
-x.graphics.in_implicit=[["I"],["I"]];
-x.graphics.out_implicit=[["I"],["I"],["E"]];
+ in1 = 2;
+ out = 3;
+ 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]];
+ model.sim = "Bache";
+ model.blocktype = "c";
+ model.dep_ut = [true,false];
+ mo = modelica();
+ 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]]);
+ 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)]];
+ gr_i = [];
+ x = standard_define([2,2],model,exprs,list(gr_i,0));
+ x.graphics.in_implicit = [["I"],["I"]];
+ 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) {
+ 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;
+ 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 7e8ce171..6856b2fb 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -1,71 +1,71 @@
/* autogenerated from "macros/Hydraulics/Flowmeter.sci" */
function Flowmeter() {
Flowmeter.prototype.define = function Flowmeter() {
-ModelName="Flowmeter";
-PrametersValue=1;
-ParametersName="Qini";
-model=scicos_model();
-Typein=[];
-Typeout=[];
-MI=[];
-MO=[];
-P=[[50,105,-1,90],[0,10,2,0],[101,10,-2,0]];
-PortName=[["Mesure"],["C1"],["C2"]];
+ ModelName = "Flowmeter";
+ PrametersValue = 1;
+ ParametersName = "Qini";
+ model = scicos_model();
+ Typein = [];
+ Typeout = [];
+ MI = [];
+ MO = [];
+ P = [[50,105,-1,90],[0,10,2,0],[101,10,-2,0]];
+ PortName = [["Mesure"],["C1"],["C2"]];
for (i=1;i<=size(P,"r");i+=1) {
-if (P[i-1][3-1]==1) {
-Typein=[[Typein],["E"]];
-MI=[[MI],[PortName[i-1]]];
+ if (P[i-1][3-1]==1) {
+ Typein = [[Typein],["E"]];
+ MI = [[MI],[PortName[i-1]]];
}
-if (P[i-1][3-1]==2) {
-Typein=[[Typein],["I"]];
-MI=[[MI],[PortName[i-1]]];
+ if (P[i-1][3-1]==2) {
+ Typein = [[Typein],["I"]];
+ MI = [[MI],[PortName[i-1]]];
}
-if (P[i-1][3-1]==-1) {
-Typeout=[[Typeout],["E"]];
-MO=[[MO],[PortName[i-1]]];
+ if (P[i-1][3-1]==-1) {
+ Typeout = [[Typeout],["E"]];
+ MO = [[MO],[PortName[i-1]]];
}
-if (P[i-1][3-1]==-2) {
-Typeout=[[Typeout],["I"]];
-MO=[[MO],[PortName[i-1]]];
+ if (P[i-1][3-1]==-2) {
+ Typeout = [[Typeout],["I"]];
+ MO = [[MO],[PortName[i-1]]];
}
}
-model=scicos_model();
-mo=modelica();
-model.sim=ModelName;
-mo.inputs=MI;
-mo.outputs=MO;
-model.rpar=PrametersValue;
-mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName));
-exprs="1";
-gr_i=[];
-model.blocktype="c";
-model.dep_ut=[false,true];
-mo.model=ModelName;
-model.equations=mo;
-model.in1=ones(size(MI,"*"),1);
-model.out=ones(size(MO,"*"),1);
-x=standard_define([2,2],model,exprs,list(gr_i,0));
-x.graphics.in_implicit=Typein;
-x.graphics.out_implicit=Typeout;
+ model = scicos_model();
+ mo = modelica();
+ model.sim = ModelName;
+ mo.inputs = MI;
+ mo.outputs = MO;
+ model.rpar = PrametersValue;
+ mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
+ exprs = "1";
+ gr_i = [];
+ model.blocktype = "c";
+ model.dep_ut = [false,true];
+ mo.model = ModelName;
+ model.equations = mo;
+ model.in1 = ones(size(MI,"*"),1);
+ model.out = ones(size(MO,"*"),1);
+ x = standard_define([2,2],model,exprs,list(gr_i,0));
+ x.graphics.in_implicit = Typein;
+ 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) {
+ 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;
+ 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 e1386713..b60df57f 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -1,52 +1,52 @@
/* autogenerated from "macros/Hydraulics/PerteDP.sci" */
function PerteDP() {
PerteDP.prototype.define = 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]];
-model.sim="PerteDP";
-model.blocktype="c";
-model.dep_ut=[true,false];
-mo=modelica();
-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]]);
-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)]];
-gr_i=[];
-x=standard_define([2,1],model,exprs,list(gr_i,0));
-x.graphics.in_implicit=["I"];
-x.graphics.out_implicit=["I"];
+ 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]];
+ model.sim = "PerteDP";
+ model.blocktype = "c";
+ model.dep_ut = [true,false];
+ mo = modelica();
+ 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]]);
+ 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)]];
+ gr_i = [];
+ x = standard_define([2,1],model,exprs,list(gr_i,0));
+ x.graphics.in_implicit = ["I"];
+ 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) {
+ 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;
+ 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 532d7209..44b24efa 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -1,45 +1,45 @@
/* autogenerated from "macros/Hydraulics/PuitsP.sci" */
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]];
-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]]);
-model.equations=mo;
-model.in1=ones(size(mo.inputs,"*"),1);
-exprs=[[string(P0)],[string(T0)],[string(H0)],[string(option_temperature)]];
-gr_i=[];
-x=standard_define([2.5,2],model,exprs,list(gr_i,0));
-x.graphics.in_implicit=["I"];
+ model = scicos_model();
+ P0 = 100000;
+ T0 = 290;
+ H0 = 100000;
+ option_temperature = 1;
+ model.rpar = [[P0],[T0],[H0],[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]]);
+ model.equations = mo;
+ model.in1 = ones(size(mo.inputs,"*"),1);
+ exprs = [[string(P0)],[string(T0)],[string(H0)],[string(option_temperature)]];
+ gr_i = [];
+ x = standard_define([2.5,2],model,exprs,list(gr_i,0));
+ 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) {
+ 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;
+ 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 877e4856..c0f4a876 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -1,47 +1,47 @@
/* autogenerated from "macros/Hydraulics/SourceP.sci" */
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]];
-model.sim="Source";
-model.blocktype="c";
-model.dep_ut=[true,false];
-mo=modelica();
-mo.model="Source";
-mo.inputs=[];
-mo.outputs=["C"];
-mo.parameters=list([["P0"],["T0"],["H0"],["option_temperature"]],[[P0],[T0],[H0],[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)]];
-gr_i=[];
-x=standard_define([2.5,2],model,exprs,list(gr_i,0));
-x.graphics.out_implicit=["I"];
+ model = scicos_model();
+ P0 = 300000;
+ T0 = 290;
+ H0 = 100000;
+ option_temperature = 1;
+ model.rpar = [[P0],[T0],[H0],[option_temperature]];
+ model.sim = "Source";
+ model.blocktype = "c";
+ model.dep_ut = [true,false];
+ mo = modelica();
+ mo.model = "Source";
+ mo.inputs = [];
+ mo.outputs = ["C"];
+ mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[P0],[T0],[H0],[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)]];
+ gr_i = [];
+ x = standard_define([2.5,2],model,exprs,list(gr_i,0));
+ 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) {
+ 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;
+ 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 40bf5a47..52ef8478 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -1,48 +1,48 @@
/* autogenerated from "macros/Hydraulics/VanneReglante.sci" */
function VanneReglante() {
VanneReglante.prototype.define = function VanneReglante() {
-model=scicos_model();
-model.in1=[[1],[1]];
-model.out=[1];
-Cvmax=8005.42;
-p_rho=0;
-model.rpar=[[Cvmax],[p_rho]];
-model.sim="VanneReglante";
-model.blocktype="c";
-model.dep_ut=[true,false];
-mo=modelica();
-mo.model="VanneReglante";
-mo.inputs=["C1","Ouv"];
-mo.outputs="C2";
-mo.parameters=list([["Cvmax"],["p_rho"]],[[Cvmax],[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)]];
-gr_i=[];
-x=standard_define([2,2],model,exprs,list(gr_i,0));
-x.graphics.in_implicit=[["I"],["E"]];
-x.graphics.out_implicit=["I"];
+ model = scicos_model();
+ model.in1 = [[1],[1]];
+ model.out = [1];
+ Cvmax = 8005.42;
+ p_rho = 0;
+ model.rpar = [[Cvmax],[p_rho]];
+ model.sim = "VanneReglante";
+ model.blocktype = "c";
+ model.dep_ut = [true,false];
+ mo = modelica();
+ mo.model = "VanneReglante";
+ mo.inputs = ["C1","Ouv"];
+ mo.outputs = "C2";
+ mo.parameters = list([["Cvmax"],["p_rho"]],[[Cvmax],[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)]];
+ gr_i = [];
+ x = standard_define([2,2],model,exprs,list(gr_i,0));
+ x.graphics.in_implicit = [["I"],["E"]];
+ 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) {
+ 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;
+ model.rpar = [[Cvmax],[p_rho]];
+ model.equations.parameters[2-1] = list(Cvmax,p_rho);
+ graphics.exprs = exprs;
+ x.graphics = graphics;
+ x.model = model;
break;
}
}