PySDM-examples 2.130__tar.gz → 2.131__tar.gz

{pysdm_examples-2.130 → pysdm_examples-2.131}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 2.130
+Version: 2.131
 Summary: PySDM usage examples reproducing results from literature and depicting how to use PySDM from Python Jupyter notebooks
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -15,6 +15,7 @@ Requires-Dist: PyMPDATA
 Requires-Dist: open-atmos-jupyter-utils
 Requires-Dist: pystrict
 Requires-Dist: matplotlib
+Requires-Dist: Pillow
 Requires-Dist: joblib
 Requires-Dist: ipywidgets
 Requires-Dist: seaborn

{pysdm_examples-2.130 → pysdm_examples-2.131}/PySDM_examples/Lowe_et_al_2019/settings.py

@@ -1,13 +1,33 @@
+from functools import lru_cache
+
 import numpy as np
 from PySDM_examples.Lowe_et_al_2019.constants_def import LOWE_CONSTS
 from pystrict import strict
 
 from PySDM import Formulae
+from PySDM.backends import CPU
 from PySDM.initialisation.aerosol_composition import DryAerosolMixture
 from PySDM.initialisation.sampling import spectral_sampling as spec_sampling
 from PySDM.physics import si
 
 
+@lru_cache
+def backend(model):
+    return CPU(
+        formulae=Formulae(
+            surface_tension=model,
+            constants=LOWE_CONSTS,
+            diffusion_kinetics="LoweEtAl2019",
+            diffusion_thermics="LoweEtAl2019",
+            latent_heat_vapourisation="Lowe2019",
+            saturation_vapour_pressure="Lowe1977",
+            optical_albedo="Bohren1987",
+            optical_depth="Stephens1978",
+        ),
+        override_jit_flags={"parallel": False},
+    )
+
+
 @strict
 class Settings:
     def __init__(
@@ -22,16 +42,8 @@ class Settings:
         assert model in ("Constant", "CompressedFilmOvadnevaite")
         self.model = model
         self.n_sd_per_mode = n_sd_per_mode
-        self.formulae = Formulae(
-            surface_tension=model,
-            constants=LOWE_CONSTS,
-            diffusion_kinetics="LoweEtAl2019",
-            diffusion_thermics="LoweEtAl2019",
-            latent_heat_vapourisation="Lowe2019",
-            saturation_vapour_pressure="Lowe1977",
-            optical_albedo="Bohren1987",
-            optical_depth="Stephens1978",
-        )
+        self.backend = backend(model)
+        self.formulae = self.backend.formulae
         const = self.formulae.constants
         self.aerosol = aerosol
         self.spectral_sampling = spectral_sampling

{pysdm_examples-2.130 → pysdm_examples-2.131}/PySDM_examples/Lowe_et_al_2019/simulation.py

@@ -3,7 +3,6 @@ from PySDM_examples.utils import BasicSimulation
 
 import PySDM.products as PySDM_products
 from PySDM import Builder
-from PySDM.backends import CPU
 from PySDM.dynamics import AmbientThermodynamics, Condensation
 from PySDM.environments import Parcel
 from PySDM.initialisation import equilibrate_wet_radii
@@ -15,9 +14,7 @@ class Simulation(BasicSimulation):
         n_sd = settings.n_sd_per_mode * len(settings.aerosol.modes)
         builder = Builder(
             n_sd=n_sd,
-            backend=CPU(
-                formulae=settings.formulae, override_jit_flags={"parallel": False}
-            ),
+            backend=settings.backend,
             environment=Parcel(
                 dt=settings.dt,
                 mass_of_dry_air=settings.mass_of_dry_air,

{pysdm_examples-2.130 → pysdm_examples-2.131}/PySDM_examples/Shima_et_al_2009/example.py

@@ -12,11 +12,22 @@ from PySDM.environments import Box
 from PySDM.initialisation.sampling.spectral_sampling import ConstantMultiplicity
 from PySDM.products import ParticleVolumeVersusRadiusLogarithmSpectrum, WallTime
 
+_BACKEND_CACHE = {}
+
+
+def backend_factory(backend_class, formulae):
+    key = backend_class.__name__ + ":" + str(formulae)
+    if key not in _BACKEND_CACHE:
+        _BACKEND_CACHE[key] = backend_class(formulae=formulae)
+    return _BACKEND_CACHE[key]
+
 
 def run(settings, backend=CPU, observers=()):
     env = Box(dv=settings.dv, dt=settings.dt)
     builder = Builder(
-        n_sd=settings.n_sd, backend=backend(formulae=settings.formulae), environment=env
+        n_sd=settings.n_sd,
+        backend=backend_factory(backend, formulae=settings.formulae),
+        environment=env,
     )
     attributes = {}
     sampling = ConstantMultiplicity(settings.spectrum)

pysdm_examples-2.131/PySDM_examples/Zaba_et_al/__init__.py

@@ -0,0 +1,7 @@
+"""
+global_meteoric_water_line.ipynb:
+.. include:: ./global_meteoric_water_line.ipynb.badges.md
+
+timescales_comparison.ipynb:
+.. include:: ./timescales_comparison.ipynb.badges.md
+"""

{pysdm_examples-2.130 → pysdm_examples-2.131}/pysdm_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 2.130
+Version: 2.131
 Summary: PySDM usage examples reproducing results from literature and depicting how to use PySDM from Python Jupyter notebooks
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -15,6 +15,7 @@ Requires-Dist: PyMPDATA
 Requires-Dist: open-atmos-jupyter-utils
 Requires-Dist: pystrict
 Requires-Dist: matplotlib
+Requires-Dist: Pillow
 Requires-Dist: joblib
 Requires-Dist: ipywidgets
 Requires-Dist: seaborn

{pysdm_examples-2.130 → pysdm_examples-2.131}/pysdm_examples.egg-info/SOURCES.txt

@@ -132,7 +132,7 @@ PySDM_examples/Van_Hook_1968/__init__.py
 PySDM_examples/Yang_et_al_2018/__init__.py
 PySDM_examples/Yang_et_al_2018/settings.py
 PySDM_examples/Yang_et_al_2018/simulation.py
-PySDM_examples/Zaba_et_al_2025/__init__.py
+PySDM_examples/Zaba_et_al/__init__.py
 PySDM_examples/_HOWTOs/__init__.py
 PySDM_examples/deJong_Azimi/__init__.py
 PySDM_examples/deJong_Azimi/cloudy_data.py

{pysdm_examples-2.130 → pysdm_examples-2.131}/pysdm_examples.egg-info/requires.txt

@@ -3,6 +3,7 @@ PyMPDATA
 open-atmos-jupyter-utils
 pystrict
 matplotlib
+Pillow
 joblib
 ipywidgets
 seaborn

{pysdm_examples-2.130 → pysdm_examples-2.131}/setup.py

@@ -30,6 +30,10 @@ setup(
         "pystrict",
         # https://github.com/matplotlib/matplotlib/issues/28551
         "matplotlib" + ("!=3.9.1" if CI else ""),
+        "Pillow"
+        + (
+            "<11.3.0" if CI else ""
+        ),  # matplotlib triggers deprecation warnings in 11.3.0
         "joblib",
         "ipywidgets",
         "seaborn",