PySDM 2.62__tar.gz → 2.64__tar.gz

{PySDM-2.62 → PySDM-2.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.62
+Version: 2.64
 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.62 → PySDM-2.64}/PySDM/products/impl/concentration_product.py

@@ -7,19 +7,23 @@ from PySDM.products.impl.moment_product import MomentProduct
 
 
 class ConcentrationProduct(MomentProduct):
+    @staticmethod
+    def check_ctor_arguments(specific, stp):
+        if stp and specific:
+            raise ValueError(
+                "std-temperature-and-pressure precludes specific conc. option"
+            )
+
     def __init__(self, *, unit: str, name: str, specific: bool, stp: bool):
         """
         `stp` toggles expressing the concentration in terms of standard temperature
         and pressure conditions (ground level of the ICAO standard atmosphere, zero humidity)
         """
+        self.check_ctor_arguments(specific, stp)
         super().__init__(unit=unit, name=name)
         self.specific = specific
         self.stp = stp
         self.rho_stp = None
-        if self.stp and self.specific:
-            raise ValueError(
-                "std-temperature-and-pressure precludes specific conc. option"
-            )
 
     def register(self, builder):
         super().register(builder)

{PySDM-2.62 → PySDM-2.64}/PySDM/products/size_spectral/__init__.py

@@ -19,7 +19,7 @@ from .particle_concentration_activated import (
     ActivatedParticleSpecificConcentration,
 )
 from .particle_size_spectrum import (
-    ParticleSizeSpectrumPerMass,
+    ParticleSizeSpectrumPerMassOfDryAir,
     ParticleSizeSpectrumPerVolume,
 )
 from .particle_volume_versus_radius_logarithm_spectrum import (

{PySDM-2.62 → PySDM-2.64}/PySDM/products/size_spectral/particle_size_spectrum.py

@@ -1,5 +1,5 @@
 """
-wet radius-binned particle size spectra (per mass of dry air or per volume of air)
+wet- or dry-radius binned particle size spectra (per mass of dry air or per volume of air)
 """
 
 from abc import ABC
@@ -7,22 +7,33 @@ from abc import ABC
 import numpy as np
 
 from PySDM.products.impl.spectrum_moment_product import SpectrumMomentProduct
+from PySDM.products.impl.concentration_product import ConcentrationProduct
 
 
 class ParticleSizeSpectrum(SpectrumMomentProduct, ABC):
     def __init__(
-        self, *, radius_bins_edges, name, unit, dry=False, normalise_by_dv=False
+        self,
+        *,
+        stp: bool,
+        radius_bins_edges,
+        name: str,
+        unit: str,
+        dry: bool = False,
+        specific: bool = False,
     ):
+        ConcentrationProduct.check_ctor_arguments(specific, stp)
         self.volume_attr = "dry volume" if dry else "volume"
         self.radius_bins_edges = radius_bins_edges
-        self.normalise_by_dv = normalise_by_dv
+        self.specific = specific
+        self.stp = stp
+        self.rho_stp = None
         super().__init__(name=name, unit=unit, attr_unit="m^3")
 
     def register(self, builder):
         builder.request_attribute(self.volume_attr)
 
         volume_bins_edges = builder.particulator.formulae.trivia.volume(
-            self.radius_bins_edges
+            np.asarray(self.radius_bins_edges)
         )
         self.attr_bins_edges = builder.particulator.backend.Storage.from_ndarray(
             volume_bins_edges
@@ -31,6 +42,7 @@ class ParticleSizeSpectrum(SpectrumMomentProduct, ABC):
         super().register(builder)
 
         self.shape = (*builder.particulator.mesh.grid, len(self.attr_bins_edges) - 1)
+        self.rho_stp = builder.formulae.constants.rho_STP
 
     def _impl(self, **kwargs):
         vals = np.empty([self.particulator.mesh.n_cell, len(self.attr_bins_edges) - 1])
@@ -42,37 +54,52 @@ class ParticleSizeSpectrum(SpectrumMomentProduct, ABC):
             self._download_spectrum_moment_to_buffer(rank=0, bin_number=i)
             vals[:, i] = self.buffer.ravel()
 
-        if self.normalise_by_dv:
-            vals[:] /= self.particulator.mesh.dv
+        vals[:] /= self.particulator.mesh.dv
+
+        if self.specific or self.stp:
+            self._download_to_buffer(self.particulator.environment["rhod"])
 
-        self._download_to_buffer(self.particulator.environment["rhod"])
-        rhod = self.buffer.ravel()
         for i in range(len(self.attr_bins_edges) - 1):
             dr = self.formulae.trivia.radius(
                 volume=self.attr_bins_edges[i + 1]
             ) - self.formulae.trivia.radius(volume=self.attr_bins_edges[i])
-            vals[:, i] /= rhod * dr
+            vals[:, i] /= dr
+            if self.specific or self.stp:
+                vals[:, i] /= self.buffer.ravel()
+                if self.stp:
+                    vals[:, i] *= self.rho_stp
 
         return np.squeeze(vals.reshape(self.shape))
 
 
-class ParticleSizeSpectrumPerMass(ParticleSizeSpectrum):
-    def __init__(self, radius_bins_edges, dry=False, name=None, unit="kg^-1 m^-1"):
+class ParticleSizeSpectrumPerMassOfDryAir(ParticleSizeSpectrum):
+    def __init__(
+        self,
+        *,
+        radius_bins_edges,
+        dry=False,
+        name=None,
+        unit="kg^-1 m^-1",
+    ):
         super().__init__(
             radius_bins_edges=radius_bins_edges,
             dry=dry,
-            normalise_by_dv=True,
+            specific=True,
             name=name,
             unit=unit,
+            stp=False,
         )
 
 
 class ParticleSizeSpectrumPerVolume(ParticleSizeSpectrum):
-    def __init__(self, radius_bins_edges, dry=False, name=None, unit="m^-3 m^-1"):
+    def __init__(
+        self, *, radius_bins_edges, dry=False, name=None, unit="m^-3 m^-1", stp=False
+    ):
         super().__init__(
             radius_bins_edges=radius_bins_edges,
             dry=dry,
-            normalise_by_dv=False,
+            specific=False,
             name=name,
             unit=unit,
+            stp=stp,
         )

{PySDM-2.62 → PySDM-2.64}/PySDM.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.62
+Version: 2.64
 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.62 → PySDM-2.64}/PySDM.egg-info/SOURCES.txt

@@ -834,6 +834,7 @@ tests/unit_tests/products/test_effective_radii.py
 tests/unit_tests/products/test_impl.py
 tests/unit_tests/products/test_parcel_liquid_water_path.py
 tests/unit_tests/products/test_particle_size_product.py
+tests/unit_tests/products/test_particle_size_spectrum.py
 tutorials/README.md
 tutorials/collisions/collection_droplet.svg
 tutorials/collisions/collisions_playground.ipynb

{PySDM-2.62 → PySDM-2.64}/PySDM.egg-info/requires.txt

@@ -1,7 +1,7 @@
 ThrustRTC==0.3.20
 CURandRTC>=0.1.2
 numba>=0.51.2
-numpy
+numpy<2.0.0
 Pint
 chempy
 scipy
@@ -11,7 +11,7 @@ pyevtk
 matplotlib
 pytest
 pytest-timeout
-PyPartMC==1.3.1
+PyPartMC==1.3.2
 pyrcel
 jupyter-core<5.0.0
 ipywidgets!=8.0.3