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

Addition of additive coagulation example including comparison against PySDM and Droplets.jl #376

Merged
merged 43 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
785eb5a
added additive notebook example
jcurtis2 Aug 11, 2023
c599a60
bump pybind11_json version (#274)
slayoo Aug 16, 2023
95fc7ab
first draft of PySDM figure in the additive-kernel notebook
slayoo Aug 29, 2023
37d36a1
add comparison plot of size distributions
jcurtis2 Dec 7, 2023
1d64e1b
Merge remote-tracking branch 'jeff/additive_example' into golovin_pysdm
emmacware Oct 15, 2024
a81511b
compliance with current PySDM and PyPartMC API
emmacware Oct 15, 2024
d7517f8
draft droplets.jl addition
emmacware Nov 22, 2024
f5a1a88
binning method fix
emmacware Nov 22, 2024
b34e4b5
Shima et. al. 2009 Settings
emmacware Dec 4, 2024
d602f08
setting kernel coefficient to match Shima's paper; add TODO for asserts
emmacware Dec 6, 2024
7310b51
bump PartMC submodule
emmacware Dec 6, 2024
ce9c623
expose additive kernel coefficient property in Python
emmacware Dec 6, 2024
3f8b44f
forlint cooperation
emmacware Dec 6, 2024
aa16e1c
Merge branch 'bump_partmc' into golovin_pysdm
emmacware Dec 6, 2024
0917ee6
Run Class
emmacware Dec 17, 2024
74e2cc9
make pylint happy(er)
emmacware Dec 19, 2024
638255d
add setup-julia action
slayoo Dec 22, 2024
93ec020
Merge branch 'main' into golovin_pysdm
slayoo Dec 23, 2024
f2f261b
pin droplets.jl version to commit id
slayoo Dec 30, 2024
6541f7b
enable debug ssh access
slayoo Dec 30, 2024
e965d06
split lines
slayoo Dec 30, 2024
cebeda4
Notebook description, disable windows for julia
emmacware Jan 9, 2025
1c326e9
Merge branch 'golovin_pysdm' of github.com:emmacware/PyPartMC into go…
emmacware Jan 9, 2025
cdad76c
recomment ssh access
emmacware Jan 9, 2025
d06563d
comments,cleanups,refactors,new droplets.jl, plot fine tuning...every…
emmacware Jan 23, 2025
c18b1ae
pylint compliance
emmacware Jan 24, 2025
7399d6b
relax mass conservation assert
emmacware Jan 24, 2025
fce350d
ReadME buttons, flag for Adaptive
emmacware Jan 28, 2025
68ba72e
temporary readme pathurl
emmacware Jan 28, 2025
0803e16
add PySDM colab
emmacware Jan 28, 2025
20240c7
try julia colab message
emmacware Jan 28, 2025
90aa405
si units until plotting
emmacware Jan 29, 2025
6f599fc
julia install for colab/binder
emmacware Jan 29, 2025
41c09e5
rewrote to have less julia dependancies
emmacware Jan 29, 2025
06f063a
colab julia
emmacware Jan 29, 2025
e1f171e
add Emma to project credits in .zenodo.json
slayoo Jan 30, 2025
5d43269
add which julia logic, point readme badges to main
emmacware Jan 30, 2025
e7b85dd
Merge remote-tracking branch 'upstream/main' into golovin_pysdm
emmacware Jan 30, 2025
4922dd7
pylint shutil fix
emmacware Jan 30, 2025
51abd46
skip Julia setup for CI workflow (which will also disable the Julia r…
slayoo Jan 30, 2025
da6fd93
ssh access for failure
emmacware Jan 31, 2025
7818266
remove Plots reference
emmacware Jan 31, 2025
b2a9ae0
no system memory print
emmacware Jan 31, 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
14 changes: 9 additions & 5 deletions .github/workflows/tests+pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ jobs:
for i in dist/*.whl; do python -m pip install $PIP_INSTALL_OPTS $i[tests]; done;
python -m pip show --verbose PyPartMC

- uses: julia-actions/setup-julia@v2
with:
version: '1.11'

### make sure PyPartMC is not picked up from a local folder
- run: |
cd tests
Expand All @@ -205,11 +209,11 @@ jobs:
python -m pip install $PIP_INSTALL_OPTS -r .binder/requirements.txt
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} python -m pytest --durations=10 -v -s -We -p no:unraisableexception gitmodules/devops_tests

### uncomment to gain ssh access in case of failure
# - if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3
# with:
# limit-access-to-actor: true
## uncomment to gain ssh access in case of failure
# - if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3
# with:
# limit-access-to-actor: true

dist_check:
runs-on: ubuntu-latest
Expand Down
6 changes: 5 additions & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
"affiliation": "University of Illinois Urbana-Champaign",
"name": "Vaishnav, Akshunna"
},
{
"affiliation": "University of California, Davis, CA, USA",
"name": "Ware, Emma"
},
{
"affiliation": "University of Illinois Urbana-Champaign",
"name": "Riemer, Nicole",
Expand All @@ -40,4 +44,4 @@
],
"license": "GPL-3.0-only",
"upload_type": "software"
}
}
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ Note: clicking the badges below redirects to cloud-computing platforms. The mybi
[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PyPartMC/blob/main/examples/cloud_parcel.ipynb)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PyPartMC.git/main?urlpath=lab/tree/examples/cloud_parcel.ipynb)
[![ARM JupyterHub](https://img.shields.io/static/v1?label=launch%20in&logo=jupyter&color=lightblue&message=ARM+JupyterHub)](https://jupyterhub.arm.gov/hub/user-redirect/git-pull?repo=https%3A//github.com/open-atmos/PyPartMC&branch=main&urlPath=)
- Coagulation Model Intercomparison with PySDM, Droplets.jl:
[![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos//PyPartMC/blob/main/examples/additive_coag_comparison.ipynb)
[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PyPartMC/blob/main/examples/additive_coag_comparison.ipynb)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PyPartMC.git/main?urlpath=lab/tree/examples/additive_coag_comparison.ipynb)
[![ARM JupyterHub](https://img.shields.io/static/v1?label=launch%20in&logo=jupyter&color=lightblue&message=ARM+JupyterHub)](https://jupyterhub.arm.gov/hub/user-redirect/git-pull?repo=https%3A//github.com/open-atmos/PyPartMC&branch=main&urlPath=)

## Features

Expand Down
Loading
Loading