diff --git a/DESCRIPTION b/DESCRIPTION index a845eff..7ca4d13 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,7 +4,7 @@ Title: Internal Fluid Flow Toolbox for Scilab Summary: A toolbox for internal fluid flow -Version: 0.1.1 +Version: 0.1.2 Author: Alexandre Umpierre @@ -22,6 +22,6 @@ ScilabVersion: >= 6.0 Depends: -Date: 2022-08-27 +Date: 2022-09-04 Description: This package provides a set of functions designed to solve problems of internal fluid flow on Scilab under GNU GPLv3. All functions are based on the Poiseuille condition for laminar flow, the Colebrooke-White equation for turbulent flow, and the Darcy-Weisbach equation for head loss. Basic functions allow to compute either the Reynolds number or the Darcy friction factor, given one of them is given along with the relative roughness. More advanced functions allow to compute both the Reynolds number and the Darcy friction factor given the head loss and other variables that describe the fluid flow. Enjoy! diff --git a/NEWS b/NEWS index ded26f0..7185b0b 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ TODO ==== -* Minor adjustments on plots (ongoing) + +inflowlib v0.1.0 (2022-09-04) +============================= +* Minor adjustments on plots inflowlib v0.1.1 (2022-08-27) ============================= diff --git a/README.md b/README.md index 19cd54c..ca13ad7 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,25 @@ [![DOI](https://zenodo.org/badge/509430202.svg)](https://zenodo.org/badge/latestdoi/509430202) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) +### Install and load Internal Fluid Flow Toolbox for Scilab: + +1. Download ``v0.1.2.zip`` file from the current release page. + +2. Set Scilab current directory to the download folder. + +3. To install the toolbox, type: + +``--> atomsInstall('v0.1.2.zip')`` + +4. To load the toolbox, type: + +``--> atomsLoad('inflowlib')`` + This is a very short introduction to the steady internal flow of an incompressible and inviscid fluid and to the Internal Fluid Flow Toolbox for Scilab. Our focus here is a small set of equations that described the phenomenon and are required to solve problems on internal fluid flow. Internal flow is a pretty extensive topic in fluid mechanics and there are a lot of important and interesting observations related to it that are not taken into account in this text, because they have no direct impact the computation performed by the functions in this toolbox. -This text is divided in two main sections: The Theory and The Internal Fluid Flow Toolbox. +This text is divided in two main sections: The Theory and The Internal Fluid Flow Toolbox for Scilab. ## The Theory diff --git a/help/epsRe2fD.xml b/help/epsRe2fD.xml index 11999e5..a96e168 100644 --- a/help/epsRe2fD.xml +++ b/help/epsRe2fD.xml @@ -24,7 +24,7 @@ Syntax - [fD]=epsRe2fD(Re[,eps[,s]]) + [fD]=epsRe2fD(Re[,eps[,fig]]) @@ -41,8 +41,8 @@ optional, relative roughness (default is eps=2e-3) - s: - optional, boolean for display plot (default is s=%f) + fig: + optional, boolean for display plot (default is fig=%f) fD: diff --git a/help/epsfD2Re.xml b/help/epsfD2Re.xml index e4a64ca..5b85314 100644 --- a/help/epsfD2Re.xml +++ b/help/epsfD2Re.xml @@ -24,7 +24,7 @@ Syntax - [Re]=epsfD2Re(fD[,eps[,s]]) + [Re]=epsfD2Re(fD[,eps[,fig]]) @@ -41,8 +41,8 @@ optional, relative roughness (default is eps=2e-3) - s: - optional, boolean for display plot (default is s=%f) + fig: + optional, boolean for display plot (default is fig=%f) Re: diff --git a/help/hDeps2fDRe.xml b/help/hDeps2fDRe.xml index a5320bc..0000db2 100644 --- a/help/hDeps2fDRe.xml +++ b/help/hDeps2fDRe.xml @@ -24,7 +24,7 @@ Syntax - [Re,fD]=hDeps2fDRe(h,g,mu,rho,D,L,eps[,s]) + [Re,fD]=hDeps2fDRe(h,g,mu,rho,D,L,eps[,fig]) @@ -61,8 +61,8 @@ pipe's relative roughness - s: - optional, boolean for display plot (default is s=%f) + fig: + optional, boolean for display plot (default is fig=%f) Re: diff --git a/help/hQeps2fDRe.xml b/help/hQeps2fDRe.xml index 6d061df..7c41056 100644 --- a/help/hQeps2fDRe.xml +++ b/help/hQeps2fDRe.xml @@ -24,7 +24,7 @@ Syntax - [Re,fD]=hQeps2fDRe(h,g,mu,rho,Q,L,eps[,s]) + [Re,fD]=hQeps2fDRe(h,g,mu,rho,Q,L,eps[,fig]) @@ -61,8 +61,8 @@ pipe's relative roughness - s: - optional, boolean for display plot (default is s=%f) + fig: + optional, boolean for display plot (default is fig=%f) Re: diff --git a/help/hQthk2fDRe.xml b/help/hQthk2fDRe.xml index 1a91ab9..adf7065 100644 --- a/help/hQthk2fDRe.xml +++ b/help/hQthk2fDRe.xml @@ -24,7 +24,7 @@ Syntax - [Re,fD]=hQthk2fDRe(h,g,mu,rho,Q,L,thk[,s]) + [Re,fD]=hQthk2fDRe(h,g,mu,rho,Q,L,thk[,fig]) @@ -61,8 +61,8 @@ pipe's roughness - s: - optional, boolean for display plot (default is s=%f) + fig: + optional, boolean for display plot (default is fig=%f) Re: diff --git a/help/hveps2fDRe.xml b/help/hveps2fDRe.xml index b38de63..c7d5d4d 100644 --- a/help/hveps2fDRe.xml +++ b/help/hveps2fDRe.xml @@ -24,7 +24,7 @@ Syntax - [Re,fD]=hveps2fDRe(h,g,mu,rho,v,L,eps,[,s]) + [Re,fD]=hveps2fDRe(h,g,mu,rho,v,L,eps,[,fig]) @@ -61,8 +61,8 @@ pipe's relative roughness - s: - optional, boolean for display plot (default is s=%f) + fig: + optional, boolean for display plot (default is fig=%f) Re: diff --git a/help/hvthk2fDRe.xml b/help/hvthk2fDRe.xml index 63895b9..0f64212 100644 --- a/help/hvthk2fDRe.xml +++ b/help/hvthk2fDRe.xml @@ -24,7 +24,7 @@ Syntax - [Re,fD]=hvthk2fDRe(h,g,mu,rho,v,L,thk[,s]) + [Re,fD]=hvthk2fDRe(h,g,mu,rho,v,L,thk[,fig]) @@ -61,8 +61,8 @@ pipe's roughness - s: - optional, boolean for display plot (default is s=%f) + fig: + optional, boolean for display plot (default is fig=%f) Re: diff --git a/help/master_help.xml b/help/master_help.xml index db91c12..e960ea8 100644 --- a/help/master_help.xml +++ b/help/master_help.xml @@ -1,13 +1,13 @@ - - - - - - - + + + + + + + ]> Internal Fluid Flow - + Internal Fluid Flow -&ac80445ec5b0046ded6debaa6def49c7f; -&aff2c59b6b826fdfff7d68dcb19d367af; -&a2a10d2219f38208a78507c55b38f332c; -&a1585424d93fa7c89dc6559e3890ae944; -&ab875e5c8d4ba682d4aa10f4ae437a28a; -&a58254fa7da28ca5ab8a9e109c86a062d; -&ae2f53c030efd7b14fe373834062138e6; +&aec82fdb30033a5817f8089b64e11b088; +&a860be86d2e2c221340eeacc7e797fbe1; +&a33b56b1ed421efc8c8aa15efade4152f; +&ad7ea9bd1d1c9fc774adc28f752e26b6c; +&a38f04710b149a80965e670e6b6fc6575; +&a6cb3b8bc2465c4a46490b10241b40b98; +&a33d406922dbe6facc91bf56936813a6c; diff --git a/help/scilab_en_US_help/JavaHelpSearch/DOCS b/help/scilab_en_US_help/JavaHelpSearch/DOCS index d2e70b3..4fa60e3 100644 Binary files a/help/scilab_en_US_help/JavaHelpSearch/DOCS and b/help/scilab_en_US_help/JavaHelpSearch/DOCS differ diff --git a/help/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/scilab_en_US_help/JavaHelpSearch/DOCS.TAB index 5b5c29c..d8cf066 100644 --- a/help/scilab_en_US_help/JavaHelpSearch/DOCS.TAB +++ b/help/scilab_en_US_help/JavaHelpSearch/DOCS.TAB @@ -1 +1,2 @@ -e'}w_2(ʪ22ꪪ \ No newline at end of file +e}T2̪*2* +Ȫ2**ª0**(ʊ2(+￫ \ No newline at end of file diff --git a/help/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/scilab_en_US_help/JavaHelpSearch/OFFSETS index fdbfd95..05d657c 100644 --- a/help/scilab_en_US_help/JavaHelpSearch/OFFSETS +++ b/help/scilab_en_US_help/JavaHelpSearch/OFFSETS @@ -1 +1 @@ -jCߤIQ`:1񆊅̀ \ No newline at end of file +oRPC  zdƵ \ No newline at end of file diff --git a/help/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/scilab_en_US_help/JavaHelpSearch/POSITIONS index 190faab..844cf28 100644 Binary files a/help/scilab_en_US_help/JavaHelpSearch/POSITIONS and b/help/scilab_en_US_help/JavaHelpSearch/POSITIONS differ diff --git a/help/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/scilab_en_US_help/JavaHelpSearch/SCHEMA index 0eca436..dce0c8d 100644 --- a/help/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ b/help/scilab_en_US_help/JavaHelpSearch/SCHEMA @@ -1,2 +1,2 @@ JavaSearch 1.0 -TMAP bs=2048 rt=0 fl=-1 id1=172 id2=1 +TMAP bs=2048 rt=0 fl=-1 id1=173 id2=1 diff --git a/help/scilab_en_US_help/JavaHelpSearch/TMAP b/help/scilab_en_US_help/JavaHelpSearch/TMAP index 7e90b39..54214dd 100644 Binary files a/help/scilab_en_US_help/JavaHelpSearch/TMAP and b/help/scilab_en_US_help/JavaHelpSearch/TMAP differ diff --git a/help/scilab_en_US_help/epsRe2fD.html b/help/scilab_en_US_help/epsRe2fD.html index 1fb9e25..8a27be2 100644 --- a/help/scilab_en_US_help/epsRe2fD.html +++ b/help/scilab_en_US_help/epsRe2fD.html @@ -12,11 +12,11 @@
- << Internal Fluid Flow + << Internal Fluid Flow - Internal Fluid Flow + Internal Fluid Flow @@ -29,7 +29,7 @@ - Internal Fluid Flow >> Internal Fluid Flow > epsRe2fD + Internal Fluid Flow >> Internal Fluid Flow > epsRe2fD

epsRe2fD

@@ -37,15 +37,15 @@

Syntax

- 
[fD]=epsRe2fD(Re[,eps[,s]])
+ 
[fD]=epsRe2fD(Re[,eps[,fig]])

Parameters

Re:

Reynolds number

eps:

optional, relative roughness (default is eps=2e-3)

-
s: -

optional, boolean for display plot (default is s=%f)

+
fig: +

optional, boolean for display plot (default is fig=%f)

fD:

Darcy friction factor

@@ -104,11 +104,11 @@
Report an issue
- << Internal Fluid Flow + << Internal Fluid Flow - Internal Fluid Flow + Internal Fluid Flow diff --git a/help/scilab_en_US_help/epsfD2Re.html b/help/scilab_en_US_help/epsfD2Re.html index e9dd0b5..163c790 100644 --- a/help/scilab_en_US_help/epsfD2Re.html +++ b/help/scilab_en_US_help/epsfD2Re.html @@ -16,7 +16,7 @@ - Internal Fluid Flow + Internal Fluid Flow @@ -29,7 +29,7 @@ - Internal Fluid Flow >> Internal Fluid Flow > epsfD2Re + Internal Fluid Flow >> Internal Fluid Flow > epsfD2Re

epsfD2Re

@@ -37,15 +37,15 @@

Syntax

- 
[Re]=epsfD2Re(fD[,eps[,s]])
+ 
[Re]=epsfD2Re(fD[,eps[,fig]])

Parameters

fD:

Darcy friction factor

eps:

optional, relative roughness (default is eps=2e-3)

-
s: -

optional, boolean for display plot (default is s=%f)

+
fig: +

optional, boolean for display plot (default is fig=%f)

Re:

Reynolds number

@@ -129,7 +129,7 @@ 		- Internal Fluid Flow + Internal Fluid Flow diff --git a/help/scilab_en_US_help/hDeps2fDRe.html b/help/scilab_en_US_help/hDeps2fDRe.html index 727d54e..379d1d3 100644 --- a/help/scilab_en_US_help/hDeps2fDRe.html +++ b/help/scilab_en_US_help/hDeps2fDRe.html @@ -16,7 +16,7 @@ - Internal Fluid Flow + Internal Fluid Flow @@ -29,7 +29,7 @@ - Internal Fluid Flow >> Internal Fluid Flow > hDeps2fDRe + Internal Fluid Flow >> Internal Fluid Flow > hDeps2fDRe

hDeps2fDRe

@@ -37,7 +37,7 @@

Syntax

- 
[Re,fD]=hDeps2fDRe(h,g,mu,rho,D,L,eps[,s])
+ 
[Re,fD]=hDeps2fDRe(h,g,mu,rho,D,L,eps[,fig])

Parameters

h: @@ -54,8 +54,8 @@

pipe's length

eps:

pipe's relative roughness

-
s: -

optional, boolean for display plot (default is s=%f)

+
fig: +

optional, boolean for display plot (default is fig=%f)

Re:

Reynolds number

fD: @@ -133,7 +133,7 @@
- Internal Fluid Flow + Internal Fluid Flow diff --git a/help/scilab_en_US_help/hQeps2fDRe.html b/help/scilab_en_US_help/hQeps2fDRe.html index 447221a..6efa148 100644 --- a/help/scilab_en_US_help/hQeps2fDRe.html +++ b/help/scilab_en_US_help/hQeps2fDRe.html @@ -16,7 +16,7 @@ - Internal Fluid Flow + Internal Fluid Flow @@ -29,7 +29,7 @@ - Internal Fluid Flow >> Internal Fluid Flow > hQeps2fDRe + Internal Fluid Flow >> Internal Fluid Flow > hQeps2fDRe

hQeps2fDRe

@@ -37,7 +37,7 @@

Syntax

- 
[Re,fD]=hQeps2fDRe(h,g,mu,rho,Q,L,eps[,s])
+ 
[Re,fD]=hQeps2fDRe(h,g,mu,rho,Q,L,eps[,fig])

Parameters

h: @@ -54,8 +54,8 @@

pipe's length

eps:

pipe's relative roughness

-
s: -

optional, boolean for display plot (default is s=%f)

+
fig: +

optional, boolean for display plot (default is fig=%f)

Re:

Reynolds number

fD: @@ -134,7 +134,7 @@
- Internal Fluid Flow + Internal Fluid Flow diff --git a/help/scilab_en_US_help/hQthk2fDRe.html b/help/scilab_en_US_help/hQthk2fDRe.html index e43e607..7e907fd 100644 --- a/help/scilab_en_US_help/hQthk2fDRe.html +++ b/help/scilab_en_US_help/hQthk2fDRe.html @@ -16,7 +16,7 @@ - Internal Fluid Flow + Internal Fluid Flow @@ -29,7 +29,7 @@ - Internal Fluid Flow >> Internal Fluid Flow > hQthk2fDRe + Internal Fluid Flow >> Internal Fluid Flow > hQthk2fDRe

hQthk2fDRe

@@ -37,7 +37,7 @@

Syntax

- 
[Re,fD]=hQthk2fDRe(h,g,mu,rho,Q,L,thk[,s])
+ 
[Re,fD]=hQthk2fDRe(h,g,mu,rho,Q,L,thk[,fig])

Parameters

h: @@ -54,8 +54,8 @@

pipe's length

thk:

pipe's roughness

-
s: -

optional, boolean for display plot (default is s=%f)

+
fig: +

optional, boolean for display plot (default is fig=%f)

Re:

Reynolds number

fD: @@ -134,7 +134,7 @@
- Internal Fluid Flow + Internal Fluid Flow diff --git a/help/scilab_en_US_help/hveps2fDRe.html b/help/scilab_en_US_help/hveps2fDRe.html index ad23aa6..9d3df4e 100644 --- a/help/scilab_en_US_help/hveps2fDRe.html +++ b/help/scilab_en_US_help/hveps2fDRe.html @@ -16,7 +16,7 @@ - Internal Fluid Flow + Internal Fluid Flow @@ -29,7 +29,7 @@ - Internal Fluid Flow >> Internal Fluid Flow > hveps2fDRe + Internal Fluid Flow >> Internal Fluid Flow > hveps2fDRe

hveps2fDRe

@@ -37,7 +37,7 @@

Syntax

- 
[Re,fD]=hveps2fDRe(h,g,mu,rho,v,L,eps,[,s])
+ 
[Re,fD]=hveps2fDRe(h,g,mu,rho,v,L,eps,[,fig])

Parameters

h: @@ -54,8 +54,8 @@

pipe's length

eps:

pipe's relative roughness

-
s: -

optional, boolean for display plot (default is s=%f)

+
fig: +

optional, boolean for display plot (default is fig=%f)

Re:

Reynolds number

fD: @@ -148,7 +148,7 @@
- Internal Fluid Flow + Internal Fluid Flow diff --git a/help/scilab_en_US_help/hvthk2fDRe.html b/help/scilab_en_US_help/hvthk2fDRe.html index c34bff5..ee3cd51 100644 --- a/help/scilab_en_US_help/hvthk2fDRe.html +++ b/help/scilab_en_US_help/hvthk2fDRe.html @@ -16,7 +16,7 @@ - Internal Fluid Flow + Internal Fluid Flow @@ -28,7 +28,7 @@ - Internal Fluid Flow >> Internal Fluid Flow > hvthk2fDRe + Internal Fluid Flow >> Internal Fluid Flow > hvthk2fDRe

hvthk2fDRe

@@ -36,7 +36,7 @@

Syntax

- 
[Re,fD]=hvthk2fDRe(h,g,mu,rho,v,L,thk[,s])
+ 
[Re,fD]=hvthk2fDRe(h,g,mu,rho,v,L,thk[,fig])

Parameters

h: @@ -53,8 +53,8 @@

pipe's length

thk:

pipe's roughness

-
s: -

optional, boolean for display plot (default is s=%f)

+
fig: +

optional, boolean for display plot (default is fig=%f)

Re:

Reynolds number

fD: @@ -147,7 +147,7 @@
- Internal Fluid Flow + Internal Fluid Flow diff --git a/help/scilab_en_US_help/index.html b/help/scilab_en_US_help/index.html index c2d7a83..8fde8c0 100644 --- a/help/scilab_en_US_help/index.html +++ b/help/scilab_en_US_help/index.html @@ -31,7 +31,7 @@

Internal Fluid Flow

    -
  • Internal Fluid Flow +
  • Internal Fluid Flow
    • epsRe2fD — Computes the Darcy friction factor given the Reynolds number and the relative roughness
      • diff --git a/help/scilab_en_US_help/jhelpmap.jhm b/help/scilab_en_US_help/jhelpmap.jhm index a4d21c8..ef8029f 100644 --- a/help/scilab_en_US_help/jhelpmap.jhm +++ b/help/scilab_en_US_help/jhelpmap.jhm @@ -2,7 +2,7 @@ - + diff --git a/help/scilab_en_US_help/jhelptoc.xml b/help/scilab_en_US_help/jhelptoc.xml index a420952..fd8aac0 100644 --- a/help/scilab_en_US_help/jhelptoc.xml +++ b/help/scilab_en_US_help/jhelptoc.xml @@ -2,7 +2,7 @@ - + diff --git a/help/scilab_en_US_help/section_1a5d32a5774a02b036ca9077794f67ce.html b/help/scilab_en_US_help/section_1a5d32a5774a02b036ca9077794f67ce.html new file mode 100644 index 0000000..edc800c --- /dev/null +++ b/help/scilab_en_US_help/section_1a5d32a5774a02b036ca9077794f67ce.html @@ -0,0 +1,91 @@ + + + + + + +
      + + + + +
      + + + Internal Fluid Flow + + + +
      +
      +
      + + + + Internal Fluid Flow >> Internal Fluid Flow + +

      +

      Internal Fluid Flow

      +
      • epsRe2fD — Computes the Darcy friction factor given the Reynolds number and the relative roughness
        • + + + + + +
      • epsfD2Re — Computes the Reynolds number given the Darcy friction factor and the relative roughness
        • + + + + + +
      • hDeps2fDRe — Solution for internal fluid flow based on pipe's hydraulic diameter and relative roughness
        • + + + + + +
      • hQeps2fDRe — Solution for internal fluid flow based on volumetric flow rate and pipe's relative roughness
        • + + + + + +
      • hQthk2fDRe — Solution for internal fluid flow based on volumetric flow rate and pipe's roughness
        • + + + + + +
      • hveps2fDRe — Solution for internal fluid flow based on flow speed and pipe's relative roughness
        • + + + + + +
      • hvthk2fDRe — Solution for internal fluid flow based on flow speed and pipe's roughness
      +
      + +
      + + + + + + +
      Report an issue
      + + + Internal Fluid Flow + + + +
      +
      +
      + + diff --git a/macros/epsRe2fD.sci b/macros/epsRe2fD.sci index 2b6a951..4e936b0 100644 --- a/macros/epsRe2fD.sci +++ b/macros/epsRe2fD.sci @@ -23,12 +23,12 @@ function [fD]=epsRe2fD(Re,varargin) // Computes the Darcy friction factor given the Reynolds number and the relative roughness // // Syntax - // [fD]=epsRe2fD(Re[,eps[,s]]) + // [fD]=epsRe2fD(Re[,eps[,fig]]) // // Parameters // Re: Reynolds number // eps: optional, relative roughness (default is eps=2e-3) - // s: optional, boolean for display plot (default is s=%f) + // fig: optional, boolean for display plot (default is fig=%f) // fD: Darcy friction factor // // Description diff --git a/macros/epsfD2Re.sci b/macros/epsfD2Re.sci index 7499b39..0e287d2 100644 --- a/macros/epsfD2Re.sci +++ b/macros/epsfD2Re.sci @@ -23,12 +23,12 @@ function [Re]=epsfD2Re(fD,varargin) // Computes the Reynolds number given the Darcy friction factor and the relative roughness // // Syntax - // [Re]=epsfD2Re(fD[,eps[,s]]) + // [Re]=epsfD2Re(fD[,eps[,fig]]) // // Parameters // fD: Darcy friction factor // eps: optional, relative roughness (default is eps=2e-3) - // s: optional, boolean for display plot (default is s=%f) + // fig: optional, boolean for display plot (default is fig=%f) // Re: Reynolds number // // Description diff --git a/macros/hDeps2fDRe.sci b/macros/hDeps2fDRe.sci index c393b9d..dd1dfeb 100644 --- a/macros/hDeps2fDRe.sci +++ b/macros/hDeps2fDRe.sci @@ -23,7 +23,7 @@ function [Re,fD]=hDeps2fDRe(h,g,mu,rho,D,L,eps,varargin) // Solution for internal fluid flow based on pipe's hydraulic diameter and relative roughness // // Syntax - // [Re,fD]=hDeps2fDRe(h,g,mu,rho,D,L,eps[,s]) + // [Re,fD]=hDeps2fDRe(h,g,mu,rho,D,L,eps[,fig]) // // Parameters // h: head loss @@ -33,7 +33,7 @@ function [Re,fD]=hDeps2fDRe(h,g,mu,rho,D,L,eps,varargin) // D: pipe's hydraulic diameter // L: pipe's length // eps: pipe's relative roughness - // s: optional, boolean for display plot (default is s=%f) + // fig: optional, boolean for display plot (default is fig=%f) // Re: Reynolds number // fD: Darcy friction factor // diff --git a/macros/hQeps2fDRe.sci b/macros/hQeps2fDRe.sci index 1cc87f3..34e9c58 100644 --- a/macros/hQeps2fDRe.sci +++ b/macros/hQeps2fDRe.sci @@ -23,7 +23,7 @@ function [Re,fD]=hQeps2fDRe(h,g,mu,rho,Q,L,eps,varargin) // Solution for internal fluid flow based on volumetric flow rate and pipe's relative roughness // // Syntax - // [Re,fD]=hQeps2fDRe(h,g,mu,rho,Q,L,eps[,s]) + // [Re,fD]=hQeps2fDRe(h,g,mu,rho,Q,L,eps[,fig]) // // Parameters // h: head loss @@ -33,7 +33,7 @@ function [Re,fD]=hQeps2fDRe(h,g,mu,rho,Q,L,eps,varargin) // Q: volumetric flow rate // L: pipe's length // eps: pipe's relative roughness - // s: optional, boolean for display plot (default is s=%f) + // fig: optional, boolean for display plot (default is fig=%f) // Re: Reynolds number // fD: Darcy friction factor // diff --git a/macros/hQthk2fDRe.sci b/macros/hQthk2fDRe.sci index 6b3a4ff..1804aa1 100644 --- a/macros/hQthk2fDRe.sci +++ b/macros/hQthk2fDRe.sci @@ -23,7 +23,7 @@ function [Re,fD]=hQthk2fDRe(h,g,mu,rho,Q,L,thk,varargin) // Solution for internal fluid flow based on volumetric flow rate and pipe's roughness // // Syntax - // [Re,fD]=hQthk2fDRe(h,g,mu,rho,Q,L,thk[,s]) + // [Re,fD]=hQthk2fDRe(h,g,mu,rho,Q,L,thk[,fig]) // // Parameters // h: head loss @@ -33,7 +33,7 @@ function [Re,fD]=hQthk2fDRe(h,g,mu,rho,Q,L,thk,varargin) // Q: volumetric flow rate // L: pipe's length // thk: pipe's roughness - // s: optional, boolean for display plot (default is s=%f) + // fig: optional, boolean for display plot (default is fig=%f) // Re: Reynolds number // fD: Darcy friction factor // diff --git a/macros/hveps2fDRe.sci b/macros/hveps2fDRe.sci index 246014e..ac816c6 100644 --- a/macros/hveps2fDRe.sci +++ b/macros/hveps2fDRe.sci @@ -23,7 +23,7 @@ function [Re,fD]=hveps2fDRe(h,g,mu,rho,v,L,eps,varargin) // Solution for internal fluid flow based on flow speed and pipe's relative roughness // // Syntax - // [Re,fD]=hveps2fDRe(h,g,mu,rho,v,L,eps,[,s]) + // [Re,fD]=hveps2fDRe(h,g,mu,rho,v,L,eps,[,fig]) // // Parameters // h: head loss @@ -33,7 +33,7 @@ function [Re,fD]=hveps2fDRe(h,g,mu,rho,v,L,eps,varargin) // v: flow speed // L: pipe's length // eps: pipe's relative roughness - // s: optional, boolean for display plot (default is s=%f) + // fig: optional, boolean for display plot (default is fig=%f) // Re: Reynolds number // fD: Darcy friction factor // diff --git a/macros/hvthk2fDRe.sci b/macros/hvthk2fDRe.sci index 51f1d14..8b40db2 100644 --- a/macros/hvthk2fDRe.sci +++ b/macros/hvthk2fDRe.sci @@ -23,7 +23,7 @@ function [Re,fD]=hvthk2fDRe(h,g,mu,rho,v,L,thk,varargin) // Solution for internal fluid flow based on flow speed and pipe's roughness // // Syntax - // [Re,fD]=hvthk2fDRe(h,g,mu,rho,v,L,thk[,s]) + // [Re,fD]=hvthk2fDRe(h,g,mu,rho,v,L,thk[,fig]) // // Parameters // h: head loss @@ -33,7 +33,7 @@ function [Re,fD]=hvthk2fDRe(h,g,mu,rho,v,L,thk,varargin) // v: flow speed // L: pipe's length // thk: pipe's roughness - // s: optional, boolean for display plot (default is s=%f) + // fig: optional, boolean for display plot (default is fig=%f) // Re: Reynolds number // fD: Darcy friction factor //