From 623b1d299f53784939f6eef0e56c7f63fed74f94 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 1 Aug 2020 11:07:14 -0600 Subject: [PATCH] 0.1.84 release --- .../7.23 Flow Through Orifice Meters.ipynb | 22 +++++++++---------- ...of Hydraulic Radius to Flow Problems.ipynb | 4 ++-- ...d Flow Conditions in a Control Valve.ipynb | 4 ++-- .../7.32 NPSH Available Calculation.ipynb | 8 +++---- .../7.34 Pump Power and Operating Cost.ipynb | 2 +- docs/examples.rst | 17 ++++++++++++++ fluids/__init__.py | 2 +- setup.py | 4 ++-- 8 files changed, 40 insertions(+), 23 deletions(-) diff --git a/docs/Examples/Crane TP 410 Solved Problems/7.23 Flow Through Orifice Meters.ipynb b/docs/Examples/Crane TP 410 Solved Problems/7.23 Flow Through Orifice Meters.ipynb index 47af4274..49d39f10 100644 --- a/docs/Examples/Crane TP 410 Solved Problems/7.23 Flow Through Orifice Meters.ipynb +++ b/docs/Examples/Crane TP 410 Solved Problems/7.23 Flow Through Orifice Meters.ipynb @@ -20,7 +20,7 @@ }, { "cell_type": "code", - "execution_count": 44, + "execution_count": 1, "metadata": { "collapsed": false }, @@ -37,7 +37,7 @@ }, { "cell_type": "code", - "execution_count": 43, + "execution_count": 2, "metadata": { "collapsed": false }, @@ -45,16 +45,16 @@ { "data": { "text/html": [ - "\\[109.8342584689115\\ gallon/minute\\]" + "\\[109.83425846891171\\ gallon/minute\\]" ], "text/latex": [ - "$109.8342584689115\\ \\frac{\\mathrm{gallon}}{\\mathrm{minute}}$" + "$109.83425846891171\\ \\frac{\\mathrm{gallon}}{\\mathrm{minute}}$" ], "text/plain": [ - "109.8342584689115 " + "109.83425846891171 " ] }, - "execution_count": 43, + "execution_count": 2, "metadata": {}, "output_type": "execute_result" } @@ -71,7 +71,7 @@ }, { "cell_type": "code", - "execution_count": 46, + "execution_count": 3, "metadata": { "collapsed": false }, @@ -79,16 +79,16 @@ { "data": { "text/html": [ - "\\[0.49677293174261683\\ dimensionless\\]" + "\\[0.6066043513551787\\ dimensionless\\]" ], "text/latex": [ - "$0.49677293174261683\\ dimensionless$" + "$0.6066043513551787\\ dimensionless$" ], "text/plain": [ - "0.49677293174261683 " + "0.6066043513551787 " ] }, - "execution_count": 46, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } diff --git a/docs/Examples/Crane TP 410 Solved Problems/7.25 Rectangular Duct - Application of Hydraulic Radius to Flow Problems.ipynb b/docs/Examples/Crane TP 410 Solved Problems/7.25 Rectangular Duct - Application of Hydraulic Radius to Flow Problems.ipynb index d79d3cba..92780e5e 100644 --- a/docs/Examples/Crane TP 410 Solved Problems/7.25 Rectangular Duct - Application of Hydraulic Radius to Flow Problems.ipynb +++ b/docs/Examples/Crane TP 410 Solved Problems/7.25 Rectangular Duct - Application of Hydraulic Radius to Flow Problems.ipynb @@ -19,7 +19,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 1, "metadata": { "collapsed": false }, @@ -45,7 +45,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 2, "metadata": { "collapsed": false }, diff --git a/docs/Examples/Crane TP 410 Solved Problems/7.28 Checking for Choked Flow Conditions in a Control Valve.ipynb b/docs/Examples/Crane TP 410 Solved Problems/7.28 Checking for Choked Flow Conditions in a Control Valve.ipynb index f214517e..37c2dfd1 100644 --- a/docs/Examples/Crane TP 410 Solved Problems/7.28 Checking for Choked Flow Conditions in a Control Valve.ipynb +++ b/docs/Examples/Crane TP 410 Solved Problems/7.28 Checking for Choked Flow Conditions in a Control Valve.ipynb @@ -17,7 +17,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 1, "metadata": { "collapsed": false }, @@ -29,7 +29,7 @@ " 70.8 )" ] }, - "execution_count": 9, + "execution_count": 1, "metadata": {}, "output_type": "execute_result" } diff --git a/docs/Examples/Crane TP 410 Solved Problems/7.32 NPSH Available Calculation.ipynb b/docs/Examples/Crane TP 410 Solved Problems/7.32 NPSH Available Calculation.ipynb index 16a5653e..8b21a0b3 100644 --- a/docs/Examples/Crane TP 410 Solved Problems/7.32 NPSH Available Calculation.ipynb +++ b/docs/Examples/Crane TP 410 Solved Problems/7.32 NPSH Available Calculation.ipynb @@ -20,7 +20,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 1, "metadata": { "collapsed": false }, @@ -37,7 +37,7 @@ "13.887316780096477 " ] }, - "execution_count": 7, + "execution_count": 1, "metadata": {}, "output_type": "execute_result" } @@ -66,7 +66,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 2, "metadata": { "collapsed": false }, @@ -83,7 +83,7 @@ "26.0 " ] }, - "execution_count": 8, + "execution_count": 2, "metadata": {}, "output_type": "execute_result" } diff --git a/docs/Examples/Crane TP 410 Solved Problems/7.34 Pump Power and Operating Cost.ipynb b/docs/Examples/Crane TP 410 Solved Problems/7.34 Pump Power and Operating Cost.ipynb index 0109f958..f7773a2b 100644 --- a/docs/Examples/Crane TP 410 Solved Problems/7.34 Pump Power and Operating Cost.ipynb +++ b/docs/Examples/Crane TP 410 Solved Problems/7.34 Pump Power and Operating Cost.ipynb @@ -19,7 +19,7 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": 1, "metadata": { "collapsed": false }, diff --git a/docs/examples.rst b/docs/examples.rst index a804e042..7c55202e 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -19,5 +19,22 @@ Solved fluids mechanics problems Examples/Crane TP 410 Solved Problems/7.14 Bernoulli's Theorem-Water.ipynb Examples/Crane TP 410 Solved Problems/7.15 Power Required for Pumping.ipynb Examples/Crane TP 410 Solved Problems/7.16 Air Lines.ipynb + Examples/Crane TP 410 Solved Problems/7.17 Sizing of Pump for Oil Pipelines.ipynb Examples/Crane TP 410 Solved Problems/7.18 Gas.ipynb + Examples/Crane TP 410 Solved Problems/7.19 Water.ipynb + Examples/Crane TP 410 Solved Problems/7.20 Steam at Sonic Velocity.ipynb + Examples/Crane TP 410 Solved Problems/7.21 Gases at Sonic Velocity.ipynb + Examples/Crane TP 410 Solved Problems/7.22 Compressible Fluids at Subsonic Velocity.ipynb + Examples/Crane TP 410 Solved Problems/7.23 Flow Through Orifice Meters.ipynb + Examples/Crane TP 410 Solved Problems/7.24 Laminar Flow.ipynb + Examples/Crane TP 410 Solved Problems/7.25 Rectangular Duct - Application of Hydraulic Radius to Flow Problems.ipynb + Examples/Crane TP 410 Solved Problems/7.26 Pipe Partially Filled with Flowing Water.ipynb + Examples/Crane TP 410 Solved Problems/7.27 Sizing Control Valves for Liquid Service.ipynb + Examples/Crane TP 410 Solved Problems/7.28 Checking for Choked Flow Conditions in a Control Valve.ipynb Examples/Crane TP 410 Solved Problems/7.29 Orifice Flow Rate Calculation.ipynb + Examples/Crane TP 410 Solved Problems/7.30 Nozzle Sizing Calculations.ipynb + Examples/Crane TP 410 Solved Problems/7.32 NPSH Available Calculation.ipynb + Examples/Crane TP 410 Solved Problems/7.33 Pump Affinity Rules.ipynb + Examples/Crane TP 410 Solved Problems/7.34 Pump Power and Operating Cost.ipynb + Examples/Crane TP 410 Solved Problems/7.35 Hydraulic Resistance of a Converging Tee.ipynb + Examples/Crane TP 410 Solved Problems/7.36 Hydraulic Resistance of a Diverging Wye.ipynb \ No newline at end of file diff --git a/fluids/__init__.py b/fluids/__init__.py index 49681694..d02d74f5 100644 --- a/fluids/__init__.py +++ b/fluids/__init__.py @@ -127,7 +127,7 @@ def load_types(): for m in submodules: type_module(m) -__version__ = '0.1.83' +__version__ = '0.1.84' try: fluids_dir = os.path.dirname(__file__) diff --git a/setup.py b/setup.py index 118971c9..9d12f296 100644 --- a/setup.py +++ b/setup.py @@ -68,8 +68,8 @@ name='fluids', packages=['fluids'], license='MIT', - version='0.1.83', - download_url='https://github.com/CalebBell/fluids/tarball/0.1.83', + version='0.1.84', + download_url='https://github.com/CalebBell/fluids/tarball/0.1.84', description=description, long_description=open('README.rst').read(), install_requires=["numpy>=1.5.0", "scipy>=0.9.0"],