Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
777c8bd
first pass at linking camp
jcurtis2 Jun 6, 2024
8507274
update to pass file path
jcurtis2 Jul 3, 2024
d4f6094
add example
jcurtis2 Jul 3, 2024
a582055
add missing camp_core
jcurtis2 Aug 26, 2024
36eccb3
update camp notebook. remove a few json files
jcurtis2 Sep 10, 2024
203a468
remove more json files
jcurtis2 Sep 11, 2024
250a167
remove more currently unused json files
jcurtis2 Sep 11, 2024
a1e7d7d
update notebook
jcurtis2 Sep 11, 2024
25e92c9
embedding cloud_and_rain_partitioning.json in the notebook
slayoo Sep 24, 2024
a9d8cb4
shorter lines for pylint
slayoo Sep 25, 2024
e5140ac
yaml fix
slayoo Sep 25, 2024
e341821
refactors in initialisation, timestepping and plotting code
slayoo Oct 19, 2024
1c81b3b
moving monarch_mod37/cb05_abs_tol.json into the notebook
slayoo Oct 19, 2024
15b0a97
moving monarch_mod37/cb05_mechanism_without_R142_R143.json into the n…
slayoo Oct 19, 2024
d73e26e
fetching json files from CAMP repo
slayoo Oct 20, 2024
3d950d7
addressing pylint hints
slayoo Oct 20, 2024
d388c53
fix var name
slayoo Oct 20, 2024
78167ae
replace TODOs with TO-DOs in CAMP json files to trick our devops tests
slayoo Oct 20, 2024
16629d0
remove leftover files; workaround TODO label warning from TODO-label …
slayoo Oct 20, 2024
686a4a2
trick pylint...
slayoo Oct 20, 2024
fe3536d
enable debug ssh access
slayoo Oct 25, 2024
bdfef62
Merge remote-tracking branch 'upstream/main' into HEAD
slayoo Oct 25, 2024
70de37c
disable tmate
slayoo Nov 5, 2024
e8083de
try putting CampCore ctors first?
slayoo Nov 5, 2024
3092156
check if differentiating by number of args would help?
slayoo Nov 8, 2024
3fa5ed8
add basic test for Photolysis ctor
slayoo Nov 8, 2024
921cb22
address pylint comment
slayoo Nov 8, 2024
cc4aa22
Merge branch 'main' into camp
slayoo Apr 22, 2025
a557a9e
Merge branch 'main' into camp
slayoo Apr 23, 2025
2d35004
Merge branch 'main' into camp
slayoo Aug 26, 2025
f5cde81
trick urlcheck; regenerated CAMP notebook
slayoo Aug 26, 2025
aa0f35e
add a basic unit test for CampCore ctor
slayoo Aug 26, 2025
863cff4
remove the json AeroData::__init__ argument in the CAMP version of th…
slayoo Aug 26, 2025
5a4cb95
add ctor tests for camp case for aero_data and gas_data
jcurtis2 Aug 27, 2025
82f3651
set to skip camp tests for wheel install
jcurtis2 Aug 27, 2025
440f18b
minor format and add missing import
jcurtis2 Aug 27, 2025
2f7e466
skip notebook badge URL checks from urlcheck job
slayoo Aug 27, 2025
79f46f9
skip the CAMP notebook test on Windows
slayoo Aug 27, 2025
75934f4
improving test coverage for CAMP
slayoo Aug 27, 2025
a3547e1
fix run_part CAMP test
jcurtis2 Aug 27, 2025
215d93f
address pylint hint; add assertion
slayoo Aug 28, 2025
6d6b698
refactor weigh checks and conversion
slayoo Aug 28, 2025
3f06dbd
add coverage for timeblock and timestep variants
slayoo Aug 28, 2025
b9c0c3c
add test for unknown weight type for aero_state with camp
jcurtis2 Aug 28, 2025
2f91dd2
attempt to improve code coverage in test_run_part
jcurtis2 Aug 28, 2025
9353498
address pylint hint
slayoo Aug 28, 2025
462910d
fix workflow
slayoo Aug 28, 2025
ef1700b
add mention of the CAMP notebook in README
slayoo Aug 28, 2025
f579aee
fix URLs in README
slayoo Aug 28, 2025
bcf258c
cleanup
slayoo Aug 28, 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
6 changes: 5 additions & 1 deletion .github/workflows/buildwheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,17 @@ jobs:
run: |
brew reinstall gcc

# TODO #440
- if: startsWith(matrix.os, 'windows-')
run: echo 'PYTEST_SKIP_ARGS=-k "not camp"' >> $GITHUB_ENV

- run: |
temp=`find dist/ -name "*cp313*.whl"`
python -m pip install $temp[examples]
ex -sc 'g/^PyPartMC/d' -cx .binder/requirements.txt
python -m pip install --force-reinstall --no-deps $PIP_INSTALL_OPTS -r .binder/requirements.txt
python -m pip install $PIP_INSTALL_OPTS -r gitmodules/devops_tests/requirements.txt
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} python -m pytest --durations=10 -v -s -We -p no:unraisableexception gitmodules/devops_tests/test_run_notebooks.py
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} python -m pytest --durations=10 ${{ env.PYTEST_SKIP_ARGS }} -v -s -We -p no:unraisableexception gitmodules/devops_tests/test_run_notebooks.py

check_annotated_todos:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/urlcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
timeout: 7
retry_count: 3
exclude_urls: https://www.gnu.org/licenses/gpl-3.0.en.html,https://www.gnu.org/licenses/gpl-3.0.html,https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
exclude_patterns: http://purl.org,http://www.w3.org
exclude_patterns: http://purl.org,http://www.w3.org,https://github.com/open-atmos/PyPartMC/blob/main/examples/
exclude_files: .github/workflows/urlcheck.yml
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,15 @@ pip install PyPartMC[examples]
[![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 for additive (Golovin) kernel with: PyPartMC, [PySDM](https://open-atmos.github.io/PySDM), [Droplets.jl](https://github.com/emmacware/droplets.jl) and [dustpy](https://stammler.github.io/dustpy/):
[![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)
[![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=)
- Particle simulation with multiphase chemistry handled using [CAMP](https://doi.org/10.5194/gmd-15-3663-2022) (without coagulation):
[![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/particle_simulation_with_camp.ipynb.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/particle_simulation_with_camp.ipynb)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PyPartMC.git/main?urlpath=lab/tree/examples/particle_simulation_with_camp.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