PySDM 2.43__tar.gz → 2.44__tar.gz

{PySDM-2.43 → PySDM-2.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.43
+Version: 2.44
 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

{PySDM-2.43 → PySDM-2.44}/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-2.43 → PySDM-2.44}/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-2.43 → PySDM-2.44}/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-2.44/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-2.43 → PySDM-2.44}/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-2.43 → PySDM-2.44}/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-2.43 → PySDM-2.44}/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-2.43 → PySDM-2.44}/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-2.43 → PySDM-2.44}/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-2.43 → PySDM-2.44}/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-2.43 → PySDM-2.44}/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 → PySDM-2.44}/PySDM.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.43
+Version: 2.44
 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

{PySDM-2.43 → PySDM-2.44}/PySDM.egg-info/SOURCES.txt

@@ -176,6 +176,7 @@ PySDM/dynamics/impl/random_generator_optimizer.py
 PySDM/dynamics/impl/random_generator_optimizer_nopair.py
 PySDM/dynamics/terminal_velocity/__init__.py
 PySDM/dynamics/terminal_velocity/gunn_and_kinzer.py
+PySDM/dynamics/terminal_velocity/power_series.py
 PySDM/dynamics/terminal_velocity/rogers_and_yau.py
 PySDM/environments/__init__.py
 PySDM/environments/box.py
@@ -350,7 +351,6 @@ PySDM/products/freezing/ice_nuclei_concentration.py
 PySDM/products/freezing/total_unfrozen_immersed_surface_area.py
 PySDM/products/housekeeping/__init__.py
 PySDM/products/housekeeping/dynamic_wall_time.py
-PySDM/products/housekeeping/parcel_displacement.py
 PySDM/products/housekeeping/super_droplet_count_per_gridbox.py
 PySDM/products/housekeeping/time.py
 PySDM/products/housekeeping/timers.py
@@ -367,6 +367,7 @@ PySDM/products/optical/cloud_albedo.py
 PySDM/products/optical/cloud_optical_depth.py
 PySDM/products/parcel/__init__.py
 PySDM/products/parcel/cloud_water_path.py
+PySDM/products/parcel/parcel_displacement.py
 PySDM/products/size_spectral/__init__.py
 PySDM/products/size_spectral/arbitrary_moment.py
 PySDM/products/size_spectral/cloud_water_content.py
@@ -557,6 +558,13 @@ examples/PySDM_examples/Yang_et_al_2018/__init__.py
 examples/PySDM_examples/Yang_et_al_2018/fig_2.ipynb
 examples/PySDM_examples/Yang_et_al_2018/settings.py
 examples/PySDM_examples/Yang_et_al_2018/simulation.py
+examples/PySDM_examples/deJong_Azimi/__init__.py
+examples/PySDM_examples/deJong_Azimi/box.ipynb
+examples/PySDM_examples/deJong_Azimi/cloudy_data.py
+examples/PySDM_examples/deJong_Azimi/cloudy_data_0d.py
+examples/PySDM_examples/deJong_Azimi/rainshaft.ipynb
+examples/PySDM_examples/deJong_Azimi/settings1D.py
+examples/PySDM_examples/deJong_Azimi/simulation_0D.py
 examples/PySDM_examples/deJong_Mackay_et_al_2023/__init__.py
 examples/PySDM_examples/deJong_Mackay_et_al_2023/fig_9.ipynb
 examples/PySDM_examples/deJong_Mackay_et_al_2023/figs_10_11_12_13.ipynb
@@ -604,6 +612,7 @@ tests/smoke_tests/box/dejong_and_mackay_et_al_2023/test_collision.py
 tests/smoke_tests/box/dejong_and_mackay_et_al_2023/test_fig_6.py
 tests/smoke_tests/box/dejong_and_mackay_et_al_2023/test_fig_7.py
 tests/smoke_tests/box/dejong_and_mackay_et_al_2023/test_fig_8.py
+tests/smoke_tests/box/dejong_azimi/test_box.py
 tests/smoke_tests/box/partmc/__init__.py
 tests/smoke_tests/box/partmc/test_dry_wet_equilibration.py
 tests/smoke_tests/box/shima_et_al_2009/__init__.py
@@ -612,6 +621,9 @@ tests/smoke_tests/box/srivastava_1982/__init__.py
 tests/smoke_tests/box/srivastava_1982/test_eq_10.py
 tests/smoke_tests/box/srivastava_1982/test_eq_13.py
 tests/smoke_tests/box/srivastava_1982/test_equations.py
+tests/smoke_tests/kinematic_1d/deJong_Azimi/__init__.py
+tests/smoke_tests/kinematic_1d/deJong_Azimi/test_few_steps.py
+tests/smoke_tests/kinematic_1d/deJong_Azimi/test_initial_condition.py
 tests/smoke_tests/kinematic_1d/shipway_and_hill_2012/__init__.py
 tests/smoke_tests/kinematic_1d/shipway_and_hill_2012/test_1d_exporters.py
 tests/smoke_tests/kinematic_1d/shipway_and_hill_2012/test_few_steps.py

{PySDM-2.43 → PySDM-2.44}/PySDM.egg-info/requires.txt

@@ -11,7 +11,7 @@ pyevtk
 matplotlib
 pytest
 pytest-timeout
-PyPartMC==1.0.3
+PyPartMC==1.1.0
 pyrcel
 jupyter-core<5.0.0
 ipywidgets!=8.0.3