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

comparison against trixi via 2d advection #454

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9c38b9b
init commit
pawelmagnu Sep 8, 2024
4ced6f2
comparison against trixi in 2d advection
pawelmagnu Sep 8, 2024
bad68c2
add meshio to workflow
pawelmagnu Sep 8, 2024
6ad8e93
add imegeio to workflow
pawelmagnu Sep 8, 2024
e335216
solution path fix
pawelmagnu Sep 8, 2024
24e299c
pylint
pawelmagnu Sep 8, 2024
cce03cb
more verbose exception
pawelmagnu Sep 8, 2024
4d0c56a
more verbose exception, fix output file path
pawelmagnu Sep 9, 2024
76a0328
more verbose exception, fix output file path
pawelmagnu Sep 9, 2024
2ad7990
path to solution fix
pawelmagnu Sep 9, 2024
a6a9c6f
path to solution fix; tmax fix
pawelmagnu Sep 9, 2024
9943188
move omega and min max coordinates to config
pawelmagnu Sep 14, 2024
0ab0152
update tests to main
pawelmagnu Sep 28, 2024
5d13afa
update tests to main 2
pawelmagnu Sep 28, 2024
cdd3d5a
Update tests+pypi.yml
pawelmagnu Sep 28, 2024
4cc0d4d
Merge branch 'open-atmos:main' into trixi_comparison
pawelmagnu Sep 28, 2024
496bd36
Merge branch 'open-atmos:main' into trixi_comparison
pawelmagnu Oct 2, 2024
1448102
Merge branch 'open-atmos:main' into trixi_comparison
pawelmagnu Oct 6, 2024
b5812d9
add explanation on the examples; changed paths to outputs
pawelmagnu Oct 10, 2024
d9e1e69
add Julia setup step
slayoo Oct 13, 2024
47d9443
add debug statement
slayoo Oct 13, 2024
c36f7e6
add debug flags to pytest
slayoo Oct 13, 2024
24b208d
one more debug statement
slayoo Oct 14, 2024
4438781
change pytest flag
slayoo Oct 14, 2024
6a4e76e
add subprocesses to julia code
pawelmagnu Oct 15, 2024
8aee59a
Merge branch 'open-atmos:main' into trixi_comparison
pawelmagnu Oct 17, 2024
907c0a6
add more debug info to notebook
pawelmagnu Oct 17, 2024
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
5 changes: 4 additions & 1 deletion .github/workflows/tests+pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,16 @@ jobs:
cd ../../../
rm -rf libmpdataxx

- uses: julia-actions/setup-julia@v2
- run: julia --version

# https://github.com/numba/numba/issues/6350#issuecomment-728174860
- if: matrix.platform == 'ubuntu-latest'
run: echo NUMBA_THREADING_LAYER=omp >> $GITHUB_ENV

- env:
NUMBA_OPT: 1
run: python -m pytest --durations=10 -p no:unraisableexception -We tests/devops_tests/test_notebooks.py
run: python -m pytest -rP -vv --durations=10 -p no:unraisableexception -We tests/devops_tests/test_notebooks.py

- if: ${{ matrix.platform == 'ubuntu-latest' && matrix.python-version == '3.11'}}
run: |
Expand Down
627 changes: 627 additions & 0 deletions examples/PyMPDATA_examples/trixi_comparison/advection_comparison.ipynb
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need assert SETUP["nx"] == SETUP["ny"]?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the way converting vtu to numpy array works only supports square matrices

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's then comment it with a GitHub issue URL!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'll try to fix my code to support rectangular size

pawelmagnu marked this conversation as resolved.
Show resolved Hide resolved
pawelmagnu marked this conversation as resolved.
Show resolved Hide resolved
pawelmagnu marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the plot is not visible on GitHub in the notebook

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions examples/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ def get_long_description():
"scipy",
"pint",
"joblib",
"h5py",
"sympy",
"imageio",
"meshio",
],
author="https://github.com/open-atmos/PyMPDATA/graphs/contributors",
license="GPL-3.0",
Expand Down
Loading