PySDM 2.121__tar.gz → 2.122__tar.gz

{pysdm-2.121 → pysdm-2.122}/.github/workflows/tests.yml

@@ -76,17 +76,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: pytest  ${{ env.pytest_options }} -k "not test_run_notebooks" tests/devops_tests
 
-  zenodo_json:
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4.1.6
-      - uses: notiz-dev/github-action-json-property@release
-        with:
-          path: '.zenodo.json'
-          prop_path: 'creators'
-
   nojit_and_codecov:
-    needs: [precommit, pylint, devops, zenodo_json]
+    needs: [precommit, pylint, devops]
     runs-on: ubuntu-24.04
     env:
       NUMBA_DISABLE_JIT: 1
@@ -286,7 +277,7 @@ jobs:
           rm /tmp/pytest/test_run_notebooks_*current
           ls /tmp/pytest/test_run_notebooks_*/
           ls /tmp/pytest/test_run_notebooks_*/output/
-          ffmpeg -i /tmp/pytest/test_run_notebooks_*/output/docs_intro_animation.ogv $HOME/work/_temp/_github_home/figures/docs_intro_animation_${{ matrix.platform }}.mp4
+          ffmpeg -i /tmp/pytest/test_run_notebooks_*/output/docs_intro_animation.ogv -loop 0 -vf "fps=10,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse" $HOME/work/_temp/_github_home/figures/docs_intro_animation_${{ matrix.platform }}.gif
           mv /tmp/pytest/test_run_notebooks_*/output/last_animation_frame.pdf $HOME/work/_temp/_github_home/figures/last_animation_frame_${{ matrix.platform }}.pdf
           ls $HOME/work/_temp/_github_home/figures
 
@@ -294,21 +285,21 @@ jobs:
         if: ( ! startsWith(matrix.platform, 'windows-') ) && matrix.test-suite == env.anim_test-suite && matrix.python-version == env.anim_python-version
         uses: actions/upload-artifact@v4
         with:
-          name: animation-movie
+          name: animation-movie-${{ matrix.platform }}
           if-no-files-found: error
-          path: ~/work/_temp/_github_home/figures/*.mp4
+          path: ~/work/_temp/_github_home/figures/*.gif
 
       - name: animation frame upload
         if: ( ! startsWith(matrix.platform, 'windows-') ) && matrix.test-suite == env.anim_test-suite && matrix.python-version == env.anim_python-version
         uses: actions/upload-artifact@v4
         with:
-          name: animation-frame
+          name: animation-frame-${{ matrix.platform }}
           if-no-files-found: error
           path: ~/work/_temp/_github_home/figures/*.pdf
 
       - name: tip release upload
-        if: github.ref == 'refs/heads/main' && ( ! startsWith(matrix.platform, 'windows-') ) && matrix.test-suite == env.anim_test-suite && matrix.python-version == env.anim_python-version
+        if: github.ref == 'refs/heads/main' && ( startsWith(matrix.platform, 'ubuntu-') ) && matrix.test-suite == env.anim_test-suite && matrix.python-version == env.anim_python-version
         uses: eine/tip@master
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          files: /*(home|Users)/runner/work/_temp/_github_home/figures/*.mp4
+          files: /github/home/figures/*.gif

{pysdm-2.121 → pysdm-2.122}/.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-files: '.py'
+files: '.py|.json'
 exclude: '.git'
 default_stages: [pre-commit]
 
@@ -18,4 +18,6 @@ repos:
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
-      - id: debug-statements
+      - id: debug-statements
+      - id: check-json
+        files: '.json'

{pysdm-2.121 → pysdm-2.122}/.zenodo.json

@@ -41,7 +41,7 @@
     },
     {
       "affiliation": "California Institute of Technology, Pasadena, CA, USA",
-      "name": "Croci, Caterina" 
+      "name": "Croci, Caterina"
     },
     {
       "affiliation": "California Institute of Technology, Pasadena, CA, USA",

{pysdm-2.121 → pysdm-2.122}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm
-Version: 2.121
+Version: 2.122
 Summary: Pythonic particle-based (super-droplet) warm-rain/aqueous-chemistry cloud microphysics package with box, parcel & 1D/2D prescribed-flow examples in Python, Julia and Matlab
 Author-email: "https://github.com/open-atmos/PySDM/graphs/contributors" <sylwester.arabas@agh.edu.pl>
 License-Expression: GPL-3.0-only

{pysdm-2.121 → pysdm-2.122}/docs/bibliography.json

@@ -1,7 +1,8 @@
 {
   "https://doi.org/10.1007/978-1-935704-36-2_1": {
     "usages": [
-      "examples/docs/pysdm_examples_landing.md"
+      "examples/docs/pysdm_examples_landing.md",
+      "examples/PySDM_examples/utils/kinematic_2d/__init__.py"
     ],
     "label": "Kessler 1969 (Meteorol. Monogr. 10)",
     "title": "On the Distribution and Continuity of Water Substance in Atmospheric Circulations"
@@ -87,9 +88,9 @@
   "https://doi.org/10.1175/JAS3980": {
     "usages": [
       "examples/docs/pysdm_examples_landing.md",
-      "examples/PySDM_examples/Morrison_and_Grabowski_2007/fig_2.ipynb",
-      "examples/PySDM_examples/Morrison_and_Grabowski_2007/fig_3.ipynb",
-      "examples/PySDM_examples/Morrison_and_Grabowski_2007/__init__.py"
+      "examples/PySDM_examples/utils/kinematic_2d/__init__.py",
+      "examples/PySDM_examples/Morrison_and_Grabowski_2007/__init__.py",
+      "examples/PySDM_examples/Morrison_and_Grabowski_2007/fig_1.ipynb"
     ],
     "label": "Morrison & Grabowski 2007 (J. Atmos. Sci. 64)",
     "title": "Comparison of Bulk and Bin Warm-Rain Microphysics Models Using a Kinematic Framework"
@@ -255,7 +256,8 @@
       "examples/docs/pysdm_examples_landing.md",
       "examples/PySDM_examples/Arabas_et_al_2015/gui.ipynb",
       "PySDM/dynamics/displacement.py",
-      "PySDM/physics/particle_advection/implicit_in_space.py"
+      "PySDM/physics/particle_advection/implicit_in_space.py",
+      "examples/PySDM_examples/utils/kinematic_2d/__init__.py"
     ],
     "label": "Arabas et al. 2015 (Geosci. Model Dev. 2015)",
     "title": "libcloudph++ 1.0: a single-moment bulk, double-moment bulk, and particle-based warm-rain microphysics library in C++"
@@ -571,16 +573,6 @@
     "label": "Barkan & Luz 2005 (Rapid Commun. Mass Spectrom. 19)",
     "title": "High precision measurements of <sup>17</sup>O/<sup>16</sup>O and <sup>18</sup>O/<sup>16</sup>O ratios in H<sub>2</sub>O"
   },
-  "https://doi.org/10.1029/JC080i009p01133": {
-    "usages": [
-      "PySDM/physics/isotope_diffusivity_ratios/stewart_1975.py",
-      "PySDM/physics/isotope_kinetic_fractionation_factors/jouzel_and_merlivat_1984.py",
-      "examples/PySDM_examples/Stewart_1975/__init__.py",
-      "examples/PySDM_examples/Stewart_1975/fig_1.ipynb"
-    ],
-    "label": "Stewart 1975 (J. Geophys. Res. Oceans 80)",
-    "title": "Stable isotope fractionation due to evaporation and isotopic exchange of falling waterdrops: Applications to atmospheric processes and evaporation of lakes"
-  },
   "https://doi.org/10.1175/1520-0469(1982)039%3C1317:ASMOPC%3E2.0.CO;2": {
     "usages": [
       "examples/docs/pysdm_examples_landing.md",
@@ -614,7 +606,7 @@
   },
   "https://doi.org/10.1016/S0169-8095(97)00082-3": {
     "usages": [
-      "examples/PySDM_examples/Szumowski_et_al_1998/__init__.py"
+      "examples/PySDM_examples/utils/kinematic_2d/__init__.py"
     ],
     "label": "Szumowski et al. 1998 (Atmos. Res. 45)",
     "title": "Simple two-dimensional kinematic framework designed to test warm rain microphysical models"

{pysdm-2.121 → pysdm-2.122}/docs/templates/index.html.jinja2

@@ -31,10 +31,10 @@
     <div style="padding-top: 2em">
         <h2>What is PySDM?</h2>
         <p>
-            <video controls style="float:right; width:40%">
-                <source src="https://github.com/open-atmos/PySDM/releases/download/tip/docs_intro_animation_ubuntu-24.04.mp4" type="video/mp4">
-                Your browser does not support the video tag.
-            </video>
+            <div style="float:right; width:40%">
+              <img style="width:100%" src="https://github.com/open-atmos/PySDM/releases/download/tip/docs_intro_animation_ubuntu-24.04.gif" />
+              <a href="https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/_HOWTOs/paraview_hello_world.ipynb" style="small">Jupyter notebook setting up and running the above PySDM simulation and generating the visualisation using Paraview</a>
+            </div>
             PySDM is a package for simulating the <mark>dynamics of population of particles undergoing diffusional and collisional growth (and breakage)</mark>.
             The package features a Pythonic high-performance (multi-threaded CPU &amp; CUDA GPU) implementation of the <mark>Super-Droplet Method (SDM) Monte-Carlo algorithm</mark> 
               for representing collisional growth (<a href="https://doi.org/10.1002/qj.441">Shima et al. 2009</a>), hence the name.

{pysdm-2.121 → pysdm-2.122}/examples/PySDM_examples/Arabas_et_al_2015/example.py

@@ -1,6 +1,6 @@
 from open_atmos_jupyter_utils import TemporaryFile
 from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp
-from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage
+from PySDM_examples.utils.kinematic_2d import Simulation, Storage
 from PySDM_examples.utils import DummyController
 
 from PySDM import Formulae

{pysdm-2.121 → pysdm-2.122}/examples/PySDM_examples/Arabas_et_al_2015/example_benchmark.py

@@ -2,7 +2,7 @@ import importlib
 
 from matplotlib import pyplot as plt
 from PySDM_examples.Arabas_et_al_2015 import Settings
-from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage
+from PySDM_examples.utils.kinematic_2d import Simulation, Storage
 
 import PySDM.backends.impl_numba.conf
 from PySDM import Formulae

{pysdm-2.121 → pysdm-2.122}/examples/PySDM_examples/Arabas_et_al_2015/gui.ipynb

@@ -64,7 +64,7 @@
     }
    ],
    "source": [
-    "from PySDM_examples.Szumowski_et_al_1998 import gui, Simulation, GUISettings, Storage\n",
+    "from PySDM_examples.utils.kinematic_2d import gui, Simulation, GUISettings, Storage\n",
     "from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp\n",
     "from PySDM import Formulae\n",
     "settings = GUISettings(Settings(Formulae()))\n",

{pysdm-2.121 → pysdm-2.122}/examples/PySDM_examples/Arabas_et_al_2025/figs_10_and_11_and_animations.ipynb

@@ -66,7 +66,7 @@
     "from PySDM.dynamics import Freezing\n",
     "\n",
     "from PySDM_examples.Arabas_et_al_2015 import Settings\n",
-    "from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage\n",
+    "from PySDM_examples.utils.kinematic_2d import Simulation, Storage\n",
     "from PySDM_examples.Arabas_et_al_2025.commons import FREEZING_CONSTANTS, LOGNORMAL_MODE_SURF_A, LOGNORMAL_SGM_G"
    ]
   },
@@ -6221,7 +6221,6 @@
     "\n",
     "import argparse\n",
     "import json\n",
-    "from pathlib import Path\n",
     "from paraview import simple as pvs\n",
     "\n",
     "arg_parser = argparse.ArgumentParser()\n",

{pysdm-2.121 → pysdm-2.122}/examples/PySDM_examples/Bartman_et_al_2021/demo.ipynb

@@ -44,8 +44,8 @@
    },
    "source": [
     "from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp\n",
-    "from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage\n",
-    "from PySDM_examples.Szumowski_et_al_1998.plots import _TimeseriesPlot, _ImagePlot\n",
+    "from PySDM_examples.utils.kinematic_2d import Simulation, Storage\n",
+    "from PySDM_examples.utils.kinematic_2d.plots import _TimeseriesPlot, _ImagePlot\n",
     "from PySDM_examples.utils import ProgBarController\n",
     "from PySDM_examples.utils.widgets import HTML, display\n",
     "import PySDM.products as PySDM_products\n",

{pysdm-2.121 → pysdm-2.122}/examples/PySDM_examples/Bartman_et_al_2021/demo_fig2.ipynb

@@ -44,7 +44,7 @@
    },
    "source": [
     "from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp\n",
-    "from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage\n",
+    "from PySDM_examples.utils.kinematic_2d import Simulation, Storage\n",
     "from PySDM.exporters import NetCDFExporter\n",
     "from PySDM_examples.utils import ProgBarController\n",
     "from open_atmos_jupyter_utils import show_plot, TemporaryFile\n",

{pysdm-2.121 → pysdm-2.122}/examples/PySDM_examples/Bartman_et_al_2021/demo_fig3.ipynb

@@ -46,7 +46,7 @@
     "from PySDM_examples.utils import ProgBarController\n",
     "from open_atmos_jupyter_utils import TemporaryFile, show_plot\n",
     "from PySDM.physics import si, convert_to\n",
-    "from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage\n",
+    "from PySDM_examples.utils.kinematic_2d import Simulation, Storage\n",
     "from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp\n",
     "from PySDM_examples.Bartman_et_al_2021.label import label\n",
     "from PySDM.exporters import NetCDFExporter\n",

{pysdm-2.121 → pysdm-2.122}/examples/PySDM_examples/Morrison_and_Grabowski_2007/__init__.py

@@ -3,10 +3,6 @@
 prescribed-flow simulation settings data from
 [Morrison & Grabowski 2007 (JAS)](https://doi.org/10.1175/JAS3980)
 
-fig_2.ipynb:
-.. include:: ./fig_2.ipynb.badges.md
-
-fig_3.ipynb:
-.. include:: ./fig_3.ipynb.badges.md
+fig_1.ipynb:
+.. include:: ./fig_1.ipynb.badges.md
 """
-from .cumulus import Cumulus