0.1.79 release

CalebBell · May 19, 2020 · 99e825b · 99e825b
1 parent 9a08c8c
commit 99e825b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/fluids/__init__.py b/fluids/__init__.py
@@ -112,7 +112,7 @@
               saltation, separator, particle_size_distribution, jet_pump,
               control_valve]
 
-__version__ = '0.1.78'
+__version__ = '0.1.79'
 
 fluids_dir = os.path.dirname(__file__)
 fluids_data_dir = os.path.join(fluids_dir, 'data')

diff --git a/fluids/geometry.py b/fluids/geometry.py
@@ -1823,7 +1823,11 @@ def SA_partial_horiz_torispherical_head(D, f, k, h):
     c1 = s2 + t2  - (R - h)**2
     def G_lim(x):
         x2 = x*x
-        G = (c1 - x2 + 2.0*s*(t2 - x2)**0.5)**0.5
+        try:
+            G = (c1 - x2 + 2.0*s*(t2 - x2)**0.5)**0.5
+        except:
+            # Python 2 compat - don't take the square root of a negative number with no complex part
+            G = (c1 - x2 + 2.0*s*(t2 - x2+0.0j)**0.5 + 0.0j)**0.5
         return G.real # Some tiny heights make the square root slightly under 0
 
 

diff --git a/setup.py b/setup.py
@@ -65,8 +65,8 @@
     name='fluids',
     packages=['fluids'],
     license='MIT',
-    version='0.1.78',
-    download_url='https://github.com/CalebBell/fluids/tarball/0.1.78',
+    version='0.1.79',
+    download_url='https://github.com/CalebBell/fluids/tarball/0.1.79',
     description=description,
     long_description=open('README.rst').read(),
     install_requires=["numpy>=1.5.0", "scipy>=0.9.0"],