Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@CalebBell
CalebBell committed Jun 20, 2023
1 parent e126fb5 commit 95852b1
Show file tree
Hide file tree
Showing 66 changed files with 1,720 additions and 1,163 deletions.
2 changes: 1 addition & 1 deletion benchmarks/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@

122 changes: 62 additions & 60 deletions benchmarks/benchmarks.py
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
from fluids.numerics import IS_PYPY
from fluids.constants import *

#IS_PYPY = True
from fluids.numerics import normalize
from fluids.numerics import IS_PYPY, normalize

if not IS_PYPY:
import fluids.numba
import chemicals.numba
import numba
from datetime import datetime
import numpy as np


def also_numba(f):
if not IS_PYPY:
f.duplicate_with_numba = True
return f



class BaseTimeSuite(object):
class BaseTimeSuite:
def setup(self):
if not IS_PYPY:
for k in dir(self.__class__):
Expand All @@ -26,6 +24,7 @@ def setup(self):
c()

from chemicals.viscosity import *

if not IS_PYPY:
mu_IAPWS_numba = chemicals.numba.mu_IAPWS
mu_air_lemmon_numba = chemicals.numba.mu_air_lemmon
Expand All @@ -40,7 +39,7 @@ def setup(self):
viscosity_gas_Gharagheizi_numba = chemicals.numba.viscosity_gas_Gharagheizi
Twu_1985_numba = chemicals.numba.Twu_1985
viscosity_index_numba = chemicals.numba.viscosity_index

class TimeViscositySuite(BaseTimeSuite):
def time_mu_IAPWS(self):
mu_IAPWS(298.15, 998.)
Expand All @@ -50,12 +49,12 @@ def time_mu_IAPWS_full(self):
mu_IAPWS(T=647.35, rho=222, drho_dP=175.456980972231e-6, drho_dP_Tr=3.119177410324e-6)
def time_mu_IAPWS_full_numba(self):
mu_IAPWS_numba(T=647.35, rho=222, drho_dP=175.456980972231e-6, drho_dP_Tr=3.119177410324e-6)

def time_mu_air_lemmon(self):
mu_air_lemmon(298.15, 40.)
def time_mu_air_lemmon_numba(self):
mu_air_lemmon_numba(298.15, 40.)

def time_PPDS9(self):
PPDS9(400.0, 1.74793, 1.33728, 482.347, 41.78, 9.963e-05)
def time_PPDS9_numba(self):
Expand All @@ -64,69 +63,71 @@ def time_dPPDS9_dT(self):
dPPDS9_dT(400.0, 1.74793, 1.33728, 482.347, 41.78, 9.963e-05)
def time_dPPDS9_dT_numba(self):
dPPDS9_dT_numba(400.0, 1.74793, 1.33728, 482.347, 41.78, 9.963e-05)

def time_Letsou_Stiel(self):
Letsou_Stiel(400., 46.07, 516.25, 6.383E6, 0.6371)
def time_Letsou_Stiel_numba(self):
Letsou_Stiel_numba(400., 46.07, 516.25, 6.383E6, 0.6371)

def time_Przedziecki_Sridhar(self):
Przedziecki_Sridhar(383., 178., 591.8, 41E5, 316E-6, 95E-6, .263, 92.14)
def time_Przedziecki_Sridhar_numba(self):
Przedziecki_Sridhar_numba(383., 178., 591.8, 41E5, 316E-6, 95E-6, .263, 92.14)

def time_Lucas(self):
Lucas(300., 500E5, 572.2, 34.7E5, 0.236, 0, 0.00068)
Lucas(300., 500E5, 572.2, 34.7E5, 0.236, 0, 0.00068)
def time_Lucas_numba(self):
Lucas_numba(300., 500E5, 572.2, 34.7E5, 0.236, 0, 0.00068)
Lucas_numba(300., 500E5, 572.2, 34.7E5, 0.236, 0, 0.00068)

def time_Yoon_Thodos(self):
Yoon_Thodos(300., 556.35, 4.5596E6, 153.8)
def time_Yoon_Thodos_numba(self):
Yoon_Thodos_numba(300., 556.35, 4.5596E6, 153.8)

def time_Stiel_Thodos(self):
Stiel_Thodos(300., 556.35, 4.5596E6, 153.8)
Stiel_Thodos(300., 556.35, 4.5596E6, 153.8)
def time_Stiel_Thodos_numba(self):
Stiel_Thodos_numba(300., 556.35, 4.5596E6, 153.8)

def time_Lucas_gas(self):
Lucas_gas(T=550., Tc=512.6, Pc=80.9E5, Zc=0.224, MW=32.042, dipole=1.7)
def time_Lucas_gas_numba(self):
Lucas_gas_numba(T=550., Tc=512.6, Pc=80.9E5, Zc=0.224, MW=32.042, dipole=1.7)

def time_viscosity_gas_Gharagheizi(self):
viscosity_gas_Gharagheizi(120., 190.564, 45.99E5, 16.04246)
def time_viscosity_gas_Gharagheizi_numba(self):
viscosity_gas_Gharagheizi_numba(120., 190.564, 45.99E5, 16.04246)

def time_Twu_1985(self):
Twu_1985(T=338.7055, Tb=672.3166, rho=895.5189)
def time_Twu_1985_numba(self):
Twu_1985_numba(T=338.7055, Tb=672.3166, rho=895.5189)

def time_viscosity_index(self):
viscosity_index(73.3E-6, 8.86E-6, rounding=True)
def time_viscosity_index_numba(self):
viscosity_index_numba(73.3E-6, 8.86E-6, rounding=True)

def time_viscosity_converter_1(self):
viscosity_converter(8.79, 'engler', 'parlin cup #7')
def time_viscosity_converter_2(self):
viscosity_converter(700, 'Saybolt Universal Seconds', 'kinematic viscosity')

from chemicals.permittivity import *

if not IS_PYPY:
permittivity_IAPWS_numba = chemicals.numba.permittivity_IAPWS

class TimePermittivitySuite(BaseTimeSuite):
def time_permittivity_IAPWS(self):
permittivity_IAPWS(650., 40.31090)
def time_permittivity_IAPWS_numba(self):
permittivity_IAPWS_numba(650., 40.31090)


from chemicals.thermal_conductivity import *

if not IS_PYPY:
k_IAPWS_numba = chemicals.numba.k_IAPWS
k_air_lemmon_numba = chemicals.numba.k_air_lemmon
Expand Down Expand Up @@ -156,7 +157,7 @@ def time_k_IAPWS_full(self):
k_IAPWS(T=620., rho=613.227777440324, Cp=7634.337046792, Cv=3037.934412104, mu=70.905106751524E-6, drho_dP=5.209378197916E-6)
def time_k_IAPWS_full_numba(self):
k_IAPWS_numba(T=620., rho=613.227777440324, Cp=7634.337046792, Cv=3037.934412104, mu=70.905106751524E-6, drho_dP=5.209378197916E-6)

def time_k_air_lemmon(self):
k_air_lemmon(300.0, 40.0)
def time_k_air_lemmon_numba(self):
Expand All @@ -170,42 +171,42 @@ def time_Sheffy_Johnson(self):
Sheffy_Johnson(300, 47, 280)
def time_Sheffy_Johnson_numba(self):
Sheffy_Johnson_numba(300, 47, 280)

def time_Sato_Riedel(self):
Sato_Riedel(300, 47, 390, 520)
def time_Sato_Riedel_numba(self):
Sato_Riedel_numba(300, 47, 390, 520)

def time_Lakshmi_Prasad(self):
Lakshmi_Prasad(273.15, 100)
def time_Lakshmi_Prasad_numba(self):
Lakshmi_Prasad_numba(273.15, 100)

def time_Gharagheizi_liquid(self):
Gharagheizi_liquid(300, 40, 350, 1E6, 0.27)
def time_Gharagheizi_liquid_numba(self):
Gharagheizi_liquid_numba(300, 40, 350, 1E6, 0.27)

def time_Nicola_original(self):
Nicola_original(300, 142.3, 611.7, 0.49, 201853)
def time_Nicola_original_numba(self):
Nicola_original_numba(300, 142.3, 611.7, 0.49, 201853)

def time_Nicola(self):
Nicola(300, 142.3, 611.7, 0.49, 201853)
def time_Nicola_numba(self):
Nicola_numba(300, 142.3, 611.7, 0.49, 201853)

def time_Bahadori_liquid(self):
Bahadori_liquid(273.15, 170)
def time_Bahadori_liquid_numba(self):
Bahadori_liquid_numba(273.15, 170)

def time_kl_Mersmann_Kind(self):
kl_Mersmann_Kind(400, 170.33484, 658.0, 0.000754, 38)
def time_kl_Mersmann_Kind_numba(self):
kl_Mersmann_Kind_numba(400, 170.33484, 658.0, 0.000754, 38)

def time_DIPPR9G(self):
DIPPR9G(515.05, 3.92E7, 579.15, 3.212E6, 7.085E-2)
def time_DIPPR9G_numba(self):
Expand All @@ -225,14 +226,14 @@ def time_Eucken_modified(self):
Eucken_modified(MW=72.151, Cvm=135.9, mu=8.77E-6)
def time_Eucken_modified_numba(self):
Eucken_modified_numba(MW=72.151, Cvm=135.9, mu=8.77E-6)

def time_DIPPR9B(self):
DIPPR9B(200., 28.01, 20.826, 1.277E-5, 132.92, chemtype='linear')
def time_DIPPR9B_numba(self):
DIPPR9B_numba(200., 28.01, 20.826, 1.277E-5, 132.92, chemtype='linear')
from chemicals.interface import *


from chemicals.interface import *

if not IS_PYPY:
sigma_IAPWS_numba = chemicals.numba.sigma_IAPWS
Expand All @@ -257,7 +258,7 @@ def time_DIPPR9B_numba(self):
class TimeInterfaceSuite(BaseTimeSuite):
def __init__(self):
super().__init__()

for N in Diguilio_Teja_ns:
Diguilio_Teja_kwargs = dict(T=298.15, xs=normalize([0.1606, 0.8394]*N), sigmas_Tb=[0.01424, 0.02530]*N, Tbs=[309.21, 312.95]*N, Tcs=[469.7, 508.0]*N)
N *= 2
Expand All @@ -267,7 +268,7 @@ def __init__(self):
Diguilio_Teja_kwargs[s] = np.array(Diguilio_Teja_kwargs[s])
setattr(self, 'DTnp%d' %N, Diguilio_Teja_kwargs)


for N in Weinaug_Katz_ns:
Weinaug_Katz_kwargs = dict(parachors=[5.1e-5, 7.2e-5]*N, Vml=0.000125, Vmg=0.02011, xs=normalize([.4, .6]*N), ys=normalize([.6, .4]*N))
N *= 2
Expand All @@ -276,7 +277,7 @@ def __init__(self):
for s in ('parachors', 'xs', 'ys'):
Weinaug_Katz_kwargs[s] = np.array(Weinaug_Katz_kwargs[s])
setattr(self, 'WKnp%d' %N, Weinaug_Katz_kwargs)

for N in Winterfeld_Scriven_Davis_ns:
Winterfeld_Scriven_Davis_kwargs = dict(xs=normalize([0.1606, 0.8394]*N), sigmas=[0.01547, 0.02877]*N, rhoms=[8610., 15530.]*N)
N *= 2
Expand All @@ -291,64 +292,64 @@ def time_sigma_IAPWS(self):
sigma_IAPWS(450.)
def time_sigma_IAPWS_numba(self):
sigma_IAPWS_numba(450.)


def time_REFPROP_sigma(self):
REFPROP_sigma(298.15, 647.096, -0.1306, 2.471, 0.2151, 1.233)
def time_REFPROP_sigma_numba(self):
REFPROP_sigma_numba(298.15, 647.096, -0.1306, 2.471, 0.2151, 1.233)


def time_Somayajulu(self):
Somayajulu(300, 647.126, 232.713514, -140.18645, -4.890098)
def time_Somayajulu_numba(self):
Somayajulu_numba(300, 647.126, 232.713514, -140.18645, -4.890098)

def time_Brock_Bird(self):
Brock_Bird(293.15, 404.75, 633.0, 4530000.0)
def time_Brock_Bird_numba(self):
Brock_Bird_numba(293.15, 404.75, 633.0, 4530000.0)

def time_Pitzer_sigma(self):
Pitzer_sigma(293., 633.0, 4530000.0, 0.249)
def time_Pitzer_sigma_numba(self):
Pitzer_sigma_numba(293., 633.0, 4530000.0, 0.249)

def time_Sastri_Rao(self):
Sastri_Rao(293.15, 404.75, 633.0, 4530000.0)
def time_Sastri_Rao_numba(self):
Sastri_Rao_numba(293.15, 404.75, 633.0, 4530000.0)

def time_Zuo_Stenby(self):
Zuo_Stenby(293., 633.0, 4530000.0, 0.249)
def time_Zuo_Stenby_numba(self):
Zuo_Stenby_numba(293., 633.0, 4530000.0, 0.249)

def time_Hakim_Steinberg_Stiel(self):
Hakim_Steinberg_Stiel(298.15, 563.0, 4414000.0, 0.59, StielPolar=-0.07872)
def time_Hakim_Steinberg_Stiel_numba(self):
Hakim_Steinberg_Stiel_numba(298.15, 563.0, 4414000.0, 0.59, StielPolar=-0.07872)

def time_Miqueu(self):
Miqueu(300., 340.1, 0.000199, 0.1687)
def time_Miqueu_numba(self):
Miqueu_numba(300., 340.1, 0.000199, 0.1687)

def time_Aleem(self):
Aleem(T=90, MW=16.04246, Tb=111.6, rhol=458.7, Hvap_Tb=510870., Cpl=2465.)
def time_Aleem_numba(self):
Aleem_numba(T=90, MW=16.04246, Tb=111.6, rhol=458.7, Hvap_Tb=510870., Cpl=2465.)

def time_Mersmann_Kind_sigma(self):
Mersmann_Kind_sigma(298.15, 164.15, 328.25, 497.1, 3430000.0)
def time_Mersmann_Kind_sigma_numba(self):
Mersmann_Kind_sigma_numba(298.15, 164.15, 328.25, 497.1, 3430000.0)

def time_API10A32(self):
API10A32(288.7, 741.4, 12.4)
def time_API10A32_numba(self):
API10A32_numba(288.7, 741.4, 12.4)

def time_Meybodi_Daryasafar_Karimi(self):
Meybodi_Daryasafar_Karimi(980, 760, 580, 914)
def time_Meybodi_Daryasafar_Karimi_numba(self):
Expand All @@ -361,7 +362,7 @@ def f(self, N=n, string=string):
kwargs = getattr(self, string)
Weinaug_Katz(**kwargs)
setattr(TimeInterfaceSuite, 'time_Weinaug_Katz_%d' %(n,), f)

string = 'WKnp%d' %(n,)
def fnp(self, N=n, string=string):
kwargs = getattr(self, string)
Expand All @@ -375,7 +376,7 @@ def f(self, N=n, string=string):
kwargs = getattr(self, string)
Winterfeld_Scriven_Davis(**kwargs)
setattr(TimeInterfaceSuite, 'time_Winterfeld_Scriven_Davis_%d' %(n,), f)

string = 'WSnp%d' %(n,)
def fnp(self, N=n, string=string):
kwargs = getattr(self, string)
Expand All @@ -389,7 +390,7 @@ def f(self, N=n, string=string):
kwargs = getattr(self, string)
Diguilio_Teja(**kwargs)
setattr(TimeInterfaceSuite, 'time_Diguilio_Teja_%d' %(n,), f)

string = 'DTnp%d' %(n,)
def fnp(self, N=n, string=string):
kwargs = getattr(self, string)
Expand All @@ -398,6 +399,7 @@ def fnp(self, N=n, string=string):


from chemicals.dippr import *

if IS_PYPY:
EQ100_numba = chemicals.numba.EQ100
EQ101_numba = chemicals.numba.EQ101
Expand All @@ -415,7 +417,7 @@ def fnp(self, N=n, string=string):
]



for suite in suites:
continue
# asv requires inspect to work :(
Expand All @@ -439,4 +441,4 @@ def fnp(self, N=n, string=string):
for k in dir(s):
if 'time' in k and 'numba' in k:
delattr(s, k)

Loading

0 comments on commit 95852b1

Please sign in to comment.