PySDM 2.43__py3-none-any.whl → 2.45__py3-none-any.whl

PySDM/backends/impl_numba/methods/terminal_velocity_methods.py

@@ -46,3 +46,23 @@ class TerminalVelocityMethods(BackendMethods):
         self.terminal_velocity_body(
             values=values, radius=radius, k1=k1, k2=k2, k3=k3, r1=r1, r2=r2
         )
+
+    @cached_property
+    def power_series_body(self):
+        @numba.njit(**{**conf.JIT_FLAGS, "fastmath": self.formulae.fastmath})
+        def power_series_body(*, values, radius, num_terms, prefactors, powers):
+            for i in numba.prange(len(values)):  # pylint: disable=not-an-iterable
+                values[i] = 0.0
+                for j in range(num_terms):
+                    values[i] = values[i] + prefactors[j] * radius[i] ** (powers[j] * 3)
+
+        return power_series_body
+
+    def power_series(self, *, values, radius, num_terms, prefactors, powers):
+        self.power_series_body(
+            values=values,
+            radius=radius,
+            num_terms=num_terms,
+            prefactors=prefactors,
+            powers=powers,
+        )

PySDM/backends/impl_thrust_rtc/methods/terminal_velocity_methods.py

@@ -131,3 +131,27 @@ class TerminalVelocityMethods(ThrustRTCBackendMethods):
         self.__interpolation_body.launch_n(
             len(radius), (output.data, radius.data, factor_device, b.data, c.data)
         )
+
+    @cached_property
+    def __power_series_body(self):
+        # TODO #599 r<0
+        return trtc.For(
+            ("output", "radius", "num_terms", "prefactors", "powers"),
+            "i",
+            """
+            output[i] = 0.0
+            int kmax = num_terms
+            for (auto k = 0; k < kmax; k+=1) {
+                auto sumterm = prefactors[k] * pow(radius[i], 3*powers[k])
+                output[i] = output[i] + sumterm
+            """,
+        )
+
+    @nice_thrust(**NICE_THRUST_FLAGS)
+    def power_series(self, *, values, radius, num_terms, prefactors, powers):
+        prefactors = self._get_floating_point(prefactors)
+        powers = self._get_floating_point(powers)
+        num_terms = self._get_floating_point(num_terms)
+        self.__power_series_body.launch_n(
+            values.size(), (values, radius, num_terms, prefactors, powers)
+        )

PySDM/dynamics/terminal_velocity/__init__.py

@@ -3,4 +3,5 @@ particle terminal velocity formulae
 """
 
 from PySDM.dynamics.terminal_velocity.gunn_and_kinzer import GunnKinzer1949
+from PySDM.dynamics.terminal_velocity.power_series import PowerSeries
 from PySDM.dynamics.terminal_velocity.rogers_and_yau import RogersYau

PySDM/dynamics/terminal_velocity/power_series.py

@@ -0,0 +1,30 @@
+"""
+Power series expression
+"""
+
+import numpy as np
+
+from PySDM.physics import constants as const
+
+
+class PowerSeries:  # pylint: disable=too-few-public-methods
+    def __init__(self, particulator, *, prefactors=None, powers=None):
+        si = const.si
+        self.particulator = particulator
+        prefactors = prefactors or [2.0e-1 * si.m / si.s / np.sqrt(si.m)]
+        self.prefactors = np.array(prefactors)
+        powers = powers or [1 / 6]
+        self.powers = np.array(powers)
+        for i, p in enumerate(self.powers):
+            self.prefactors[i] *= (4 / 3 * const.PI) ** (p)
+            self.prefactors[i] /= (1 * si.um**3) ** (p)
+        assert len(self.prefactors) == len(self.powers)
+
+    def __call__(self, output, radius):
+        self.particulator.backend.power_series(
+            values=output.data,
+            radius=radius.data,
+            num_terms=len(self.powers),
+            prefactors=self.prefactors,
+            powers=self.powers,
+        )

PySDM/environments/kinematic_1d.py

@@ -32,7 +32,13 @@ class Kinematic1D(Moist):
         return self.thd0
 
     def init_attributes(
-        self, *, spatial_discretisation, spectral_discretisation, kappa
+        self,
+        *,
+        spatial_discretisation,
+        spectral_discretisation,
+        kappa,
+        z_part=None,
+        collisions_only=False
     ):
         super().sync()
         self.notify()
@@ -43,6 +49,7 @@ class Kinematic1D(Moist):
                 backend=self.particulator.backend,
                 grid=self.mesh.grid,
                 n_sd=self.particulator.n_sd,
+                z_part=z_part,
             )
             (
                 attributes["cell id"],
@@ -50,24 +57,32 @@ class Kinematic1D(Moist):
                 attributes["position in cell"],
             ) = self.mesh.cellular_attributes(positions)
 
-            r_dry, n_per_kg = spectral_discretisation.sample(
-                backend=self.particulator.backend, n_sd=self.particulator.n_sd
-            )
-            attributes["dry volume"] = self.formulae.trivia.volume(radius=r_dry)
-            attributes["kappa times dry volume"] = attributes["dry volume"] * kappa
-            r_wet = equilibrate_wet_radii(
-                r_dry=r_dry,
-                environment=self,
-                cell_id=attributes["cell id"],
-                kappa_times_dry_volume=attributes["kappa times dry volume"],
-            )
+            if collisions_only:
+                v_wet, n_per_kg = spectral_discretisation.sample(
+                    backend=self.particulator.backend, n_sd=self.particulator.n_sd
+                )
+                # attributes["dry volume"] = v_wet
+                attributes["volume"] = v_wet
+                # attributes["kappa times dry volume"] = attributes["dry volume"] * kappa
+            else:
+                r_dry, n_per_kg = spectral_discretisation.sample(
+                    backend=self.particulator.backend, n_sd=self.particulator.n_sd
+                )
+                attributes["dry volume"] = self.formulae.trivia.volume(radius=r_dry)
+                attributes["kappa times dry volume"] = attributes["dry volume"] * kappa
+                r_wet = equilibrate_wet_radii(
+                    r_dry=r_dry,
+                    environment=self,
+                    cell_id=attributes["cell id"],
+                    kappa_times_dry_volume=attributes["kappa times dry volume"],
+                )
+                attributes["volume"] = self.formulae.trivia.volume(radius=r_wet)
 
             rhod = self["rhod"].to_ndarray()
             cell_id = attributes["cell id"]
             domain_volume = np.prod(np.array(self.mesh.size))
 
         attributes["multiplicity"] = n_per_kg * rhod[cell_id] * domain_volume
-        attributes["volume"] = self.formulae.trivia.volume(radius=r_wet)
 
         return attributes
 

PySDM/formulae.py

@@ -19,7 +19,7 @@ from numba.core.errors import NumbaExperimentalFeatureWarning
 
 from PySDM import physics
 from PySDM.backends.impl_numba import conf
-from PySDM.dynamics.terminal_velocity import GunnKinzer1949, RogersYau
+from PySDM.dynamics.terminal_velocity import GunnKinzer1949, PowerSeries, RogersYau
 from PySDM.dynamics.terminal_velocity.gunn_and_kinzer import TpDependent
 
 
@@ -124,6 +124,7 @@ class Formulae:  # pylint: disable=too-few-public-methods,too-many-instance-attr
             "GunnKinzer1949": GunnKinzer1949,
             "RogersYau": RogersYau,
             "TpDependent": TpDependent,
+            "PowerSeries": PowerSeries,
         }[terminal_velocity]
 
     def __str__(self):

PySDM/initialisation/sampling/spatial_sampling.py

@@ -8,7 +8,7 @@ spatial sampling logic (i.e., physical x-y-z coordinates)
 
 class Pseudorandom:  # pylint: disable=too-few-public-methods
     @staticmethod
-    def sample(*, backend, grid, n_sd):
+    def sample(*, backend, grid, n_sd, z_part=None):
         dimension = len(grid)
         n_elements = dimension * n_sd
 
@@ -16,6 +16,15 @@ class Pseudorandom:  # pylint: disable=too-few-public-methods
         backend.Random(seed=backend.formulae.seed, size=n_elements)(storage)
         positions = storage.to_ndarray().reshape(dimension, n_sd)
 
-        for dim in range(dimension):
-            positions[dim, :] *= grid[dim]
+        if z_part is None:
+            for dim in range(dimension):
+                positions[dim, :] *= grid[dim]
+        else:
+            assert dimension == 1
+            iz_min = int(grid[0] * z_part[0])
+            iz_max = int(grid[0] * z_part[1])
+            for dim in range(dimension):
+                positions[dim, :] *= iz_max - iz_min
+                positions[dim, :] += iz_min
+
         return positions

PySDM/initialisation/sampling/spectral_sampling.py

@@ -55,7 +55,8 @@ class DeterministicSpectralSampling(
         diff = abs(1 - np.sum(y_float) / spectrum.norm_factor)
         if diff > self.error_threshold:
             raise ValueError(
-                f"{100*diff}% error in total real-droplet number due to sampling"
+                f"{diff * 100:.3g}% error in total real-droplet number due to sampling "
+                f"({len(x)} samples)"
             )
 
         return x, y_float

PySDM/physics/constants_defaults.py

@@ -321,6 +321,16 @@ CRAIG_1961_INTERCEPT_COEFF = 10 * PER_MILLE
 """ [Bohren 1987](https://doi.org/10.1119/1.15109) """
 asymmetry_g = 0.85  # forward scattering from cloud droplets
 
+""" TODO #1266 """
+diffussion_thermics_D_G11_A = 1e-5 * si.m**2 / si.s
+diffussion_thermics_D_G11_B = 0.15 / si.K
+diffussion_thermics_D_G11_C = -1.9
+
+diffussion_thermics_K_G11_A = 1.5e-11 * si.W / si.m / si.K**4
+diffussion_thermics_K_G11_B = -4.8e-8 * si.W / si.m / si.K**3
+diffussion_thermics_K_G11_C = 1e-4 * si.W / si.m / si.K**2
+diffussion_thermics_K_G11_D = -3.9e-4 * si.W / si.m / si.K
+
 
 def compute_derived_values(c: dict):
     c["eps"] = c["Mv"] / c["Md"]

PySDM/physics/diffusion_kinetics/__init__.py

@@ -5,3 +5,5 @@ Formulae for handling transition-régime corrections in condensational growth/ev
 from .fuchs_sutugin import FuchsSutugin
 from .lowe_et_al_2019 import LoweEtAl2019
 from .neglect import Neglect
+from .grabowski_et_al_2011 import GrabowskiEtAl2011
+from .jensen_and_nugent_2017 import JensenAndNugent2017

PySDM/physics/diffusion_kinetics/grabowski_et_al_2011.py

@@ -0,0 +1,9 @@
+"""
+as in [Grabowski et al. (2011)](https://doi.org/10.1016/j.atmosres.2010.10.020)
+"""
+
+from .pruppacher_and_klett_2005 import PruppacherKlett
+
+
+class GrabowskiEtAl2011(PruppacherKlett):
+    pass

PySDM/physics/diffusion_kinetics/jensen_and_nugent_2017.py

@@ -0,0 +1,14 @@
+"""
+as in [Jensen and Nugent 2017](https://doi.org/10.1175/JAS-D-15-0370.1)
+(which refers to [Grabowski et al. (2011)](https://doi.org/10.1016/j.atmosres.2010.10.020)
+but uses different gas constant, typo?)
+"""
+
+import numpy as np
+from .grabowski_et_al_2011 import GrabowskiEtAl2011
+
+
+class JensenAndNugent2017(GrabowskiEtAl2011):
+    @staticmethod
+    def lambdaD(const, D, T):
+        return D / np.sqrt(2 * const.Rd * T)

PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2005.py

@@ -19,3 +19,11 @@ class PruppacherKlett:
         return D / (
             (r / (r + const.dv_pk05)) + 2 * np.sqrt(const.PI) * lmbd / r / const.MAC
         )
+
+    @staticmethod
+    def lambdaK(_, T, p):  # pylint: disable=unused-argument
+        return -1
+
+    @staticmethod
+    def K(const, K, r, lmbd):  # pylint: disable=unused-argument
+        return K  # TODO #1266

PySDM/physics/diffusion_thermics/__init__.py

@@ -5,3 +5,4 @@ Formulae for representing the temperature and pressure dependence of vapour diff
 from .lowe_et_al_2019 import LoweEtAl2019
 from .neglect import Neglect
 from .tracy_welch_porter import TracyWelchPorter
+from .grabowski_et_al_2011 import GrabowskiEtAl2011

PySDM/physics/diffusion_thermics/grabowski_et_al_2011.py

@@ -0,0 +1,23 @@
+"""
+as in [Grabowski et al. (2011)](https://doi.org/10.1016/j.atmosres.2010.10.020)
+"""
+
+
+class GrabowskiEtAl2011:
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def D(const, T, p):  # pylint: disable=unused-argument
+        return const.diffussion_thermics_D_G11_A * (
+            const.diffussion_thermics_D_G11_B * T + const.diffussion_thermics_D_G11_C
+        )
+
+    @staticmethod
+    def K(const, T, p):  # pylint: disable=unused-argument
+        return (
+            const.diffussion_thermics_K_G11_A * T**3
+            + const.diffussion_thermics_K_G11_B * T**2
+            + const.diffussion_thermics_K_G11_C * T
+            + const.diffussion_thermics_K_G11_D
+        )

PySDM/physics/impl/fake_unit_registry.py

@@ -26,6 +26,7 @@ class FakeUnitRegistry:  # pylint: disable=too-few-public-methods
                 "litre",
                 "hour",
                 "newton",
+                "watt",
             ):
                 self.__setattr__(prefix + unit, _fake(si.__getattr__(prefix + unit)))
                 self.__setattr__(
@@ -48,5 +49,6 @@ class FakeUnitRegistry:  # pylint: disable=too-few-public-methods
                 "h",
                 "bar",
                 "N",
+                "W",
             ):
                 self.__setattr__(prefix + unit, _fake(si.__getattr__(prefix + unit)))

PySDM/physics/trivia.py

@@ -125,3 +125,7 @@ class Trivia:  # pylint: disable=too-many-public-methods
     @staticmethod
     def mixing_ratio_to_specific_content(mixing_ratio):
         return mixing_ratio / (1 + mixing_ratio)
+
+    @staticmethod
+    def dn_dlogr(r, dn_dr):
+        return np.log(10) * r * dn_dr

PySDM/products/condensation/peak_supersaturation.py

@@ -19,6 +19,10 @@ class PeakSupersaturation(Product):
     def register(self, builder):
         super().register(builder)
         self.particulator.observers.append(self)
+
+        assert (
+            "Condensation" in self.particulator.dynamics
+        ), "It seems the Condensation dynamic was not added when building particulator"
         self.condensation = self.particulator.dynamics["Condensation"]
         self.RH_max = np.full_like(self.buffer, np.nan)
 

PySDM/products/housekeeping/__init__.py

@@ -1,9 +1,8 @@
 """
-Housekeeping products: time, parcel displacement, super-particle counts, wall-time timers...
+Housekeeping products: time, super-particle count, wall-time timers...
 """
 
 from .dynamic_wall_time import DynamicWallTime
-from .parcel_displacement import ParcelDisplacement
 from .super_droplet_count_per_gridbox import SuperDropletCountPerGridbox
 from .time import Time
 from .timers import CPUTime, WallTime

PySDM/products/parcel/__init__.py

@@ -1,3 +1,4 @@
 """ products specific to the parcel environment """
 
 from .cloud_water_path import ParcelLiquidWaterPath
+from .parcel_displacement import ParcelDisplacement

PySDM/products/size_spectral/__init__.py

@@ -4,6 +4,7 @@ from .arbitrary_moment import (
     RadiusFirstMoment,
     RadiusSixthMoment,
     VolumeFirstMoment,
+    VolumeSecondMoment,
     ZerothMoment,
 )
 from .effective_radius import EffectiveRadius

PySDM/products/size_spectral/arbitrary_moment.py

@@ -32,6 +32,10 @@ VolumeFirstMoment = make_arbitrary_moment_product(
     rank=1, attr="volume", attr_unit="m^3"
 )
 
+VolumeSecondMoment = make_arbitrary_moment_product(
+    rank=2, attr="volume", attr_unit="m^3"
+)
+
 RadiusSixthMoment = make_arbitrary_moment_product(rank=6, attr="radius", attr_unit="m")
 
 RadiusFirstMoment = make_arbitrary_moment_product(rank=1, attr="radius", attr_unit="m")

{PySDM-2.43.dist-info → PySDM-2.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.43
+Version: 2.45
 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
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -34,7 +34,7 @@ Provides-Extra: tests
 Requires-Dist: matplotlib ; extra == 'tests'
 Requires-Dist: pytest ; extra == 'tests'
 Requires-Dist: pytest-timeout ; extra == 'tests'
-Requires-Dist: PyPartMC ==1.0.3 ; extra == 'tests'
+Requires-Dist: PyPartMC ==1.1.0 ; extra == 'tests'
 Requires-Dist: pyrcel ; extra == 'tests'
 Requires-Dist: jupyter-core <5.0.0 ; extra == 'tests'
 Requires-Dist: ipywidgets !=8.0.3 ; extra == 'tests'

{PySDM-2.43.dist-info → PySDM-2.45.dist-info}/RECORD

@@ -1,6 +1,6 @@
 PySDM/__init__.py,sha256=-jFr7iN9cgzKvlcRdCA3NLAxMc_1NHyQR4uk0ZfF_A0,1640
 PySDM/builder.py,sha256=3xwlnz2HijK4FHYm1YlkxPE02udj-WbZULZcq-iXaSk,5682
-PySDM/formulae.py,sha256=8Kde9ZYRtk20yu8pEcgH5ldc_B_FHwmDG50sPg_5L9s,10793
+PySDM/formulae.py,sha256=9B2C4k2Z8okXtZr_yDY5vbtXWChBVMoXXXUQO70rXtk,10846
 PySDM/particulator.py,sha256=yh3QThCYsqIIoEHrUsmB8aIhh5iWL7T87C6or_xcyG4,16591
 PySDM/attributes/__init__.py,sha256=wR9DAJL3beWY_9IyDsbSjLV9BqJrOXdNScVCYy-Qtw8,55
 PySDM/attributes/chemistry/__init__.py,sha256=sv9kFUXgcZjbjmrQKK8sgdgqM05MPxAw73Euj0O3n40,223
@@ -76,7 +76,7 @@ PySDM/backends/impl_numba/methods/isotope_methods.py,sha256=_kP669HfXYXilO3pvrk3
 PySDM/backends/impl_numba/methods/moments_methods.py,sha256=p2y3TrLsCmmycGEadr9AyZZ5_Je7ZH_GMYVMhp1t0TE,5020
 PySDM/backends/impl_numba/methods/pair_methods.py,sha256=zAWINfSc9S2lrPNLkBQCdpqL-u_pCl2NH20mS2fR81U,5578
 PySDM/backends/impl_numba/methods/physics_methods.py,sha256=BdumMJMUh7NLxKscUhdCI_DlLZsSOwRu5kOEdMVFhQs,4982
-PySDM/backends/impl_numba/methods/terminal_velocity_methods.py,sha256=WiBw_CpUUP8T-R3K5x885WVISvTa2SvHGkuLJc2RXpY,1798
+PySDM/backends/impl_numba/methods/terminal_velocity_methods.py,sha256=19_JrUDk1V9zdnh-ZeBa0Z4EpM5YsfzURTaHpPRiyfA,2563
 PySDM/backends/impl_numba/test_helpers/__init__.py,sha256=8_cw4HYZE6jatsdpVWJHbbS2HwXWisbMpjFsos6JBqk,94
 PySDM/backends/impl_numba/test_helpers/scipy_ode_condensation_solver.py,sha256=6O7Xrpd7vcnJJjKwfHnDTYWc4Lzd_SLl1Cc2Rzkx9Pg,8400
 PySDM/backends/impl_thrust_rtc/__init__.py,sha256=iGWQO2nSMkX79is4W85b1MCM3oUE9miA20qI28wUvNM,36
@@ -95,7 +95,7 @@ PySDM/backends/impl_thrust_rtc/methods/isotope_methods.py,sha256=BHLS4yTlTVnrRea
 PySDM/backends/impl_thrust_rtc/methods/moments_methods.py,sha256=Rav3lhqwtNo1omRl_Wq0oU9e37sYJH2ZdEGZHNlaPrI,8006
 PySDM/backends/impl_thrust_rtc/methods/pair_methods.py,sha256=1QfyDh0cHB61umoEphMT37QcuHngTu7a-0tebGTbNz0,6997
 PySDM/backends/impl_thrust_rtc/methods/physics_methods.py,sha256=0BB-p5L9NQQnlE2IkMW40YldWq97FsWZYzQ6VzpePk8,5715
-PySDM/backends/impl_thrust_rtc/methods/terminal_velocity_methods.py,sha256=er7KXK2TNy4R11wBYGM6E-SOuYn4zmyXNq9RPMKjM8U,4273
+PySDM/backends/impl_thrust_rtc/methods/terminal_velocity_methods.py,sha256=yjrMlNjzkvgElFd41WzbVxiyHpwhWgvhZFtH4Xb1ppM,5150
 PySDM/backends/impl_thrust_rtc/methods/thrust_rtc_backend_methods.py,sha256=ZuHeSImR8--2RRmHTNITE2v_7PzbeCgC4zyL0hMsI6E,811
 PySDM/backends/impl_thrust_rtc/test_helpers/__init__.py,sha256=c-QZ2cI70jcZ8Yvb1ZHunobGypXHTxeaTAjuGM7qe_0,145
 PySDM/backends/impl_thrust_rtc/test_helpers/cpp2python.py,sha256=ThtAUqJ_Hqqsa0nVZvBvTrFOoiX95PaNWKzfpwvl6Cs,6048
@@ -149,12 +149,13 @@ PySDM/dynamics/impl/__init__.py,sha256=wQgfxtwzlaBeOY61t-6DQ-nXdrOh2VU2J4FBo_hzy
 PySDM/dynamics/impl/chemistry_utils.py,sha256=TylQxynIO7sgTwr_RO0LTcGP3-LO8vMAE98Uj2BJVyY,5243
 PySDM/dynamics/impl/random_generator_optimizer.py,sha256=lMlQn6jVNPKsCcZeroph_o-aZbinEx7BkKAsxWbh7ms,1515
 PySDM/dynamics/impl/random_generator_optimizer_nopair.py,sha256=MF_aGZqgEdV_x8JSu9G0Wv0xJ4lX6DcSeNWmbnkCnw8,1059
-PySDM/dynamics/terminal_velocity/__init__.py,sha256=ap9ZGtd6UvTJdXiGsGJ_D_nuUMxhKb6Li0SdXiWgP24,191
+PySDM/dynamics/terminal_velocity/__init__.py,sha256=uvxTCpUx_DMAVwLUvhcGKwo0_l8OVK7SaFD5HbKeulk,261
 PySDM/dynamics/terminal_velocity/gunn_and_kinzer.py,sha256=ykbZFHne_oOyBw5ABmdi633RZDmoOj1YKsb5T1bdAbQ,6400
+PySDM/dynamics/terminal_velocity/power_series.py,sha256=Fyqop4Y74s_qO-jPYUWe_-xYRjKV9Fs-GC6bImlzv5E,981
 PySDM/dynamics/terminal_velocity/rogers_and_yau.py,sha256=ZzG03esNoLayyHIYT2lUdKV2sOKNd9BhME96YCNXRUs,1033
 PySDM/environments/__init__.py,sha256=t9Pxa2ZdEcfh6siHPrcA1LbAMNNd0uoA2jdi5XoBxNg,246
 PySDM/environments/box.py,sha256=ai9j3lkOS001jIo1L-PvZ-cSFxsomD_Na4xshDKbE7c,1014
-PySDM/environments/kinematic_1d.py,sha256=5dNlebyMNvz6DFZ-fyFjyUoG7pAUgkhHfiNLjNQoiX8,2687
+PySDM/environments/kinematic_1d.py,sha256=kTZD3IdxUr-3Mk9RwC3lLH23DKaguphvw5S8_tMohDI,3257
 PySDM/environments/kinematic_2d.py,sha256=Pn4vIFB6jlAVBQGFnidHF8j5n_kZ0QhmGcazFqmxAZs,3341
 PySDM/environments/parcel.py,sha256=Me_9tRV8cxBcT4RcMeAYTVGzx77aSqPpViiTOwwyujY,4825
 PySDM/environments/impl/__init__.py,sha256=VLo3BCKoh2ITc5eMudK17HzmktSn74d-bCdjq9xbhRo,68
@@ -179,8 +180,8 @@ PySDM/initialisation/aerosol_composition/dry_aerosol.py,sha256=FxFqPyR7Fhg1mi5lY
 PySDM/initialisation/impl/__init__.py,sha256=vejuF9ebIGXb7l9zEiBBbNjs1Qct1KZuZRPLh8w3SJE,125
 PySDM/initialisation/impl/spectrum.py,sha256=mnhodIKZUReelgxgT3GwT8FH9LnyaUigmr1GaQIJkv8,1138
 PySDM/initialisation/sampling/__init__.py,sha256=zVwv6m1lrC4moviau-rL-tdGNL1pjx9KujEfEAmLe-Y,42
-PySDM/initialisation/sampling/spatial_sampling.py,sha256=EygEFcX5Jthe6F1hQVLFQ-f-J7BVWiHS3gAHNpndPqw,673
-PySDM/initialisation/sampling/spectral_sampling.py,sha256=-zD3wR9RuM9Q9WazCKaGbU--QiEBPB_W6eEzSvGT-jc,4313
+PySDM/initialisation/sampling/spatial_sampling.py,sha256=HPDEEjTN_CWU9KX2Fw_7wMMKzQRMqi1tKVhzZ1KLcWY,1000
+PySDM/initialisation/sampling/spectral_sampling.py,sha256=9Nd38R06EnbPLnpucu8occ-u1qmCGO6xD6PSSx8PYZY,4358
 PySDM/initialisation/sampling/spectro_glacial_sampling.py,sha256=Wtq-NvZGX3-hFzRe_2LI2Ab8vi1BAcHNtdrC5gk3Rfo,1662
 PySDM/initialisation/spectra/__init__.py,sha256=jU86INl3-p7HPOroJ5kGy7k43U4bxbXkfvffmvlIHz0,309
 PySDM/initialisation/spectra/exponential.py,sha256=bF61am70p4KJsU910SamlY_PO-rXVs9yErKXQIZ2LGE,364
@@ -191,18 +192,21 @@ PySDM/initialisation/spectra/sum.py,sha256=SaxepweOdCozWlUkxCfr6Udo-KjGKWXgrdS0a
 PySDM/initialisation/spectra/top_hat.py,sha256=xmBr_IrctsnguPNgX-jR7JnQnQl1qzIaEyz75fvAJho,563
 PySDM/physics/__init__.py,sha256=FLer5MXgu69MztiUN91rpVVRV75SX-_YCRZohTF3y-U,1745
 PySDM/physics/constants.py,sha256=wrIR-prH5ougsrL7jmpaIdmdmGZ5BejjmIEf5yFQpZs,1293
-PySDM/physics/constants_defaults.py,sha256=XGKJ6WhaJPZsRK0of8Oya5YyJjpCEq4ufWTu69DWo4A,10500
+PySDM/physics/constants_defaults.py,sha256=kha03ZhX3ZewG1L6CaHQJsWJhoxeOO8WU8V2J1NvQAc,10892
 PySDM/physics/dimensional_analysis.py,sha256=6_myMgc_eKhcbuNr7RqiQGj0OKNQ1TNqEMRb6Kzsqj0,688
-PySDM/physics/trivia.py,sha256=Y6DxnBp5a6BqGvfZNYlOWlP6X6mr2HHOUfWJ759N_sg,3677
+PySDM/physics/trivia.py,sha256=8fWqTP2G2jbnuK9xqpAIo-gfZ5ORx7In-b7AEUFAhBQ,3762
 PySDM/physics/condensation_coordinate/__init__.py,sha256=LlSg1TLiLRQ46tfsKA1Khg7SaVPd2wg-MF0Syk5O7ng,151
 PySDM/physics/condensation_coordinate/volume.py,sha256=DvkuOTHEq_vLFnJMjfEr0K0OUxTvcBBgFPlBb606sk8,410
 PySDM/physics/condensation_coordinate/volume_logarithm.py,sha256=92xFq-qSIN8llu9HM59DQvbwawzbeRBIZ5hi7KEs7gc,512
-PySDM/physics/diffusion_kinetics/__init__.py,sha256=kwHERKnqQdVa8Wv8qlTCL-Y4WxC5mInUuMoU6AVAQvs,210
+PySDM/physics/diffusion_kinetics/__init__.py,sha256=CWyIRClhDMzTLeNORHbg1izb-aGz00T6yORefVjwMsY,318
 PySDM/physics/diffusion_kinetics/fuchs_sutugin.py,sha256=6HSMZoyKzCa1Vl-CkIOFJalGNnQB5Cl5MFFVsRtibFc,1025
+PySDM/physics/diffusion_kinetics/grabowski_et_al_2011.py,sha256=_-bvXLcSfjPH2KEnRpSxyxG0olGi-hxkV2-nLBN4SwE,197
+PySDM/physics/diffusion_kinetics/jensen_and_nugent_2017.py,sha256=YVUVyLhwjs_i1LQ40ULXZri2--t41I0otzTEGj4UJQ0,424
 PySDM/physics/diffusion_kinetics/lowe_et_al_2019.py,sha256=mIR5jH00SNurVzKEgWk0e3-KKq65NbFqTHo3ZBDqzjY,621
 PySDM/physics/diffusion_kinetics/neglect.py,sha256=QCiLZwQo7VW29dftNuwQjLdOePz0kZSvjepGmqr_Ar8,500
-PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2005.py,sha256=ZsFuoGlPOoMuzdJ_h4pOM70lGhtyeiIATFcuEWlWwGY,473
-PySDM/physics/diffusion_thermics/__init__.py,sha256=70pZ4RhK-Ykz46r00gxfnkFYjPNf8i9KFc0oHzRtFtg,227
+PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2005.py,sha256=1GVoKpZ9sw5se-uxvnyjcOc4khLJ64hYTPoztMM5nz0,686
+PySDM/physics/diffusion_thermics/__init__.py,sha256=0m8nbzap79JQDOa6NOKaKX6issZi76KoBib9qxDV65Q,279
+PySDM/physics/diffusion_thermics/grabowski_et_al_2011.py,sha256=_JRfeYa_Bo9ylYbGPWKPVaNGJUNm5M4YJL4cm6c5zoI,695
 PySDM/physics/diffusion_thermics/lowe_et_al_2019.py,sha256=JkzhyHQwRHgui3M_fh3-QqXPlzjgtNrfHrcYFzAtl4Y,452
 PySDM/physics/diffusion_thermics/neglect.py,sha256=m_yXkbDMb_bnMlfQR2qjteTQ9cmbE3E6tDRC3M2DtUM,312
 PySDM/physics/diffusion_thermics/seinfeld_and_pandis_2010.py,sha256=Efz20-SZzbapGaxXlywj26BtGU3zATDMk9FkbYA9MTw,316
@@ -233,7 +237,7 @@ PySDM/physics/hygroscopicity/__init__.py,sha256=Iu3uM5NzjY9RCffhguD_hHrRy4DoVlz-
 PySDM/physics/hygroscopicity/kappa_koehler.py,sha256=cTuuShyG7v9PbTTjRc9Xp6Wua_5YZS6XycTMXOwb6Ok,606
 PySDM/physics/hygroscopicity/kappa_koehler_leading_terms.py,sha256=PzKLb9fPeR1jH872jtY5unNKGrmpLrFquXaT9WkCFu0,712
 PySDM/physics/impl/__init__.py,sha256=M0WoRoBIUk2fXAL2GKv4AS8QTIcOJQ5fzE1x53X1YHI,154
-PySDM/physics/impl/fake_unit_registry.py,sha256=IEwYsXHFCJrhLLD_ZcTyRDhPJKPPwErH2koCJiW8-kw,1683
+PySDM/physics/impl/fake_unit_registry.py,sha256=3Iv5vbMde_pTncJVQO51lzmnqGR1905oOjIPVG-NlFk,1728
 PySDM/physics/impl/flag.py,sha256=zjTKmfWEKY60AiNUWbxLVy3DBzXFMy-YaMxKnUjMap8,192
 PySDM/physics/isotope_equilibrium_fractionation_factors/__init__.py,sha256=BNh6k8VAqAX8BKH0LsVVTH1662wpvpIoGfbXbT5XQSg,681
 PySDM/physics/isotope_equilibrium_fractionation_factors/barkan_and_luz_2005.py,sha256=W_GaRPlA905UpoS4OYG7uIrBxSAb5UXwK2TyBZd-gHY,350
@@ -311,7 +315,7 @@ PySDM/products/condensation/__init__.py,sha256=4Trl0rt4f2j3XFnBMooMDIPaq2pjl86hF
 PySDM/products/condensation/activable_fraction.py,sha256=YoGJH7jTL2P6NH9-9E4og8ZUGb0sHpZTRs9pj1MZcxM,891
 PySDM/products/condensation/condensation_timestep.py,sha256=7vi2V0BwVXZDngVwY2u-zFpgN42_Dd_ykYg_NhjYyj0,1540
 PySDM/products/condensation/event_rates.py,sha256=-djWcPHbsO2V0tv9NoGp98y1MU-qHjFyceGm1I75P98,1812
-PySDM/products/condensation/peak_supersaturation.py,sha256=dVJdt-J1woS-YqdjDzgl7TKcPHig3HturJY5d5_RRS8,1111
+PySDM/products/condensation/peak_supersaturation.py,sha256=e0AwMjooCueuQ3YLrUZ6AxahGQLJdh5ocOE1SVMYyaE,1274
 PySDM/products/displacement/__init__.py,sha256=dHAXQ2b7jmQVMYdWkIuGjGz56EU0UyJMRDyKV0meo1w,315
 PySDM/products/displacement/averaged_terminal_velocity.py,sha256=h2JBUmYkTeyGwGdVJoGsYeY0XJStg2pwGcuDpZVT-mk,1172
 PySDM/products/displacement/flow_velocity_component.py,sha256=I5K8gpKeMDYlCeIYuwF3W7hGsHHSKLp-my-OPcwYb0k,1383
@@ -323,9 +327,8 @@ PySDM/products/freezing/freezable_specific_concentration.py,sha256=I4RJMBFCVDvDj
 PySDM/products/freezing/frozen_particle_concentration.py,sha256=8SpNQXOGQb1sIcnZWBwoR1kWNh1CgkbMJsuy48gwB9c,1460
 PySDM/products/freezing/ice_nuclei_concentration.py,sha256=iAd_-TMc3Q9Q6PQTkvYMhxYi6HofI7VFRJopGAhPWLY,1277
 PySDM/products/freezing/total_unfrozen_immersed_surface_area.py,sha256=0qMCsERyDMwcXg41SQQgSgDbwqjtQtoxSlozaIIkQkU,744
-PySDM/products/housekeeping/__init__.py,sha256=UAPGrdoyGwIDFDrx4vUTFyQOfvmShuuzsC1YHksROak,335
+PySDM/products/housekeeping/__init__.py,sha256=S4q5D5NgTtDMD94uyAVMP5omVCzMQY2i6hRz_4taGDs,261
 PySDM/products/housekeeping/dynamic_wall_time.py,sha256=lcpeMNTjwjAvO0uLpawLSo0YPxvoQeQp9CEDttRWPkg,643
-PySDM/products/housekeeping/parcel_displacement.py,sha256=zDklDrFT2EBUw2uyxm1R7Ud301lN0D6uIwRzhJuqeQ4,653
 PySDM/products/housekeeping/super_droplet_count_per_gridbox.py,sha256=4aWPrPOSU7NUUZ0zXsBJDJvQ4id9mn84EIlBoMuExz4,996
 PySDM/products/housekeeping/time.py,sha256=LvGhRNtCHtZGO8Anfc_Vo_xtA34T3w41HvtBhwEyeAk,457
 PySDM/products/housekeeping/timers.py,sha256=bgaQNhqI6KuMDLUqDCCZNIAs4Ldvxf6okyv7Mm-t59Q,1085
@@ -340,10 +343,11 @@ PySDM/products/impl/spectrum_moment_product.py,sha256=0QUUBJyzbNmnGTgv1Ol9dtf2av
 PySDM/products/optical/__init__.py,sha256=jBNQ2aUR6hUfZZtZPt9UR5866EeOdgtMU-FjlXZ6x_U,123
 PySDM/products/optical/cloud_albedo.py,sha256=aW8_Rz7lFBoXMar45ub2iIcEidBt5Rc8X84KX__M_d8,315
 PySDM/products/optical/cloud_optical_depth.py,sha256=Vm0WPCWbCTG305XTP-denNzgIkqyLojfTW-2a3rbsy4,391
-PySDM/products/parcel/__init__.py,sha256=U3oSlIGv4hXgvxbKv87lZAQTvC24FjjM29sojaT-e1Q,105
+PySDM/products/parcel/__init__.py,sha256=SfVQ25TE48njgj0TyQ9VJ1OG8LGXVqxFBA-mgfbb0S0,157
 PySDM/products/parcel/cloud_water_path.py,sha256=J9FQ6m7pfGa6cyV5CzXcDPKhlN0iuwQj4O8YCXAC-ho,1823
-PySDM/products/size_spectral/__init__.py,sha256=ZooEolyv6wkEaeBrNex5D5_MYUqegPywQ0dr_0Ga5mA,1570
-PySDM/products/size_spectral/arbitrary_moment.py,sha256=K642dzCyX5TvX9rfFRqlqZol2Wcfl-fGvv7TXgBUoDI,1110
+PySDM/products/parcel/parcel_displacement.py,sha256=zDklDrFT2EBUw2uyxm1R7Ud301lN0D6uIwRzhJuqeQ4,653
+PySDM/products/size_spectral/__init__.py,sha256=8B4wiFGoyXbAjR09eRWpCCeVT14ZMooh7VLBQ1Pjl7g,1594
+PySDM/products/size_spectral/arbitrary_moment.py,sha256=YukqGvkYuKzWbDkaDCbsgcaM-siXY80iN3zRwMbgXIA,1208
 PySDM/products/size_spectral/cloud_water_content.py,sha256=iZNIhF02jQzlHa4dGTMRosGrq_jhf-F9-gwN1AYKHD4,2522
 PySDM/products/size_spectral/effective_radius.py,sha256=Fm7WWNvLKG0arBp8fqXmlhkbWNb1SblJ-PbMOZKRNJw,1878
 PySDM/products/size_spectral/effective_radius_activated.py,sha256=WzqRNMxpFvcezzz92IhWlZFIFnQdKbL5Jho2F7jCauk,1351
@@ -360,8 +364,8 @@ PySDM/products/size_spectral/size_standard_deviation.py,sha256=ikW_BefV27gwUlDPo
 PySDM/products/size_spectral/total_particle_concentration.py,sha256=stDEn67KGhxEkrOC4CCfCFVgjtQPMphZTfJ1Vy_H5aw,454
 PySDM/products/size_spectral/total_particle_specific_concentration.py,sha256=z6SfknIoXgT2XbVeuswrwBew9yTlmbW7qWFRmD4rqUg,460
 PySDM/products/size_spectral/water_mixing_ratio.py,sha256=i2g2s8Hj_ZTmggZvXuGRWnqyxutSknncY8Imzw_Vfhk,1301
-PySDM-2.43.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-PySDM-2.43.dist-info/METADATA,sha256=OZxq_SDHyH4Yhm_oCxQbZJ7bp7mZzEzDS5NdLFh8IiA,45361
-PySDM-2.43.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-PySDM-2.43.dist-info/top_level.txt,sha256=6NYaDAhUnaYMD7ebD_dQ7HlhiJS7NMuKEXb0ck7Wcsg,6
-PySDM-2.43.dist-info/RECORD,,
+PySDM-2.45.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+PySDM-2.45.dist-info/METADATA,sha256=8azh6MqIvPeMTMBcvLKqPIOH5pi-ETHBMnqzXfm-GDM,45361
+PySDM-2.45.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+PySDM-2.45.dist-info/top_level.txt,sha256=6NYaDAhUnaYMD7ebD_dQ7HlhiJS7NMuKEXb0ck7Wcsg,6
+PySDM-2.45.dist-info/RECORD,,