github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added mass fraction handling to state checker in Python

Browse Source
This commit is contained in:
Jorrit Wronski
2015-09-30 17:29:28 +02:00
parent de3d616186
commit e643debbbe
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wrappers/Python/CoolProp/Plots/Common.py
View File

@@ -29,7 +29,8 @@ def _process_fluid_state(fluid_ref):
# Process the fluid and set self._state
if isinstance(fluid_ref, basestring):
backend, fluids = extract_backend(fluid_ref)
fluids, fractions = extract_fractions(fluids)
fluids, fractions = extract_fractions(fluids)
#if backend==u'?': backend = u'HEOS'
# # TODO: Fix the backend extraction etc
# fluid_def = fluid_ref.split('::')
# if len(fluid_def)==2:
@@ -40,7 +41,9 @@ def _process_fluid_state(fluid_ref):
# fluid = fluid_def[0]
# else:
# raise ValueError("This is not a valid fluid_ref string: {0:s}".format(str(fluid_ref)))
return AbstractState(backend, fluids.join('&'))
state = AbstractState(backend, fluids.join('&'))
state.set_mass_fractions(fractions)
return state
elif isinstance(fluid_ref, AbstractState):
return fluid_ref
raise TypeError("Invalid fluid_ref input, expected a string or an abstract state instance.")