Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernisation of pyXSteam #13

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
4476d74
add type hints
drunsinn May 23, 2022
5bc5d4f
change import of constant values
drunsinn May 23, 2022
f6f6139
convert unit system and ice type to enum
drunsinn May 23, 2022
db89e40
enum for diagram region, change imports
drunsinn May 23, 2022
3008da3
add constant for freezing point
drunsinn May 24, 2022
b1d8f50
replace constant values
drunsinn May 24, 2022
5a660fd
add sphinx autodoc typehints to config
drunsinn May 24, 2022
348a5e6
update docstrings - batch 1
drunsinn May 24, 2022
ae42204
update docstrings - batch 2
drunsinn May 24, 2022
b75890b
update docstrings - batch 3
drunsinn May 24, 2022
00f9ba9
update docstrings - batch 4
drunsinn May 24, 2022
1a68079
Merge branch 'master' into modernisation
drunsinn May 24, 2022
e5ff6dd
formating
drunsinn May 24, 2022
0757645
fix error in sphinx config
drunsinn May 24, 2022
d735134
re add values for for backward compatibility
drunsinn May 24, 2022
1b947cf
Merge branch 'master' into modernisation
drunsinn May 25, 2022
3e59e3b
update setup.py
drunsinn May 25, 2022
b37154d
Merge branch 'master' into modernisation
drunsinn May 25, 2022
947ed8a
format demo outputs
drunsinn May 25, 2022
5e84135
rename constant values
drunsinn May 25, 2022
9117be4
Update NEWS.txt
drunsinn May 25, 2022
56aa89f
Merge branch 'master' into modernisation
drunsinn Jan 9, 2023
f63a879
remove TODO comments, formating
drunsinn Jan 9, 2023
7266028
add logging to R14 and R4
drunsinn Mar 30, 2023
e7ac6b1
add default value for IceType
drunsinn Mar 30, 2023
6388820
use default logger names again
drunsinn Mar 31, 2023
94b8983
add first test implementation for R12
drunsinn Mar 31, 2023
d2d23ff
add test for surface tension
drunsinn Mar 31, 2023
59f0c0a
add calculation for surface tension of D2O
drunsinn Mar 31, 2023
6d53413
add surface tention accesible and make unit converter private
drunsinn Mar 31, 2023
f8abba2
spelling and docstrings
drunsinn Mar 31, 2023
2ca0996
formating with black
drunsinn Mar 31, 2023
5fa75c8
convert static methods to class methods for easier logging
drunsinn Mar 31, 2023
a81da00
fix linter warnings about unbound values
drunsinn Mar 31, 2023
e857c66
update github actions
drunsinn Mar 31, 2023
b674355
update github actions
drunsinn Mar 31, 2023
25c1545
Merge branch 'modernisation' of github.com:drunsinn/pyXSteam into mod…
drunsinn Apr 15, 2023
9bd5c89
merge logging and format changes
drunsinn Dec 16, 2023
60cb650
update github actions
drunsinn Dec 16, 2023
7db0df1
switch to pyproject.toml
drunsinn Dec 16, 2023
a513e4f
update formating
drunsinn Dec 16, 2023
df8c695
code formating
drunsinn Dec 16, 2023
6fc9b39
Update NEWS.txt
drunsinn Dec 16, 2023
4cef8bb
remove python3.7 from package action
drunsinn Dec 16, 2023
a700980
add python 3.12 to test matrix
drunsinn Dec 17, 2023
3280924
add tests
drunsinn Oct 15, 2024
7c27d43
update method names
drunsinn Oct 15, 2024
ee7f87e
add equations for meta stable region 2
drunsinn Oct 20, 2024
f863c1b
Merge branch 'chap6.2_metastable' into modernisation
drunsinn Oct 20, 2024
0f07f18
start moving common coefficients from method to class
drunsinn Oct 20, 2024
6f8ffce
extract some common lists and consts
drunsinn Dec 15, 2024
b18cc32
start changing from enumerate to zip
drunsinn Dec 15, 2024
1053aec
remove repeated reassignment of const
drunsinn Dec 15, 2024
a255949
move values for sub Tph ref 2004
drunsinn Dec 15, 2024
1da75da
finish change over to central tables
drunsinn Dec 16, 2024
6cdfc7a
docstrings, formating and spelling
drunsinn Dec 16, 2024
29066af
var names
drunsinn Dec 16, 2024
379b5c3
docstrings and linting
drunsinn Dec 18, 2024
e2b27bc
migrate IAPWS R7-97(2012) tables
drunsinn Dec 25, 2024
1df61e9
rename tables, migrate IAPWS SR4-04(2014)
drunsinn Dec 26, 2024
6da58ce
migrate IAPWS SR2-01(2014)
drunsinn Dec 26, 2024
84a2fdc
migrate table IAPWS SR3-03(2014)
drunsinn Dec 27, 2024
35842f2
add equations for sub region borders
drunsinn Dec 28, 2024
ca1a73c
add fixed value in region and use border function
drunsinn Dec 28, 2024
77dc526
check/updates tests from R7-97
drunsinn Dec 28, 2024
d4051fc
add tests for region border functions
drunsinn Dec 28, 2024
21554e4
replace magic value with ref to table
drunsinn Dec 28, 2024
ddee0f1
rework tests for SR2-01, extract function for boundary eq
drunsinn Dec 28, 2024
86d9a14
rewort tests for SR3-03, new border function, new tests and new const
drunsinn Dec 28, 2024
cf2c224
rework Tests for SR4-04, new tests for border function
drunsinn Dec 29, 2024
abd33d6
fix calculations for metastable region by adressing note on table 10
drunsinn Dec 30, 2024
80836bf
styling, remove unnecessary text
drunsinn Dec 30, 2024
978d714
continue rework on tests, extract parameters
drunsinn Dec 30, 2024
0662505
pylint warning
drunsinn Dec 30, 2024
cb674a3
spelling
drunsinn Dec 30, 2024
531768e
make pylint more aggressiv
drunsinn Dec 30, 2024
c2ec8c7
update docstrings
drunsinn Dec 30, 2024
d4a63bb
modify and fix tests for surface tension for regular and heavy water
drunsinn Dec 31, 2024
036a88f
fix misplaced decimal in mks test
drunsinn Dec 31, 2024
c186c91
formating and spelling
drunsinn Dec 31, 2024
1bec4d2
begin move of transport properties
drunsinn Jan 6, 2025
ac01bca
deprecate R4
drunsinn Jan 6, 2025
000cbc6
simplify and styling
drunsinn Jan 6, 2025
6d4455d
rework sphinx setup, update documentation
drunsinn Jan 6, 2025
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
4 changes: 0 additions & 4 deletions .codespellrc

This file was deleted.

4 changes: 1 addition & 3 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: psf/black@stable
with:
options: "--verbose"
16 changes: 6 additions & 10 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,23 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest
python -m pip install pytest
python -m pip install numpy
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install .
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --ignore=C901,E201,E203,E501,N801,N802,N803,N806,E241 --exit-zero --max-complexity=10 --max-line-length=127 --statistics

- name: Test with pytest
run: |
pytest
6 changes: 3 additions & 3 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Install dependencies
Expand All @@ -27,5 +27,5 @@ jobs:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
pip wheel -w dist .
twine upload dist/*
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,4 @@ venv.bak/
*.todo
/extern_docs
.vscode/
docs/source/README.md
Loading
Loading