Skip to content

Commit

Permalink
new example: buoyant-bubble with a Boussinesq system (velocity extrap…
Browse files Browse the repository at this point in the history
…olation in time + pressure solver) (AGH eng. project by Michał Kowalczyk @Caastlefox) (#495)

Co-authored-by: Caastlefox <[email protected]>
Co-authored-by: Castlefox <[email protected]>
  • Loading branch information
3 people authored Jan 29, 2025
1 parent ddecbf2 commit e401d7e
Show file tree
Hide file tree
Showing 10 changed files with 839 additions and 12 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
- run: |
python -m pip install $PIP_INSTALL_ARGS -e . # to check if usable without test/example dependencies
python -We -c "import PyMPDATA"
python -m pip install $PIP_INSTALL_ARGS -e .[tests] ./examples
python -m pip install $PIP_INSTALL_ARGS -e .[tests] -e ./examples
# https://github.com/numba/numba/issues/6350#issuecomment-728174860
- if: startsWith(matrix.platform, 'ubuntu-')
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- run: python -m pip install $PIP_INSTALL_ARGS -e .[tests] ./examples
- run: python -m pip install $PIP_INSTALL_ARGS -e .[tests] -e ./examples
- run: python -m pip install $PIP_INSTALL_ARGS -r tests/devops_tests/requirements.txt
- if: matrix.platform == 'ubuntu-latest'
run: |
Expand Down Expand Up @@ -189,6 +189,7 @@ jobs:
run: |
mkdir -p /home/runner/work/_temp/_github_home/figures
rm /tmp/pytest-of-runner/pytest-current/test_run_notebooks_examples_Pycurrent
mv /tmp/pytest-of-runner/pytest-current/test_run_notebooks_examples_*/boussinesq_2d_anim.gif /home/runner/work/_temp/_github_home/figures
mv /tmp/pytest-of-runner/pytest-current/test_run_notebooks_examples_*/fig_4.svg /home/runner/work/_temp/_github_home/figures
mv /tmp/pytest-of-runner/pytest-current/test_run_notebooks_examples_*/advection_diffusion.gif /home/runner/work/_temp/_github_home/figures
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,4 @@ cython_debug/
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/
.idea/
14 changes: 7 additions & 7 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,8 @@
"name": "Drenda, Szymon"
},
{
"affiliation": "Jagiellonian University, Kraków, Poland",
"name": "Manna, Maciej"
},
{
"affiliation": "Jagiellonian University, Kraków, Poland",
"name": "Olesik, Michael",
"orcid": "0000-0002-6319-9358"
"affiliation": "AGH University of Krakow, Poland",
"name": "Michał Kowalczyk"
},
{
"affiliation": "AGH University of Krakow, Poland",
Expand All @@ -42,6 +37,11 @@
"affiliation": "Jagiellonian University, Kraków, Poland",
"name": "Manna, Maciej"
},
{
"affiliation": "Jagiellonian University, Kraków, Poland",
"name": "Olesik, Michael",
"orcid": "0000-0002-6319-9358"
},
{
"affiliation": "Jagiellonian University, Kraków, Poland",
"name": "Rozwoda, Paweł"
Expand Down
22 changes: 20 additions & 2 deletions docs/bibliography.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"https://doi.org/10.1006/jcph.1998.5901": {
"usages": [
"README.md",
"docs/markdown/pympdata_landing.md"
"docs/markdown/pympdata_landing.md",
"examples/PyMPDATA_examples/Jaruga_et_al_2015/fig19.ipynb"
],
"label": "Smolarkiewicz & Margolin 1998 (J. Comp. Phys. 140)",
"title": "MPDATA: A Finite-Difference Solver for Geophysical Flows"
Expand Down Expand Up @@ -112,7 +113,9 @@
"usages": [
"docs/markdown/pympdata_landing.md",
"examples/PyMPDATA_examples/Molenkamp_test_as_in_Jaruga_et_al_2015_Fig_12/demo.ipynb",
"examples/PyMPDATA_examples/Molenkamp_test_as_in_Jaruga_et_al_2015_Fig_12/__init__.py"
"examples/PyMPDATA_examples/Molenkamp_test_as_in_Jaruga_et_al_2015_Fig_12/__init__.py",
"tests/smoke_tests/jaruga_et_al_2015/test_boussinesq.py",
"examples/PyMPDATA_examples/Jaruga_et_al_2015/fig19.ipynb"
],
"label": "Jaruga et al. 2015 (Geosci. Model Dev. 8)",
"title": "libmpdata++ 1.0: a library of parallel MPDATA solvers for systems of generalised transport equations "
Expand Down Expand Up @@ -153,5 +156,20 @@
],
"label": "Molenkamp 1968 (J. Appl. Meteorol. Climatol. 7)",
"title": "Accuracy of Finite-Difference Methods Applied to the Advection Equation"
},
"https://osti.gov/biblio/785403": {
"usages": [
"examples/PyMPDATA_examples/Jaruga_et_al_2015/fig19.ipynb"
],
"label": "Smolarkiewicz & Margolin 2000 (LANL report)",
"title": "Variational methods for elliptic problems in fluid models"
},
"https://doi.org/10.1175/1520-0469(1992)049%3C2082:ACOSLA%3E2.0.CO;2": {
"usages": [
"examples/PyMPDATA_examples/Jaruga_et_al_2015/fig19.ipynb",
"tests/smoke_tests/jaruga_et_al_2015/test_boussinesq.py"
],
"label": "Smolarkiewicz and Pudykiewicz 1992 (J. Atmos. Sci. 49)",
"title": "A Class of Semi-Lagrangian Approximations for Fluids"
}
}
1 change: 1 addition & 0 deletions docs/templates/index.html.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<h2>What is PyMPDATA?</h2>
<p>
<img align="right" src="https://github.com/open-atmos/PyMPDATA-MPI/releases/download/latest-generated-plots/n_iters.3_rank_0_size_1_c_field_.0.5.0.25._mpi_dim_0_n_threads_3-CartesianScenario-anim.gif">
<img align="right" src="https://github.com/open-atmos/PyMPDATA/releases/download/tip/boussinesq_2d_anim.gif">
PyMPDATA is a <b><a href="https://numba.pydata.org">Numba-accelerated</a></b> <mark>multi-threaded</mark> Pythonic implementation of the
<b>MPDATA algorithm</b> of <a href="https://doi.org/10.1016/0021-9991(84)90121-9">Smolarkiewicz et al.</a> used in
<mark>geophysical fluid dynamics</mark> and beyond for
Expand Down
Empty file.
Loading

0 comments on commit e401d7e

Please sign in to comment.