From cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76 Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Mon, 18 Jun 2018 17:30:31 +0530 Subject: use format string --- js/Hydraulics/Bache.js | 4 ++-- js/Hydraulics/Flowmeter.js | 4 ++-- js/Hydraulics/PerteDP.js | 4 ++-- js/Hydraulics/PuitsP.js | 4 ++-- js/Hydraulics/SourceP.js | 4 ++-- js/Hydraulics/VanneReglante.js | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'js/Hydraulics') diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 3114935f..653b0273 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -45,14 +45,14 @@ 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 +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 +break; } } } diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 61f91774..13049fe4 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -62,11 +62,11 @@ exprs=x.graphics.exprs; while (false) { [ok,Qini,exprs]=scicos_getvalue(["Set Flowmeter block parameters:","","Qini: "],"Qini",list("vec",1),exprs); if (!ok) { -break +break; } x.model.equations.parameters[2-1]=list(Qini); x.graphics.exprs=exprs; -break +break; } } } diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index fad593fe..6889c951 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -40,14 +40,14 @@ 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 +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 +break; } } } diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index f2739743..47816b22 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -33,14 +33,14 @@ 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 +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 +break; } } } diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 34997c0a..f607d598 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -35,14 +35,14 @@ 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 +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 +break; } } } diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 411ceca0..70cbafc7 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -36,14 +36,14 @@ 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 +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 +break; } } } -- cgit