PySDM-examples 2.131__tar.gz → 3.0.0rc1__tar.gz

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 2.131
+Version: 3.0.0rc1
 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
@@ -21,6 +21,7 @@ Requires-Dist: ipywidgets
 Requires-Dist: seaborn
 Requires-Dist: numdifftools
 Requires-Dist: vtk
+Requires-Dist: pyvinecopulib>=0.7.3
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: nbconvert; extra == "tests"

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/PySDM_examples/Abade_and_Albuquerque_2024/simulation.py

@@ -40,7 +40,7 @@ class Simulation(BasicSimulation):
         builder.add_dynamic(Condensation())
 
         if settings.enable_immersion_freezing:
-            builder.add_dynamic(Freezing())
+            builder.add_dynamic(Freezing(immersion_freezing="singular"))
         if settings.enable_vapour_deposition_on_ice:
             builder.add_dynamic(VapourDepositionOnIce())
 

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/PySDM_examples/Alpert_and_Knopf_2016/simulation.py

@@ -219,7 +219,7 @@ def simulation(
         backend=CPU(formulae=formulae),
         environment=Box(dt=time_step, dv=volume),
     )
-    builder.add_dynamic(Freezing(singular=False))
+    builder.add_dynamic(Freezing(immersion_freezing="time-dependent"))
     builder.request_attribute("volume")
 
     if hasattr(spectrum, "s_geom") and spectrum.s_geom == 1:

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/PySDM_examples/Arabas_et_al_2025/make_particulator.py

@@ -51,12 +51,18 @@ def make_particulator(
             _,
             attributes["multiplicity"],
         ) = sampling.sample(backend=backend, n_sd=n_sd)
+        immersion_freezing_flag = "singular"
     else:
         (
             _,
             attributes["immersed surface area"],
             attributes["multiplicity"],
         ) = sampling.sample(backend=backend, n_sd=n_sd)
+        immersion_freezing_flag = "time-dependent"
+    if thaw:
+        thaw_flag = "instantaneous"
+    else:
+        thaw_flag = None
     attributes["multiplicity"] *= total_particle_number
 
     builder = Builder(n_sd=n_sd, backend=backend, environment=Box(dt, volume))
@@ -66,7 +72,9 @@ def make_particulator(
     env["RH"] = A_VALUE_LARGER_THAN_ONE
     env["rhod"] = 1.0
 
-    builder.add_dynamic(Freezing(singular=singular, thaw=thaw))
+    builder.add_dynamic(
+        Freezing(immersion_freezing=immersion_freezing_flag, thaw=thaw_flag)
+    )
     builder.request_attribute("volume")
 
     return builder.build(

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/PySDM_examples/Morrison_and_Grabowski_2007/common.py

@@ -36,8 +36,8 @@ class Common:
         self.breakup_efficiency = ConstEb(Eb=1.0)
         self.breakup_fragmentation = AlwaysN(n=2)
 
-        self.freezing_singular = True
-        self.freezing_thaw = False
+        self.freezing_immersion = "singular"
+        self.freezing_thaw = None
         self.freezing_inp_spec = None
 
         self.displacement_adaptive = displacement.DEFAULTS.adaptive

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/PySDM_examples/Niedermeier_et_al_2014/simulation.py

@@ -26,12 +26,17 @@ class Simulation(BasicSimulation):
             mixed_phase=True,
         )
         builder = Builder(
-            n_sd=n_particles, backend=CPU(settings.formulae), environment=env
+            n_sd=n_particles,
+            backend=CPU(
+                settings.formulae,
+                override_jit_flags={"parallel": False},
+            ),
+            environment=env,
         )
 
         builder.add_dynamic(AmbientThermodynamics())
         builder.add_dynamic(Condensation())
-        builder.add_dynamic(Freezing(singular=False))
+        builder.add_dynamic(Freezing(immersion_freezing="time-dependent"))
 
         air_volume = settings.mass_of_dry_air / settings.rhod0
         (

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/PySDM_examples/Spichtinger_et_al_2023/simulation.py

@@ -49,9 +49,7 @@ class Simulation(BasicSimulation):
         builder.add_dynamic(Condensation())
         builder.add_dynamic(VapourDepositionOnIce())
         builder.add_dynamic(
-            Freezing(
-                singular=False, homogeneous_freezing=True, immersion_freezing=False
-            )
+            Freezing(homogeneous_freezing="time-dependent", immersion_freezing=None)
         )
 
         self.n_sd = settings.n_sd

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/PySDM_examples/utils/kinematic_2d/make_default_product_collection.py

@@ -86,7 +86,7 @@ def make_default_product_collection(settings):
         products.append(PySDM_products.BreakupRateDeficitPerGridbox(name="brd"))
     if settings.processes["freezing"]:
         products.append(PySDM_products.IceWaterContent())
-        if settings.freezing_singular:
+        if settings.freezing_immersion == "singular":
             products.append(
                 PySDM_products.FreezableSpecificConcentration(settings.T_bins_edges)
             )

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/PySDM_examples/utils/kinematic_2d/simulation.py

@@ -20,6 +20,16 @@ from PySDM.environments import Kinematic2D
 from PySDM.initialisation.sampling import spatial_sampling
 
 
+_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]
+
+
 class Simulation:
     def __init__(self, settings, storage, SpinUp, backend_class=CPU):
         self.settings = settings
@@ -34,7 +44,7 @@ class Simulation:
 
     def reinit(self, products=None):
         formulae = self.settings.formulae
-        backend = self.backend_class(formulae=formulae)
+        backend = backend_factory(self.backend_class, formulae=formulae)
         environment = Kinematic2D(
             dt=self.settings.dt,
             grid=self.settings.grid,
@@ -140,7 +150,7 @@ class Simulation:
         if self.settings.processes["freezing"]:
             builder.add_dynamic(
                 Freezing(
-                    singular=self.settings.freezing_singular,
+                    immersion_freezing=self.settings.freezing_immersion,
                     thaw=self.settings.freezing_thaw,
                 )
             )
@@ -165,7 +175,7 @@ class Simulation:
                     np.random.random(attributes["dry volume"].size),  # TODO #599: seed
                 )
 
-            if self.settings.freezing_singular:
+            if self.settings.freezing_immersion == "singular":
                 attributes["freezing temperature"] = (
                     formulae.freezing_temperature_spectrum.invcdf(
                         np.random.random(immersed_surface_area.size),  # TODO #599: seed
@@ -179,9 +189,9 @@ class Simulation:
                 assert self.settings.n_sd % 2 == 0
                 assert 0 < self.settings.freezing_inp_frac < 1
                 freezing_attribute = {
-                    True: "freezing temperature",
-                    False: "immersed surface area",
-                }[self.settings.freezing_singular]
+                    "singular": "freezing temperature",
+                    "time-dependent": "immersed surface area",
+                }[self.settings.freezing_immersion]
                 for name, array in attributes.items():
                     if array.shape[-1] != self.settings.n_sd // 2:
                         raise AssertionError(f"attribute >>{name}<< has wrong size")

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/README.md

@@ -2,7 +2,7 @@
 [![DOI](https://zenodo.org/badge/199064632.svg)](https://zenodo.org/badge/latestdoi/199064632)
 
 [![PyPI version](https://badge.fury.io/py/PySDM-examples.svg)](https://pypi.org/project/PySDM-examples)
-[![API docs](https://img.shields.io/badge/API_docs-pdoc3-blue.svg)](https://open-atmos.github.io/PySDM-examples/)
+[![API docs](https://img.shields.io/badge/API_docs-pdoc3-blue.svg)](https://open-atmos.github.io/PySDM/PySDM_examples.html)
 
 For a list of examples, see [PySDM-examples documentation](https://open-atmos.github.io/PySDM/PySDM_examples.html).
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 2.131
+Version: 3.0.0rc1
 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
@@ -21,6 +21,7 @@ Requires-Dist: ipywidgets
 Requires-Dist: seaborn
 Requires-Dist: numdifftools
 Requires-Dist: vtk
+Requires-Dist: pyvinecopulib>=0.7.3
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: nbconvert; extra == "tests"

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

@@ -9,6 +9,7 @@ ipywidgets
 seaborn
 numdifftools
 vtk
+pyvinecopulib>=0.7.3
 
 [tests]
 pytest

{pysdm_examples-2.131 → pysdm_examples-3.0.0rc1}/setup.py

@@ -1,6 +1,6 @@
 import os
 import re
-import platform
+import sys
 
 from setuptools import find_packages, setup
 
@@ -38,10 +38,11 @@ setup(
         "ipywidgets",
         "seaborn",
         "numdifftools",
+        "vtk",
     ]
     + (
-        ["pyvinecopulib" + "==0.6.4" if CI else "", "vtk"]
-        if platform.architecture()[0] != "32bit"
+        ["pyvinecopulib" + ("==0.7.3" if CI else ">=0.7.3")]
+        if sys.platform != "darwin"
         else []
     ),
     extras_require={