PySDM 2.120__tar.gz → 2.122__tar.gz

{pysdm-2.120 → 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.120 → 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.120 → 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.120 → pysdm-2.122}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm
-Version: 2.120
+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.120 → pysdm-2.122}/PySDM/backends/impl_numba/methods/condensation_methods.py

@@ -388,7 +388,8 @@ class CondensationMethods(BackendMethods):
             pvs,
             D,
             K,
-            ventilation_factor,
+            mass_ventilation_factor,
+            heat_ventilation_factor,
         ):
             if x_new > formulae.diffusion_coordinate__x_max():
                 return x_old - x_new
@@ -410,9 +411,8 @@ class CondensationMethods(BackendMethods):
                 RH,
                 lv,
                 pvs,
-                D,
-                K,
-                ventilation_factor,
+                D * mass_ventilation_factor,
+                K * heat_ventilation_factor,
             )
             dm_dt = formulae.particle_shape_and_density__dm_dt(r=r_new, r_dr_dt=r_dr_dt)
             return (
@@ -469,12 +469,13 @@ class CondensationMethods(BackendMethods):
                 ):
                     Dr = formulae.diffusion_kinetics__D(DTp, r_old, lambdaD)
                     Kr = formulae.diffusion_kinetics__K(KTp, r_old, lambdaK)
-                    ventilation_factor = formulae.ventilation__ventilation_coefficient(
+                    mass_ventilation_factor = formulae.ventilation__ventilation_coefficient(
                         sqrt_re_times_cbrt_sc=formulae.trivia__sqrt_re_times_cbrt_sc(
                             Re=attributes.reynolds_number[drop],
                             Sc=Sc,
                         )
                     )
+                    heat_ventilation_factor = mass_ventilation_factor  # TODO #1588
                     args = (
                         x_old,
                         timestep,
@@ -487,7 +488,8 @@ class CondensationMethods(BackendMethods):
                         pvs,
                         Dr,
                         Kr,
-                        ventilation_factor,
+                        mass_ventilation_factor,
+                        heat_ventilation_factor,
                     )
                     r_dr_dt_old = formulae.drop_growth__r_dr_dt(
                         RH_eq,
@@ -495,9 +497,8 @@ class CondensationMethods(BackendMethods):
                         RH,
                         lv,
                         pvs,
-                        Dr,
-                        Kr,
-                        ventilation_factor,
+                        mass_ventilation_factor * Dr,
+                        heat_ventilation_factor * Kr,
                     )
                     mass_old = formulae.diffusion_coordinate__mass(x_old)
                     dm_dt_old = formulae.particle_shape_and_density__dm_dt(

{pysdm-2.120 → pysdm-2.122}/PySDM/backends/impl_numba/methods/deposition_methods.py

@@ -57,12 +57,13 @@ class DepositionMethods(BackendMethods):  # pylint:disable=too-few-public-method
 
                     capacity = formulae.diffusion_ice_capacity__capacity(diameter)
 
-                    ventilation_factor = formulae.ventilation__ventilation_coefficient(
+                    mass_ventilation_factor = formulae.ventilation__ventilation_coefficient(
                         sqrt_re_times_cbrt_sc=formulae.trivia__sqrt_re_times_cbrt_sc(
                             Re=reynolds_number[i],
                             Sc=schmidt_number[cid],
                         )
                     )
+                    heat_ventilation_factor = mass_ventilation_factor  # TODO #1588
 
                     Dv_const = formulae.diffusion_thermics__D(temperature, pressure)
                     lambdaD = formulae.diffusion_ice_kinetics__lambdaD(
@@ -93,9 +94,8 @@ class DepositionMethods(BackendMethods):  # pylint:disable=too-few-public-method
                             RH=saturation_ratio_ice,
                             lv=latent_heat_sub,
                             pvs=pvs_ice,
-                            D=diffusion_coefficient,
-                            K=thermal_conductivity,
-                            ventilation_factor=ventilation_factor,
+                            D=mass_ventilation_factor * diffusion_coefficient,
+                            K=heat_ventilation_factor * thermal_conductivity,
                         )
                         * formulae.constants.rho_w
                     )

{pysdm-2.120 → pysdm-2.122}/PySDM/backends/impl_numba/test_helpers/scipy_ode_condensation_solver.py

@@ -132,12 +132,13 @@ def _make_solve(formulae):  # pylint: disable=too-many-statements,too-many-local
             r = jit_formulae.trivia__radius(v)
             Dr = jit_formulae.diffusion_kinetics__D(DTp, r, lambdaD)
             Kr = jit_formulae.diffusion_kinetics__K(KTp, r, lambdaK)
-            ventilation_factor = jit_formulae.ventilation__ventilation_coefficient(
+            mass_ventilation_factor = jit_formulae.ventilation__ventilation_coefficient(
                 sqrt_re_times_cbrt_sc=jit_formulae.trivia__sqrt_re_times_cbrt_sc(
                     Re=reynolds_number[i],
                     Sc=schmidt_number,
                 )
             )
+            heat_ventilation_factor = mass_ventilation_factor  # TODO #1588
             sgm = jit_formulae.surface_tension__sigma(T, v, dry_volume[i], f_org[i])
             r_dr_dt = jit_formulae.drop_growth__r_dr_dt(
                 jit_formulae.hygroscopicity__RH_eq(
@@ -147,9 +148,8 @@ def _make_solve(formulae):  # pylint: disable=too-many-statements,too-many-local
                 RH,
                 lv,
                 pvs,
-                Dr,
-                Kr,
-                ventilation_factor,
+                mass_ventilation_factor * Dr,
+                heat_ventilation_factor * Kr,
             )
             dm_dt = jit_formulae.particle_shape_and_density__dm_dt(r, r_dr_dt)
             dy_dt[idx_x + i] = jit_formulae.diffusion_coordinate__dx_dt(m, dm_dt)

{pysdm-2.120 → pysdm-2.122}/PySDM/backends/impl_thrust_rtc/methods/condensation_methods.py

@@ -25,7 +25,7 @@ ARGS_VARS = (
     "_pvs",
     "Dr",
     "Kr",
-    "ventilation_factor",
+    "mass_ventilation_factor",
 )
 
 
@@ -125,10 +125,9 @@ class CondensationMethods(
                         RH=args("_RH"),
                         lv=args("_lv"),
                         pvs=args("_pvs"),
-                        D=args("Dr"),
-                        K=args("Kr"),
-                        ventilation_factor=args("ventilation_factor"),
-                    )};
+                        D=f'{args("mass_ventilation_factor")}*{args("Dr")}',
+                        K=f'{args("mass_ventilation_factor")}*{args("Kr")}',
+                    )}; // TODO #1588
                     auto dm_dt = {phys.particle_shape_and_density.dm_dt.c_inline(
                         r="r_new", r_dr_dt="r_dr_dt"
                     )};
@@ -167,7 +166,7 @@ class CondensationMethods(
             real_type Dr=0;
             real_type Kr=0;
             real_type qrt_re_times_cbrt_sc=0;
-            real_type ventilation_factor=0;
+            real_type mass_ventilation_factor=0;
             real_type r_dr_dt_old=0;
             real_type dm_dt_old=0;
             real_type dx_old=0;
@@ -186,12 +185,13 @@ class CondensationMethods(
                     Re="reynolds_number[i]",
                     Sc="_schmidt_number",
                 )};
-                ventilation_factor = {phys.ventilation.ventilation_coefficient.c_inline(
+                mass_ventilation_factor = {phys.ventilation.ventilation_coefficient.c_inline(
                     sqrt_re_times_cbrt_sc="qrt_re_times_cbrt_sc"
                 )};
+                auto heat_ventilation_factor = mass_ventilation_factor; // TODO #1588
                 r_dr_dt_old = {phys.drop_growth.r_dr_dt.c_inline(
-                    RH_eq="RH_eq", T="_T", RH="_RH", lv="_lv", pvs="_pvs", D="Dr", K="Kr",
-                    ventilation_factor="ventilation_factor",
+                    RH_eq="RH_eq", T="_T", RH="_RH", lv="_lv", pvs="_pvs",
+                    D="mass_ventilation_factor*Dr", K="heat_ventilation_factor*Kr",
                 )};
                 dm_dt_old = {phys.particle_shape_and_density.dm_dt.c_inline(r="r_old", r_dr_dt="r_dr_dt_old")};
                 dx_old = dt * {phys.diffusion_coordinate.dx_dt.c_inline(

{pysdm-2.120 → pysdm-2.122}/PySDM/physics/constants_defaults.py

@@ -681,6 +681,12 @@ def compute_derived_values(c: dict):
     - [IAPWS Guidelines](http://www.iapws.org/relguide/fundam.pdf)
     """
 
+    c["M_1H2_16O"] = c["M_1H"] * 2 + c["M_16O"]
+    c["M_2H_1H_16O"] = c["M_2H"] + c["M_1H"] + c["M_16O"]
+    c["M_3H_1H_16O"] = c["M_3H"] + c["M_1H"] + c["M_16O"]
+    c["M_1H2_17O"] = c["M_1H"] * 2 + c["M_17O"]
+    c["M_1H2_18O"] = c["M_1H"] * 2 + c["M_18O"]
+
     c["Mv"] = (
         (
             1
@@ -689,19 +695,15 @@ def compute_derived_values(c: dict):
             - 1 * Trivia.mixing_ratio_to_specific_content(c["VSMOW_R_17O"])
             - 1 * Trivia.mixing_ratio_to_specific_content(c["VSMOW_R_18O"])
         )
-        * (c["M_1H"] * 2 + c["M_16O"])
+        * c["M_1H2_16O"]
         + 2
         * Trivia.mixing_ratio_to_specific_content(c["VSMOW_R_2H"])
-        * (c["M_2H"] + c["M_1H"] + c["M_16O"])
+        * c["M_2H_1H_16O"]
         + 2
         * Trivia.mixing_ratio_to_specific_content(c["VSMOW_R_3H"])
-        * (c["M_3H"] + c["M_1H"] + c["M_16O"])
-        + 1
-        * Trivia.mixing_ratio_to_specific_content(c["VSMOW_R_17O"])
-        * (c["M_1H"] * 2 + c["M_17O"])
-        + 1
-        * Trivia.mixing_ratio_to_specific_content(c["VSMOW_R_18O"])
-        * (c["M_1H"] * 2 + c["M_18O"])
+        * c["M_3H_1H_16O"]
+        + 1 * Trivia.mixing_ratio_to_specific_content(c["VSMOW_R_17O"]) * c["M_1H2_17O"]
+        + 1 * Trivia.mixing_ratio_to_specific_content(c["VSMOW_R_18O"]) * c["M_1H2_18O"]
     )
 
     c["eps"] = c["Mv"] / c["Md"]

{pysdm-2.120 → pysdm-2.122}/PySDM/physics/drop_growth/__init__.py

@@ -2,5 +2,6 @@
 Formulation of the coupled heat-moisture diffusion problem
 """
 
-from .mason_1951 import Mason1951
+from .fick import Fick
+from .howell_1949 import Howell1949
 from .mason_1971 import Mason1971

pysdm-2.122/PySDM/physics/drop_growth/fick.py

@@ -0,0 +1,13 @@
+"""
+Fickian diffusion only drop growth
+"""
+
+
+class Fick:  # pylint: disable=too-few-public-methods
+    def __init__(self, _):
+        pass
+
+    # pylint: disable=too-many-arguments
+    @staticmethod
+    def r_dr_dt(const, RH_eq, T, RH, lv, pvs, D, K):  # pylint: disable=unused-argument
+        return (RH - RH_eq) / const.rho_w / (const.Rv * T / D / pvs)

pysdm-2.122/PySDM/physics/drop_growth/howell_1949.py

@@ -0,0 +1,19 @@
+"""
+single-equation approximation of the vapour and heat diffusion problem
+as proposed in [Howell 1949](https://doi.org/10.1175/1520-0469(1949)006%3C0134:TGOCDI%3E2.0.CO;2)
+same as in [Mason 1951](https://doi.org/10.1088/0370-1301/64/9/307)
+"""
+
+
+class Howell1949:  # pylint: disable=too-few-public-methods
+    def __init__(self, _):
+        pass
+
+    # pylint: disable=too-many-arguments
+    @staticmethod
+    def r_dr_dt(const, RH_eq, T, RH, lv, pvs, D, K):
+        return (
+            (RH - RH_eq)
+            / const.rho_w
+            / (const.Rv * T / D / pvs + lv**2 / K / T**2 / const.Rv)
+        )

{pysdm-2.120 → pysdm-2.122}/PySDM/physics/drop_growth/mason_1971.py

@@ -11,10 +11,9 @@ class Mason1971:  # pylint: disable=too-few-public-methods
 
     # pylint: disable=too-many-arguments
     @staticmethod
-    def r_dr_dt(const, RH_eq, T, RH, lv, pvs, D, K, ventilation_factor):
+    def r_dr_dt(const, RH_eq, T, RH, lv, pvs, D, K):
         return (
-            ventilation_factor
-            * (RH - RH_eq)
+            (RH - RH_eq)
             / const.rho_w
             / (const.Rv * T / D / pvs + lv / K / T * (lv / T / const.Rv - 1))
         )

{pysdm-2.120 → pysdm-2.122}/PySDM/physics/isotope_kinetic_fractionation_factors/jouzel_and_merlivat_1984.py

@@ -10,12 +10,12 @@ class JouzelAndMerlivat1984:  # pylint: disable=too-few-public-methods
 
     @staticmethod
     def alpha_kinetic(
-        alpha_equilibrium, relative_humidity, heavy_to_light_diffusivity_ratio
+        alpha_equilibrium, saturation_over_ice, heavy_to_light_diffusivity_ratio
     ):
-        """eq. (11) or eq. (14)"""
-        return relative_humidity / (
+        """eq. (11)"""
+        return saturation_over_ice / (
             alpha_equilibrium
             / heavy_to_light_diffusivity_ratio
-            * (relative_humidity - 1)
+            * (saturation_over_ice - 1)
             + 1
         )

{pysdm-2.120 → 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++"
@@ -558,7 +560,7 @@
   },
   "https://doi.org/10.1088/0370-1301/64/9/307": {
     "usages": [
-      "PySDM/physics/drop_growth/mason_1951.py"
+      "PySDM/physics/drop_growth/howell_1949.py"
     ],
     "label": "Mason 1951 (Proc. Phys. Soc. B 64)",
     "title": "Spontaneous Condensation of Water Vapour in Expansion Chamber Experiments"
@@ -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"
@@ -836,7 +828,8 @@
   },
   "https://doi.org/10.1175/1520-0469(1949)006%3C0134:TGOCDI%3E2.0.CO;2": {
     "usages": [
-      "PySDM/backends/impl_numba/methods/deposition_methods.py"
+      "PySDM/backends/impl_numba/methods/deposition_methods.py",
+      "PySDM/physics/drop_growth/howell_1949.py"
     ],
     "title": "The Growth of Cloud Drops in Uniformly Cooled Air",
     "label": "Howell 1949 (J. Atmos. Sci.)"
@@ -844,7 +837,11 @@
   "https://doi.org/10.1029/JD089iD07p11749": {
     "usages": [
       "PySDM/physics/isotope_kinetic_fractionation_factors/jouzel_and_merlivat_1984.py",
-      "tests/unit_tests/physics/test_isotope_kinetic_fractionation_factors.py"
+      "examples/PySDM_examples/Jouzel_and_Merlivat_1984/__init__.py",
+      "examples/PySDM_examples/Jouzel_and_Merlivat_1984/fig_8_9.ipynb",
+      "examples/PySDM_examples/Jouzel_and_Merlivat_1984/thermodynamic_profiles.py",
+      "tests/unit_tests/physics/test_isotope_kinetic_fractionation_factors.py",
+      "examples/PySDM_examples/Fisher_1991/__init__.py"
     ],
     "title": "Deuterium and oxygen 18 in precipitation: Modeling of the isotopic effects during snow formation",
     "label": "Jouzel & Merlivat 1984 (J. Geophys. Res. Atmos. 89)"
@@ -862,5 +859,13 @@
     ],
     "title": "IAEA Reference Sheet for International Measurement Standards: VSMOW & SLAP",
     "label": "IAEA 2006"
+  },
+  "https://doi.org/10.3402/tellusb.v43i5.15414": {
+    "usages": [
+      "examples/PySDM_examples/Fisher_1991/fig_2.ipynb",
+      "examples/PySDM_examples/Fisher_1991/__init__.py"
+    ],
+    "title": "Remarks on the deuterium excess in precipitation in cold regions",
+    "label": "Fisher 1991 (Tellus B)"
   }
 }

{pysdm-2.120 → 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.120 → 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.120 → 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.120 → 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.120 → 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.120 → 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.120 → 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.120 → 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",