PySDM-examples 2.40__tar.gz → 2.41__tar.gz

{PySDM-examples-2.40 → PySDM-examples-2.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM-examples
-Version: 2.40
+Version: 2.41
 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.40 → PySDM-examples-2.41}/PySDM_examples/Alpert_and_Knopf_2016/__init__.py

@@ -2,6 +2,7 @@
 box-environment example based on
 [Alpert & Knopf 2016 (Atmos. Chem. Phys. 16)](https://doi.org/10.5194/acp-16-2083-2016)
 """
+
 # pylint: disable=invalid-name
 from .simulation import Simulation, simulation
 from .table_1 import Table1

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Arabas_and_Shima_2017/__init__.py

@@ -2,4 +2,5 @@
 condensation-evaportaion parcel example based on
 [Arabas and Shima 2017 (Nonlin. Processes Geophys. 24)](https://doi.org/10.5194/npg-24-535-2017)
 """
+
 # pylint: disable=invalid-name

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Arabas_et_al_2015/settings.py

@@ -28,10 +28,7 @@ class Settings(StratoCumulus):
     def __init__(
         self,
         formulae=None,
-        rhod_w_max: float = 0.6
-        * si.metres
-        / si.seconds
-        * (si.kilogram / si.metre**3),
+        rhod_w_max: float = 0.6 * si.metres / si.seconds * (si.kilogram / si.metre**3),
     ):
         super().__init__(formulae or Formulae(), rhod_w_max=rhod_w_max)
 

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Arabas_et_al_2023/__init__.py

@@ -2,6 +2,7 @@
 box-model and 2D prescribed-flow immersion-freezing examples based on
 [Arabas et al. 2023](https://arxiv.org/abs/2308.05015)
 """
+
 from .make_particulator import make_particulator
 from .plots import make_freezing_spec_plot, make_pdf_plot, make_temperature_plot
 from .run_simulation import run_simulation

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Arabas_et_al_2023/plots.py

@@ -28,9 +28,11 @@ def make_temperature_plot(data):
         xy2.plot(
             datum["t"],
             np.asarray(datum["qi"]) / qi_unit,  # marker='.',
-            label=f"Monte-Carlo ({labels[v['singular']]})"
-            if not plotted[v["singular"]]
-            else "",
+            label=(
+                f"Monte-Carlo ({labels[v['singular']]})"
+                if not plotted[v["singular"]]
+                else ""
+            ),
             color=colors[v["singular"]],
         )
         plotted[v["singular"]] = True

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Bartman_et_al_2021/label.py

@@ -1,11 +1,11 @@
 def label(settings):
     lbl = str(
         {
-            k.replace("condensation_", ""): f"{v:.1e}"
-            if isinstance(v, float)
-            else str(v).zfill(2)
-            if isinstance(v, int)
-            else v
+            k.replace("condensation_", ""): (
+                f"{v:.1e}"
+                if isinstance(v, float)
+                else str(v).zfill(2) if isinstance(v, int) else v
+            )
             for k, v in settings.items()
         }
     )

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Berry_1967/__init__.py

@@ -2,4 +2,5 @@
 box-model coalescence-only example based on
 [Berry 1967 (J. Atmos. Sci. 24)](https://doi.org/10.1175/1520-0469(1967)024%3C0688:CDGBC%3E2.0.CO;2)
 """
+
 # pylint: disable=invalid-name

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Bieli_et_al_2022/__init__.py

@@ -1,4 +1,5 @@
 """
 collision-only box-model example from [Bieli et al. 2022](https://doi.org/10.1029/2022MS002994)
 """
+
 # pylint: disable=invalid-name

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Bolot_et_al_2013/__init__.py

@@ -2,4 +2,5 @@
 figures from Bolot et al. 2013 (Atmos. Chem. Phys. 13)
 https://doi.org/10.5194/acp-13-7903-2013
 """
+
 # pylint: disable=invalid-name

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Ervens_and_Feingold_2012/__init__.py

@@ -2,4 +2,5 @@
 aerosol distribution from
 [Ervens and Feingold 2012 (Atmos. Chem. Phys. 12)](https://doi.org/10.5194/acp-12-5807-2012)
 """
+
 # pylint: disable=invalid-name

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Ervens_and_Feingold_2012/settings.py

@@ -7,8 +7,6 @@ def sampled_ccn_diameter_number_concentration_spectrum(
     n_sd: int = 11, size_range: tuple = (0.02 * si.um, 2 * si.um)
 ):
     return Logarithmic(
-        spectrum=Lognormal(
-            s_geom=1.4, m_mode=0.04 * si.um, norm_factor=100 / si.cm**3
-        ),
+        spectrum=Lognormal(s_geom=1.4, m_mode=0.04 * si.um, norm_factor=100 / si.cm**3),
         size_range=size_range,
     ).sample(n_sd)

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Kreidenweis_et_al_2003/settings.py

@@ -70,11 +70,13 @@ class Settings:
 
         self.starting_amounts = {
             "moles_"
-            + k: self.formulae.trivia.volume(self.r_dry)
-            * self.DRY_RHO
-            / self.dry_molar_mass
-            if k in ("N_mIII", "S_VI")
-            else np.zeros(self.n_sd)
+            + k: (
+                self.formulae.trivia.volume(self.r_dry)
+                * self.DRY_RHO
+                / self.dry_molar_mass
+                if k in ("N_mIII", "S_VI")
+                else np.zeros(self.n_sd)
+            )
             for k in AQUEOUS_COMPOUNDS
         }
 

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Lowe_et_al_2019/aerosol_code.py

@@ -109,8 +109,8 @@ class AerosolBoreal(DryAerosolMixture):
     def __init__(
         self, water_molar_volume: float, Forg: float = 0.668, Acc_N2: float = 540
     ):
-        # TODO #604: SOA1 or SOA2 unclear from the paper
-        # TODO #604: CAN'T FIND WHERE NH4NO3 PROPERTIES ARE DEFINED IN ICPM
+        # TODO #1247: SOA1 or SOA2 unclear from the paper
+        # TODO #1247: CAN'T FIND WHERE NH4NO3 PROPERTIES ARE DEFINED IN ICPM
         INORG_MASS_RATIO = 0.1515 / 0.1559
         Aitken = {
             "SOA1": Forg,
@@ -137,8 +137,8 @@ class AerosolBoreal(DryAerosolMixture):
                 * si.gram
                 / si.mole,
                 "NH4NO3": Substance.from_formula("NH4NO3").mass * si.gram / si.mole,
-                "SOA1": 190 * si.g / si.mole,  # TODO #604: 190 OR 200?
-                "SOA2": 368.4 * si.g / si.mole,  # TODO #604: 368.4 OR 200?
+                "SOA1": 190 * si.g / si.mole,  # TODO #1247: 190 OR 200?
+                "SOA2": 368.4 * si.g / si.mole,  # TODO #1247: 368.4 OR 200?
             },
             densities={
                 "SOA1": 1.2 * si.g / si.cm**3,
@@ -199,7 +199,7 @@ class AerosolNascent(DryAerosolMixture):
     def __init__(
         self, water_molar_volume: float, Acc_Forg: float = 0.3, Acc_N2: float = 30
     ):
-        # TODO #604: CAN'T FIND WHEN PHI IS MULTIPLIED FOR KÖHLER B IN ICPM CODE
+        # TODO #1247: CAN'T FIND WHEN PHI IS MULTIPLIED FOR KÖHLER B IN ICPM CODE
         Ultrafine = {
             "SOA1": 0.52,
             "SOA2": 0,
@@ -217,8 +217,8 @@ class AerosolNascent(DryAerosolMixture):
                 "(NH4)2SO4": 3,
             },
             molar_masses={
-                "SOA1": 190 * si.g / si.mole,  # TODO #604: 190 OR 200?
-                "SOA2": 368.4 * si.g / si.mole,  # TODO #604: 368.4 OR 200?
+                "SOA1": 190 * si.g / si.mole,  # TODO #1247: 190 OR 200?
+                "SOA2": 368.4 * si.g / si.mole,  # TODO #1247: 368.4 OR 200?
                 "(NH4)2SO4": Substance.from_formula("(NH4)2SO4").mass
                 * si.gram
                 / si.mole,

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Merlivat_and_Nief_1967/__init__.py

@@ -2,4 +2,5 @@
 figure from Merlivat and Nief 1967 (Tellus)
 https://doi.org/10.3402/tellusa.v19i1.9756
 """
+
 # pylint: disable=invalid-name

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Niedermeier_et_al_2014/__init__.py

@@ -1,3 +1,4 @@
 """ based on [Niedermeier et al. 2014](https://doi.org/10.1002/2013GL058684) """
+
 from .settings import Settings
 from .simulation import Simulation

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Niedermeier_et_al_2014/simulation.py

@@ -68,9 +68,11 @@ class Simulation(BasicSimulation):
                     data[:-1],
                     np.full(
                         settings.in_sampling_n,
-                        data[-1]
-                        if attribute != "multiplicity"
-                        else data[-1] / settings.in_sampling_n,
+                        (
+                            data[-1]
+                            if attribute != "multiplicity"
+                            else data[-1] / settings.in_sampling_n
+                        ),
                     ),
                 )
             )

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Pierchala_et_al_2022/__init__.py

@@ -2,4 +2,5 @@
 based on Pierchala et al. 2022 (Geochim. Cosmochim. Acta)
 https://doi.org/10.1016/j.gca.2022.01.020
 """
+
 # pylint: disable=invalid-name

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Pyrcel/profile_plotter.py

@@ -57,11 +57,11 @@ class ProfilePlotter:
                 settings.formulae.trivia.radius(volume=np.asarray(volume)) / si.um,
                 output["products"]["z"],
                 color="magenta" if drop_id < settings.n_sd_per_mode[0] else "blue",
-                label="mode 1"
-                if drop_id == 0
-                else "mode 2"
-                if drop_id == settings.n_sd_per_mode[0]
-                else "",
+                label=(
+                    "mode 1"
+                    if drop_id == 0
+                    else "mode 2" if drop_id == settings.n_sd_per_mode[0] else ""
+                ),
             )
         axR.legend(loc="upper right")
         axR.set_xlabel("Droplet radius [μm]")

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Shipway_and_Hill_2012/settings.py

@@ -1,9 +1,9 @@
 from typing import Iterable
 
 import numpy as np
+from numdifftools import Derivative
 from scipy.integrate import solve_ivp
 from scipy.interpolate import interp1d
-from scipy.misc import derivative
 
 from PySDM import Formulae
 from PySDM.dynamics import condensation
@@ -60,8 +60,8 @@ class Settings:
         self.t_max = t_max
 
         t_1 = 600 * si.s
-        self.rho_times_w = (
-            lambda t: rho_times_w_1 * np.sin(np.pi * t / t_1) if t < t_1 else 0
+        self.rho_times_w = lambda t: (
+            rho_times_w_1 * np.sin(np.pi * t / t_1) if t < t_1 else 0
         )
         apprx_w1 = rho_times_w_1 / self.formulae.constants.rho_STP
         self.particle_reservoir_depth = (
@@ -106,9 +106,9 @@ class Settings:
             water_vapour_mixing_ratio = self.water_vapour_mixing_ratio(
                 z_above_reservoir
             )
-            d_water_vapour_mixing_ratio__dz = derivative(
-                self.water_vapour_mixing_ratio, z_above_reservoir
-            )
+            d_water_vapour_mixing_ratio__dz = Derivative(
+                self.water_vapour_mixing_ratio
+            )(z_above_reservoir)
             T = self.formulae.state_variable_triplet.T(
                 rhod[0], self.thd(z_above_reservoir)
             )

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Srivastava_1982/__init__.py

@@ -2,6 +2,7 @@
 box-model examples feat. analytic solution for breakup from
 [Srivastava 1982 (JAS)](https://doi.org/10.1175/1520-0469(1982)039%3C1317:ASMOPC%3E2.0.CO;2)
 """
+
 from .equations import Equations, EquationsHelpers
 from .example import (
     add_to_plot_simulation_results,

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Srivastava_1982/example.py

@@ -137,10 +137,10 @@ def get_breakup_coalescence_analytic_results(equations, settings, m0, x, x_log):
 
 def get_analytic_results(equations, settings, mean_mass, mean_mass_ratio):
     res = {}
-    res[
-        SimProducts.Computed.mean_drop_volume_total_volume_ratio.name
-    ] = compute_drop_volume_total_volume_ratio(
-        mean_volume=mean_mass / settings.rho, total_volume=settings.total_volume
+    res[SimProducts.Computed.mean_drop_volume_total_volume_ratio.name] = (
+        compute_drop_volume_total_volume_ratio(
+            mean_volume=mean_mass / settings.rho, total_volume=settings.total_volume
+        )
     )
     res[SimProducts.PySDM.total_numer.name] = equations.M / mean_mass_ratio
     return res

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Srivastava_1982/simulation.py

@@ -70,9 +70,9 @@ class Simulation:
                     if step != 0:
                         particulator.run(steps=1)
                     for prod in self.settings.prods:
-                        self.simulation_res[n_sd][prod][seed][
-                            step
-                        ] = particulator.products[prod].get()
+                        self.simulation_res[n_sd][prod][seed][step] = (
+                            particulator.products[prod].get()
+                        )
 
                 np.testing.assert_allclose(
                     actual=self.simulation_res[n_sd][

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Szumowski_et_al_1998/gui_viewer.py

@@ -93,13 +93,15 @@ class GUIViewer:
                 self.spectrumPlots[key] = (
                     _SpectrumPlot(r_bins, self.settings.spectrum_per_mass_of_dry_air)
                     if key == "size"
-                    else _TemperaturePlot(
-                        self.settings.T_bins_edges, self.settings.formulae
-                    )
-                    if key == "temperature"
-                    else _TerminalVelocityPlot(
-                        self.settings.terminal_velocity_radius_bin_edges,
-                        self.settings.formulae,
+                    else (
+                        _TemperaturePlot(
+                            self.settings.T_bins_edges, self.settings.formulae
+                        )
+                        if key == "temperature"
+                        else _TerminalVelocityPlot(
+                            self.settings.terminal_velocity_radius_bin_edges,
+                            self.settings.formulae,
+                        )
                     )
                 )
                 clear_output()

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Szumowski_et_al_1998/simulation.py

@@ -162,11 +162,11 @@ class Simulation:
                 )
 
             if self.settings.freezing_singular:
-                attributes[
-                    "freezing temperature"
-                ] = formulae.freezing_temperature_spectrum.invcdf(
-                    np.random.random(immersed_surface_area.size),  # TODO #599: seed
-                    immersed_surface_area,
+                attributes["freezing temperature"] = (
+                    formulae.freezing_temperature_spectrum.invcdf(
+                        np.random.random(immersed_surface_area.size),  # TODO #599: seed
+                        immersed_surface_area,
+                    )
                 )
             else:
                 attributes["immersed surface area"] = immersed_surface_area

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/Van_Hook_1968/__init__.py

@@ -2,4 +2,5 @@
 figure from Van Hook 1968 (J. Phys. Chem.)
 https://doi.org/10.1021/j100850a028
 """
+
 # pylint: disable=invalid-name

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/__init__.py

@@ -2,6 +2,7 @@
 PySDM_examples package includes common Python modules used in PySDM smoke tests
 and in example notebooks (but the package wheels do not include the notebooks)
 """
+
 from importlib.metadata import PackageNotFoundError, version
 
 try:

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/deJong_Mackay_et_al_2023/__init__.py

@@ -2,6 +2,7 @@
 box- and single-column breakup-focused examples from
 [de Jong et al. 2023](https://doi.org/10.5194/gmd-16-4193-2023)
 """
+
 # pylint: disable=invalid-name
 from .plot_rates import plot_ax, plot_zeros_ax
 from .settings1D import Settings1D

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/utils/__init__.py

@@ -1,6 +1,7 @@
 """
 reusable commons for examples
 """
+
 from .basic_simulation import BasicSimulation
 from .dummy_controller import DummyController
 from .notebook_vars import notebook_vars

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples/utils/notebook_vars.py

@@ -1,4 +1,5 @@
 """ helper routines for use in smoke tests """
+
 from pathlib import Path
 
 import nbformat

{PySDM-examples-2.40 → PySDM-examples-2.41}/PySDM_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM-examples
-Version: 2.40
+Version: 2.41
 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.40 → PySDM-examples-2.41}/PySDM_examples.egg-info/requires.txt

@@ -1,10 +1,12 @@
 PySDM
+PyMPDATA
 open-atmos-jupyter-utils
 pystrict
+matplotlib
 joblib
 ipywidgets
 seaborn
-ghapi
+numdifftools
 pyvinecopulib
 vtk
 

{PySDM-examples-2.40 → PySDM-examples-2.41}/setup.py

@@ -23,14 +23,14 @@ setup(
     },
     install_requires=[
         "PySDM",
-        "PyMPDATA" + ">=1.0.15" if CI else "",
+        "PyMPDATA" + (">=1.0.15" if CI else ""),
         "open-atmos-jupyter-utils",
         "pystrict",
-        "matplotlib" + "<3.8.0" if CI else "",  # TODO #1142
+        "matplotlib",
         "joblib",
         "ipywidgets",
         "seaborn",
-        "ghapi",
+        "numdifftools",
     ]
     + (["pyvinecopulib", "vtk"] if platform.architecture()[0] != "32bit" else []),
     extras_require={