PySDM-examples 2.117__tar.gz → 2.119__tar.gz

{pysdm_examples-2.117 → pysdm_examples-2.119}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 2.117
+Version: 2.119
 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

{pysdm_examples-2.117 → pysdm_examples-2.119}/PySDM_examples/Pyrcel/simulation.py

@@ -91,7 +91,9 @@ class Simulation(BasicSimulation):
                 attr[drop_id].append(attr_data[drop_id])
         super()._save(output)
 
-    def run(self):
+    def run(self, observers=()):
+        for observer in observers:
+            self.particulator.observers.append(observer)
         output_products = super()._run(
             self.settings.nt, self.settings.steps_per_output_interval
         )

{pysdm_examples-2.117 → pysdm_examples-2.119}/pyproject.toml

@@ -4,4 +4,4 @@ local_scheme = "no-local-version"
 version_scheme = "post-release"
 
 [build-system]
-requires = ['setuptools==76.0.0', 'setuptools-scm==8.2.1']
+requires = ['setuptools==80.4.0', 'setuptools-scm==8.3.1']

{pysdm_examples-2.117 → pysdm_examples-2.119}/pysdm_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 2.117
+Version: 2.119
 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

{pysdm_examples-2.117 → pysdm_examples-2.119}/pysdm_examples.egg-info/SOURCES.txt

@@ -94,8 +94,6 @@ PySDM_examples/Pyrcel/__init__.py
 PySDM_examples/Pyrcel/profile_plotter.py
 PySDM_examples/Pyrcel/settings.py
 PySDM_examples/Pyrcel/simulation.py
-PySDM_examples/Pyrcel/tutorial_settings.py
-PySDM_examples/Pyrcel/tutorial_simulation.py
 PySDM_examples/Rozanski_and_Sonntag_1982/__init__.py
 PySDM_examples/Rozanski_and_Sonntag_1982/multibox.py
 PySDM_examples/Shima_et_al_2009/__init__.py

pysdm_examples-2.117/PySDM_examples/Pyrcel/tutorial_settings.py

@@ -1,65 +0,0 @@
-from typing import Dict
-
-import numpy as np
-from pystrict import strict
-
-from PySDM import Formulae
-from PySDM.initialisation.impl.spectrum import Spectrum
-
-
-@strict
-class Settings:
-    def __init__(
-        self,
-        dz: float,
-        n_sd_per_mode: tuple,
-        aerosol_modes_by_kappa: Dict[float, Spectrum],
-        vertical_velocity: float,
-        initial_temperature: float,
-        initial_pressure: float,
-        initial_relative_humidity: float,
-        displacement: float,
-        formulae: Formulae,
-    ):
-        self.formulae = formulae
-        self.n_sd_per_mode = n_sd_per_mode
-        self.aerosol_modes_by_kappa = aerosol_modes_by_kappa
-
-        const = self.formulae.constants
-        self.vertical_velocity = vertical_velocity
-        self.initial_pressure = initial_pressure
-        self.initial_temperature = initial_temperature
-        pv0 = initial_relative_humidity * formulae.saturation_vapour_pressure.pvs_water(
-            initial_temperature
-        )
-        self.initial_vapour_mixing_ratio = const.eps * pv0 / (initial_pressure - pv0)
-        self.t_max = displacement / vertical_velocity
-        self.timestep = dz / vertical_velocity
-        self.output_interval = self.timestep
-
-    @property
-    def initial_air_density(self):
-        const = self.formulae.constants
-        dry_air_density = (
-            self.formulae.trivia.p_d(
-                self.initial_pressure, self.initial_vapour_mixing_ratio
-            )
-            / self.initial_temperature
-            / const.Rd
-        )
-        return dry_air_density * (1 + self.initial_vapour_mixing_ratio)
-
-    @property
-    def nt(self) -> int:
-        nt = self.t_max / self.timestep
-        nt_int = round(nt)
-        np.testing.assert_almost_equal(nt, nt_int)
-        return nt_int
-
-    @property
-    def steps_per_output_interval(self) -> int:
-        return int(self.output_interval / self.timestep)
-
-    @property
-    def output_steps(self) -> np.ndarray:
-        return np.arange(0, self.nt + 1, self.steps_per_output_interval)

pysdm_examples-2.117/PySDM_examples/Pyrcel/tutorial_simulation.py

@@ -1,90 +0,0 @@
-import numpy as np
-from PySDM_examples.utils import BasicSimulation
-
-from PySDM import Builder
-from PySDM.backends import CPU
-from PySDM.backends.impl_numba.test_helpers import scipy_ode_condensation_solver
-from PySDM.dynamics import AmbientThermodynamics, Condensation
-from PySDM.environments import Parcel
-from PySDM.initialisation import equilibrate_wet_radii
-from PySDM.initialisation.sampling.spectral_sampling import ConstantMultiplicity
-from PySDM.physics import si
-
-
-class Simulation(BasicSimulation):
-    def __init__(
-        self, settings, products=None, scipy_solver=False, rtol_thd=1e-10, rtol_x=1e-10
-    ):
-        env = Parcel(
-            dt=settings.timestep,
-            p0=settings.initial_pressure,
-            initial_water_vapour_mixing_ratio=settings.initial_vapour_mixing_ratio,
-            T0=settings.initial_temperature,
-            w=settings.vertical_velocity,
-            mass_of_dry_air=44 * si.kg,
-        )
-        n_sd = sum(settings.n_sd_per_mode)
-        builder = Builder(n_sd=n_sd, backend=CPU(formulae=settings.formulae))
-        builder.set_environment(env)
-        builder.add_dynamic(AmbientThermodynamics())
-        builder.add_dynamic(Condensation(rtol_thd=rtol_thd, rtol_x=rtol_x))
-
-        volume = env.mass_of_dry_air / settings.initial_air_density
-        attributes = {
-            k: np.empty(0) for k in ("dry volume", "kappa times dry volume", "n")
-        }
-        for i, (kappa, spectrum) in enumerate(settings.aerosol_modes_by_kappa.items()):
-            sampling = ConstantMultiplicity(spectrum)
-            r_dry, n_per_volume = sampling.sample(settings.n_sd_per_mode[i])
-            v_dry = settings.formulae.trivia.volume(radius=r_dry)
-            attributes["n"] = np.append(attributes["n"], n_per_volume * volume)
-            attributes["dry volume"] = np.append(attributes["dry volume"], v_dry)
-            attributes["kappa times dry volume"] = np.append(
-                attributes["kappa times dry volume"], v_dry * kappa
-            )
-        r_wet = equilibrate_wet_radii(
-            r_dry=settings.formulae.trivia.radius(volume=attributes["dry volume"]),
-            environment=env,
-            kappa_times_dry_volume=attributes["kappa times dry volume"],
-        )
-        attributes["volume"] = settings.formulae.trivia.volume(radius=r_wet)
-
-        super().__init__(
-            particulator=builder.build(attributes=attributes, products=products)
-        )
-        if scipy_solver:
-            scipy_ode_condensation_solver.patch_particulator(self.particulator)
-
-        self.output_attributes = {
-            "volume": tuple([] for _ in range(self.particulator.n_sd))
-        }
-        self.settings = settings
-
-        self.__sanity_checks(attributes, volume)
-
-    def __sanity_checks(self, attributes, volume):
-        for attribute in attributes.values():
-            assert attribute.shape[0] == self.particulator.n_sd
-        np.testing.assert_approx_equal(
-            sum(attributes["multiplicity"]) / volume,
-            sum(
-                mode.norm_factor
-                for mode in self.settings.aerosol_modes_by_kappa.values()
-            ),
-            significant=4,
-        )
-
-    def _save(self, output):
-        for key, attr in self.output_attributes.items():
-            attr_data = self.particulator.attributes[key].to_ndarray()
-            for drop_id in range(self.particulator.n_sd):
-                attr[drop_id].append(attr_data[drop_id])
-        super()._save(output)
-
-    def run(self, observers=()):
-        for observer in observers:
-            self.particulator.observers.append(observer)
-        output_products = super()._run(
-            self.settings.nt, self.settings.steps_per_output_interval
-        )
-        return {"products": output_products, "attributes": self.output_attributes}