pyfluids 2.6.0__tar.gz → 2.7.2__tar.gz

{pyfluids-2.6.0 → pyfluids-2.7.2}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: pyfluids
-Version: 2.6.0
-Summary: A simple, full-featured, lightweight CoolProp wrapper for Python
+Version: 2.7.2
+Summary: Simple, full-featured, lightweight CoolProp wrapper for Python
 Home-page: https://github.com/portyanikhin/PyFluids
 License: MIT
 Keywords: CoolProp,fluids,mixtures,humid,air,thermophysical,properties,thermodynamics
 Author: Vladimir Portyanikhin
 Author-email: v.portyanikhin@ya.ru
-Requires-Python: >=3.7,<3.13
+Requires-Python: >=3.8,<3.13
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
@@ -21,7 +21,6 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -36,7 +35,7 @@ Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Classifier: Topic :: Scientific/Engineering :: Chemistry
 Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Dist: CoolProp (==6.6.0)
-Requires-Dist: tomli (==2.0.1)
+Requires-Dist: tomli (==2.2.1)
 Project-URL: Documentation, https://github.com/portyanikhin/PyFluids
 Project-URL: Repository, https://github.com/portyanikhin/PyFluids
 Description-Content-Type: text/markdown
@@ -51,6 +50,6 @@ Description-Content-Type: text/markdown
 [![codecov](https://codecov.io/gh/portyanikhin/PyFluids/branch/main/graph/badge.svg?token=I1LL66AOJW)](https://codecov.io/gh/portyanikhin/PyFluids)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-black)](https://github.com/psf/black)
 
-A simple, full-featured, lightweight [CoolProp](http://www.coolprop.org) wrapper for Python.
+Simple, full-featured, lightweight [CoolProp](http://www.coolprop.org) wrapper for Python.
 
 _**See [full documentation](https://github.com/portyanikhin/PyFluids).**_

{pyfluids-2.6.0 → pyfluids-2.7.2}/PyPI.md

@@ -8,6 +8,6 @@
 [![codecov](https://codecov.io/gh/portyanikhin/PyFluids/branch/main/graph/badge.svg?token=I1LL66AOJW)](https://codecov.io/gh/portyanikhin/PyFluids)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-black)](https://github.com/psf/black)
 
-A simple, full-featured, lightweight [CoolProp](http://www.coolprop.org) wrapper for Python.
+Simple, full-featured, lightweight [CoolProp](http://www.coolprop.org) wrapper for Python.
 
 _**See [full documentation](https://github.com/portyanikhin/PyFluids).**_

{pyfluids-2.6.0 → pyfluids-2.7.2}/pyfluids/fluids/abstract_fluid.py

@@ -45,6 +45,7 @@ class AbstractFluid(ABC):
         self.__temperature: float | None = None
         self.__triple_pressure: float | None = None
         self.__triple_temperature: float | None = None
+        self.__specified_phase: Phases | None = None
         self._unit_converter: UnitConverter = UnitConverter()
         self._fraction_unit: str = (
             " %" if self.units_system == UnitsSystem.SIWithCelsiusAndPercents else ""
@@ -321,6 +322,8 @@ class AbstractFluid(ABC):
         :raises ValueError: If input is invalid.
         """
         fluid = self.factory()
+        if self.__specified_phase is not None:
+            fluid.specify_phase(self.__specified_phase)
         fluid.update(first_input, second_input)
         return fluid
 
@@ -365,24 +368,30 @@ class AbstractFluid(ABC):
         self.__surface_tension = None
         self.__temperature = None
 
-    def specify_phase(self, phase: Phases):
+    def specify_phase(self, phase: Phases) -> AbstractFluid:
         """
         Specify the phase state for all further calculations.
 
         :param phase: Phase state.
+        :return: Current fluid instance.
         """
         self._backend.specify_phase(phase.value)
+        self.__specified_phase = phase
+        return self
 
-    def unspecify_phase(self):
+    def unspecify_phase(self) -> AbstractFluid:
         """
-        Unspecify the phase state and
-        go back to calculating it based on the inputs.
+        Unspecify the phase state and go back to calculating it based on the inputs.
+
+        :return: Current fluid instance.
         """
         self._backend.unspecify_phase()
+        self.__specified_phase = None
+        return self
 
     def isentropic_compression_to_pressure(self, pressure: float) -> AbstractFluid:
         """
-        The process of isentropic compression to a given pressure.
+        The process of isentropic compression to given pressure.
 
         :param pressure: Absolute pressure [Pa].
         :return: The state of the fluid at the end of the process.
@@ -398,7 +407,7 @@ class AbstractFluid(ABC):
         self, pressure: float, isentropic_efficiency: float
     ) -> AbstractFluid:
         """
-        The process of compression to a given pressure.
+        The process of compression to given pressure.
 
         :param pressure: Absolute pressure [Pa].
         :param isentropic_efficiency: Compressor isentropic efficiency
@@ -425,7 +434,7 @@ class AbstractFluid(ABC):
 
     def isenthalpic_expansion_to_pressure(self, pressure: float) -> AbstractFluid:
         """
-        The process of isenthalpic expansion to a given pressure.
+        The process of isenthalpic expansion to given pressure.
 
         :param pressure: Absolute pressure [Pa].
         :return: The state of the fluid at the end of the process.
@@ -439,7 +448,7 @@ class AbstractFluid(ABC):
 
     def isentropic_expansion_to_pressure(self, pressure: float) -> AbstractFluid:
         """
-        The process of isentropic expansion to a given pressure.
+        The process of isentropic expansion to given pressure.
 
         :param pressure: Absolute pressure [Pa].
         :return: The state of the fluid at the end of the process.
@@ -455,7 +464,7 @@ class AbstractFluid(ABC):
         self, pressure: float, isentropic_efficiency: float
     ) -> AbstractFluid:
         """
-        The process of expansion to a given pressure.
+        The process of expansion to given pressure.
 
         :param pressure: Absolute pressure [Pa].
         :param isentropic_efficiency: Expander isentropic efficiency
@@ -484,7 +493,7 @@ class AbstractFluid(ABC):
         self, temperature: float, pressure_drop: float = 0
     ) -> AbstractFluid:
         """
-        The process of cooling to a given temperature.
+        The process of cooling to given temperature.
 
         :param temperature: Temperature
             [by default, °C; you can change this using the configuration file].
@@ -502,7 +511,7 @@ class AbstractFluid(ABC):
         self, enthalpy: float, pressure_drop: float = 0
     ) -> AbstractFluid:
         """
-        The process of cooling to a given enthalpy.
+        The process of cooling to given enthalpy.
 
         :param enthalpy: Enthalpy [J/kg].
         :param pressure_drop: Pressure drop in the heat exchanger (optional) [Pa].
@@ -519,7 +528,7 @@ class AbstractFluid(ABC):
         self, temperature: float, pressure_drop: float = 0
     ) -> AbstractFluid:
         """
-        The process of heating to a given temperature.
+        The process of heating to given temperature.
 
         :param temperature: Temperature
             [by default, °C; you can change this using the configuration file].
@@ -537,7 +546,7 @@ class AbstractFluid(ABC):
         self, enthalpy: float, pressure_drop: float = 0
     ) -> AbstractFluid:
         """
-        The process of heating to a given enthalpy.
+        The process of heating to given enthalpy.
 
         :param enthalpy: Enthalpy [J/kg].
         :param pressure_drop: Pressure drop in the heat exchanger (optional) [Pa].
@@ -552,29 +561,29 @@ class AbstractFluid(ABC):
 
     def bubble_point_at_pressure(self, pressure: float) -> AbstractFluid:
         """
-        Bubble point at a given pressure.
+        Bubble point at given pressure.
 
         :param pressure: Absolute pressure [Pa].
-        :return: Bubble point at a given pressure.
+        :return: Bubble point at given pressure.
         """
         return self.with_state(Input.pressure(pressure), Input.quality(0))
 
     def bubble_point_at_temperature(self, temperature: float) -> AbstractFluid:
         """
-        Bubble point at a given temperature.
+        Bubble point at given temperature.
 
         :param temperature: Temperature
             [by default, °C; you can change this using the configuration file].
-        :return: Bubble point at a given temperature.
+        :return: Bubble point at given temperature.
         """
         return self.with_state(Input.temperature(temperature), Input.quality(0))
 
     def dew_point_at_pressure(self, pressure: float) -> AbstractFluid:
         """
-        Dew point at a given pressure.
+        Dew point at given pressure.
 
         :param pressure: Absolute pressure [Pa].
-        :return: Dew point at a given pressure.
+        :return: Dew point at given pressure.
         """
         return self.with_state(
             Input.pressure(pressure),
@@ -585,11 +594,11 @@ class AbstractFluid(ABC):
 
     def dew_point_at_temperature(self, temperature: float) -> AbstractFluid:
         """
-        Dew point at a given temperature.
+        Dew point at given temperature.
 
         :param temperature: Temperature
             [by default, °C; you can change this using the configuration file].
-        :return: Dew point at a given temperature.
+        :return: Dew point at given temperature.
         """
         return self.with_state(
             Input.temperature(temperature),
@@ -602,12 +611,12 @@ class AbstractFluid(ABC):
         self, pressure: float, quality: float
     ) -> AbstractFluid:
         """
-        Two phase point at a given pressure.
+        Two phase point at given pressure.
 
         :param pressure: Absolute pressure [Pa].
         :param quality: Vapor quality
             [by default, %; you can change this using the configuration file].
-        :return: Two phase point at a given pressure.
+        :return: Two phase point at given pressure.
         """
         return self.with_state(Input.pressure(pressure), Input.quality(quality))
 

{pyfluids-2.6.0 → pyfluids-2.7.2}/pyfluids/humid_air/humid_air.py

@@ -242,7 +242,7 @@ class HumidAir:
         self, temperature: float, pressure_drop: float = 0
     ) -> HumidAir:
         """
-        The process of cooling without dehumidification to a given temperature.
+        The process of cooling without dehumidification to given temperature.
 
         :param temperature: Temperature
             [by default, °C; you can change this using the configuration file].
@@ -256,7 +256,7 @@ class HumidAir:
         self, enthalpy: float, pressure_drop: float = 0
     ) -> HumidAir:
         """
-        The process of cooling without dehumidification to a given enthalpy.
+        The process of cooling without dehumidification to given enthalpy.
 
         :param enthalpy: Enthalpy [J/kg].
         :param pressure_drop: Pressure drop in the heat exchanger (optional) [Pa].
@@ -270,7 +270,7 @@ class HumidAir:
     ) -> HumidAir:
         """
         The process of cooling with dehumidification
-        to a given temperature and relative humidity ratio.
+        to given temperature and relative humidity ratio.
 
         :param temperature: Temperature
             [by default, °C; you can change this using the configuration file].
@@ -292,7 +292,7 @@ class HumidAir:
     ) -> HumidAir:
         """
         The process of cooling with dehumidification
-        to a given temperature and absolute humidity ratio.
+        to given temperature and absolute humidity ratio.
 
         :param temperature: Temperature
             [by default, °C; you can change this using the configuration file].
@@ -313,7 +313,7 @@ class HumidAir:
     ) -> HumidAir:
         """
         The process of cooling with dehumidification
-        to a given enthalpy and relative humidity ratio.
+        to given enthalpy and relative humidity ratio.
 
         :param enthalpy: Enthalpy [J/kg].
         :param relative_humidity: Relative humidity ratio
@@ -334,7 +334,7 @@ class HumidAir:
     ) -> HumidAir:
         """
         The process of cooling with dehumidification
-        to a given enthalpy and absolute humidity ratio.
+        to given enthalpy and absolute humidity ratio.
 
         :param enthalpy: Enthalpy [J/kg].
         :param humidity: Absolute humidity ratio [kg/kg d.a.].
@@ -353,7 +353,7 @@ class HumidAir:
         self, temperature: float, pressure_drop: float = 0
     ) -> HumidAir:
         """
-        The process of heating to a given temperature.
+        The process of heating to given temperature.
 
         :param temperature: Temperature
             [by default, °C; you can change this using the configuration file].
@@ -369,7 +369,7 @@ class HumidAir:
         self, enthalpy: float, pressure_drop: float = 0
     ) -> HumidAir:
         """
-        The process of heating to a given enthalpy.
+        The process of heating to given enthalpy.
 
         :param enthalpy: Enthalpy [J/kg].
         :param pressure_drop: Pressure drop in the heat exchanger (optional) [Pa].
@@ -383,7 +383,7 @@ class HumidAir:
     ) -> HumidAir:
         """
         The process of humidification by water (isenthalpic)
-        to a given relative humidity ratio.
+        to given relative humidity ratio.
 
         :param relative_humidity: Relative humidity ratio
             [by default, %; you can change this using the configuration file].
@@ -398,7 +398,7 @@ class HumidAir:
     def humidification_by_water_to_absolute_humidity(self, humidity: float) -> HumidAir:
         """
         The process of humidification by water (isenthalpic)
-        to a given absolute humidity ratio.
+        to given absolute humidity ratio.
 
         :param humidity: Absolute humidity ratio [kg/kg d.a.].
         :return: The state of the humid air at the end of the process.
@@ -414,7 +414,7 @@ class HumidAir:
     ) -> HumidAir:
         """
         The process of humidification by steam (isothermal)
-        to a given relative humidity ratio.
+        to given relative humidity ratio.
 
         :param relative_humidity: Relative humidity ratio
             [by default, %; you can change this using the configuration file].
@@ -429,7 +429,7 @@ class HumidAir:
     def humidification_by_steam_to_absolute_humidity(self, humidity: float) -> HumidAir:
         """
         The process of humidification by steam (isothermal)
-        to a given absolute humidity ratio.
+        to given absolute humidity ratio.
 
         :param humidity: Absolute humidity ratio [kg/kg d.a.].
         :return: The state of the humid air at the end of the process.
@@ -474,10 +474,13 @@ class HumidAir:
             ),
             InputHumidAir.humidity(
                 (
-                    first_specific_mass_flow * first.humidity
-                    + second_specific_mass_flow * second.humidity
+                    first_specific_mass_flow * first.humidity * (1 + second.humidity)
+                    + second_specific_mass_flow * second.humidity * (1 + first.humidity)
+                )
+                / (
+                    first_specific_mass_flow * (1 + second.humidity)
+                    + second_specific_mass_flow * (1 + first.humidity)
                 )
-                / (first_specific_mass_flow + second_specific_mass_flow)
             ),
         )
 

{pyfluids-2.6.0 → pyfluids-2.7.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "pyfluids"
-version = "2.6.0"
-description = "A simple, full-featured, lightweight CoolProp wrapper for Python"
+version = "2.7.2"
+description = "Simple, full-featured, lightweight CoolProp wrapper for Python"
 authors = [
     "Vladimir Portyanikhin <v.portyanikhin@ya.ru>",
 ]
@@ -35,7 +35,6 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -54,15 +53,18 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.7, <3.13"
+python = ">=3.8, <3.13"
 CoolProp = "6.6.0"
-tomli = "2.0.1"
+tomli = "2.2.1"
 
 [tool.poetry.group.test.dependencies]
-pytest = "7.4.3"
-pytest-asyncio = "0.21.1"
-pytest-cov = "4.1.0"
+pytest = "8.3.4"
+pytest-asyncio = "0.24.0"
+pytest-cov = "5.0.0"
+
+[tool.pytest.ini_options]
+asyncio_default_fixture_loop_scope = "function"
 
 [build-system]
 requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry.core.masonry.api"