Merge branch 'master' into modernisation

Author: drunsinn

.github/workflows/black.yml

@@ -9,5 +9,5 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: psf/black@stable

.github/workflows/python-package.yml

@@ -13,14 +13,16 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/python-publish.yml

@@ -14,14 +14,17 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
+
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install setuptools wheel twine
+
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}

NEWS.txt

@@ -7,6 +7,9 @@
 * switch to pyproject.toml
 ** move file location of demo scripts
 
+## v0.4.10, 10.2025
+* @sebastiantuinstra fixed issue #19: Iteration loop in p_hrho(h, rho) used incorrect value for convergence check.
+
 ## v0.4.9, 05.2022
 * fix issue with missing unit conversion in h_px and h_tx
 * add tests for fixed bugs

README.md

@@ -4,7 +4,11 @@ pyXSteam is a Python library designed for calculating thermodynamic properties o
 
 This library was ported from the original Matlab released by Magnus Holmgren. The original can be founbd at [Sourceforge](http://xsteam.sourceforge.net) and/or <http://www.x-eng.com>.
 
-pyXSteam and XSteam provide (mostly) accurate steam and water properties from 0 - 1000 bar and from 0 - 2000 °C according to the [IAPWS release IF-97 (R7-97(2012))](http://www.iapws.org/relguide/IF97-Rev.pdf) . For accuracy of the functions in different regions see IF-97 Page 4. We take no responsibilities for any errors in the code or damage thereby!
+A .NET implementation is availible thanks to the work of rogerlew here: [XSteamNET](https://github.com/rogerlew/XSteamNET).
+
+XSteam provides (mostly) accurate steam and water properties from 0 -
+1000 bar and from 0 - 2000 °C according to the [IAPWS release IF-97](http://www.iapws.org/relguide/IF97-Rev.pdf). For
+accuracy of the functions in different regions see IF-97 Page 4
 
 Also included are functions for thermal conductivity and viscosity which are not part of R7-97(2012).
 
@@ -19,14 +23,15 @@ Some effort has been made to include the refined function of more recent release
  - IAPWS R14
 
 
-## Contributors
+## Contributors to pyXSteam
 In chronological order:
 - IAPWS
 - Magnus Holmgren
 - drunsinn
 - mohit0749
 - gonmolina
 - xjtu-blacksmith
+- sebastiantuinstra
 
 ## Documentation
 

pyXSteam/XSteam.py

@@ -347,7 +347,7 @@ def p_hrho(self, h: float, rho: float) -> float:
 
             rhos = 1 / self.v_ph(ps, h)
 
-            if last_rhos == rhos:
+            if last_rhos == rho:
                 self.logger.warning(
                     "p_hrho stopped iterating after %d steps because values did not converge for input values h %f and rho %f",
                     step_counter,