Skip to content
This repository was archived by the owner on Jul 2, 2025. It is now read-only.

Drop lru_cache on vapor_pressure, oilprops is not hashable (otherwise crashes on py3) #29

Open
gauteh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Drop lru_cache on vapor_pressure, oilprops is not hashable (otherwise crashes on py3) #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdc0f58
tests: vapor pressure fails on py3 because OilProps is not hashable
gauteh Jan 5, 2021
86e5d2a
oilprops: remove lru cache on vapor_pressure, oilprops is unhashable
gauteh Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions oil_library/oil_props.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
from itertools import groupby, chain
from future.moves.itertools import zip_longest

try:
from functools import lru_cache # it's built-in on py3
except ImportError:
from backports.functools_lru_cache import lru_cache # needs backports for py2

import numpy as np

from .models import Oil
Expand Down Expand Up @@ -190,7 +185,6 @@ def _component_density(self, sara_type=None):
def component_types(self):
return self._sara['type']

@lru_cache(2)
def vapor_pressure(self, temp, atmos_pressure=101325.0):
'''
water_temp and boiling point units are Kelvin
Expand Down
3 changes: 3 additions & 0 deletions oil_library/tests/test_oil_props.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ def test_sara(self):
dens for dens in self.s_dens)

assert np.allclose(self.op.mass_fraction.sum(), 1.0)
def test_vapor_pressure(self):
vp = self.op.vapor_pressure(273.)



def test_eq():
Expand Down