PySDM 2.116__tar.gz → 2.118__tar.gz

{pysdm-2.116 → pysdm-2.118}/PKG-INFO

@@ -1,10 +1,8 @@
 Metadata-Version: 2.1
 Name: pysdm
-Version: 2.116
+Version: 2.118
 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
-Author-email: sylwester.arabas@agh.edu.pl
+Author-email: "https://github.com/open-atmos/PySDM/graphs/contributors" <sylwester.arabas@agh.edu.pl>
 License: GPL-3.0
 Project-URL: Tracker, https://github.com/open-atmos/PySDM/issues
 Project-URL: Documentation, https://open-atmos.github.io/PySDM
@@ -20,6 +18,7 @@ Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ThrustRTC==0.3.20
@@ -40,7 +39,7 @@ Requires-Dist: pyrcel; extra == "tests"
 Requires-Dist: jupyter-core<5.0.0; extra == "tests"
 Requires-Dist: ipywidgets!=8.0.3; extra == "tests"
 
-# <img src="https://raw.githubusercontent.com/open-atmos/PySDM/main/docs/logos/pysdm_logo.png" width=100 height=146 alt="pysdm logo">
+# <img src="https://raw.githubusercontent.com/open-atmos/PySDM/main/docs/logos/pysdm_logo.svg" width=100 height=146 alt="pysdm logo">
 
 [![Python 3](https://img.shields.io/static/v1?label=Python&logo=Python&color=3776AB&message=3)](https://www.python.org/)
 [![LLVM](https://img.shields.io/static/v1?label=LLVM&logo=LLVM&color=gold&message=Numba)](https://numba.pydata.org)

{pysdm-2.116 → pysdm-2.118}/PySDM/backends/impl_numba/methods/freezing_methods.py

@@ -116,7 +116,7 @@ class FreezingMethods(BackendMethods):
         a_w_ice,
         temperature,
         relative_humidity,
-        thaw: bool
+        thaw: bool,
     ):
         self.freeze_time_dependent_body(
             rand.data,

{pysdm-2.116 → pysdm-2.118}/PySDM/environments/kinematic_1d.py

@@ -40,7 +40,7 @@ class Kinematic1D(Moist):
         spectral_discretisation,
         kappa,
         z_part=None,
-        collisions_only=False
+        collisions_only=False,
     ):
         super().sync()
         self.notify()

{pysdm-2.116 → pysdm-2.118}/PySDM/environments/kinematic_2d.py

@@ -44,7 +44,7 @@ class Kinematic2D(Moist):
         dry_radius_spectrum,
         rtol=default_rtol,
         n_sd=None,
-        spectral_sampling=ConstantMultiplicity
+        spectral_sampling=ConstantMultiplicity,
     ):
         super().sync()
         self.notify()

{pysdm-2.116 → pysdm-2.118}/PySDM/initialisation/aerosol_composition/dry_aerosol.py

@@ -26,7 +26,7 @@ class DryAerosolMixture:
         densities: Dict[str, float],
         molar_masses: Dict[str, float],
         is_soluble: Dict[str, bool],
-        ionic_dissociation_phi: Dict[str, int]
+        ionic_dissociation_phi: Dict[str, int],
     ):
         self._modes = None
         self.compounds = compounds

{pysdm-2.116 → pysdm-2.118}/PySDM/physics/surface_tension/compressed_film_ruehl.py

@@ -81,7 +81,7 @@ class CompressedFilmRuehl:  # pylint: disable=too-few-public-methods
                 minfun(bracket[1], *args),
                 rtol,
                 max_iters,
-                within_tolerance
+                within_tolerance,
             )
             assert iters != max_iters
 

{pysdm-2.116 → pysdm-2.118}/PySDM/products/aqueous_chemistry/acidity.py

@@ -17,7 +17,7 @@ class Acidity(MomentProduct):
         weighting="volume",
         attr="conc_H",
         unit="dimensionless",
-        name=None
+        name=None,
     ):
         assert attr in ("pH", "moles_H", "conc_H")
         self.attr = attr

{pysdm-2.116 → pysdm-2.118}/PySDM/products/freezing/frozen_particle_concentration.py

@@ -17,7 +17,7 @@ class FrozenParticleConcentration(ConcentrationProduct):
         unit="m^-3",
         name=None,
         specific=False,
-        stp=False
+        stp=False,
     ):
         super().__init__(specific=specific, stp=stp, unit=unit, name=name)
         self.__filter_range = [-np.inf, 0]

{pysdm-2.116 → pysdm-2.118}/examples/PySDM_examples/Arabas_and_Shima_2017/simulation.py

@@ -25,7 +25,7 @@ class Simulation:
                     {"override_jit_flags": {"parallel": False}}
                     if backend == CPU
                     else {}
-                )
+                ),
             ),
             n_sd=1,
             environment=Parcel(

{pysdm-2.116 → pysdm-2.118}/examples/PySDM_examples/Arabas_et_al_2025/make_particulator.py

@@ -25,7 +25,7 @@ def make_particulator(
     droplet_volume,
     total_particle_number,
     volume,
-    thaw=False
+    thaw=False,
 ):
     formulae_ctor_args = {
         "seed": seed,

{pysdm-2.116 → pysdm-2.118}/examples/PySDM_examples/Grabowski_and_Pawlowska_2023/settings.py

@@ -24,7 +24,7 @@ class Settings:
         displacement: float = 1000 * si.m,
         mass_accommodation_coefficient: float = 0.3,
         rtol_thd: float = condensation_tolerance,
-        rtol_x: float = condensation_tolerance
+        rtol_x: float = condensation_tolerance,
     ):
         self.formulae = Formulae(constants={"MAC": mass_accommodation_coefficient})
         self.n_sd = n_sd

{pysdm-2.116 → pysdm-2.118}/examples/PySDM_examples/Niedermeier_et_al_2014/settings.py

@@ -15,7 +15,7 @@ class Settings:
         ccn_sampling_n: int = 11,
         in_sampling_n: int = 20,
         initial_temperature: float,
-        timestep: float
+        timestep: float,
     ):
         self.ccn_sampling_n = ccn_sampling_n
         self.in_sampling_n = in_sampling_n

{pysdm-2.116 → pysdm-2.118}/examples/PySDM_examples/Shipway_and_Hill_2012/settings.py

@@ -48,7 +48,7 @@ class Settings:
         enable_condensation: bool = True,
         formulae: Formulae = None,
         save_spec_and_attr_times=(),
-        collision_kernel=None
+        collision_kernel=None,
     ):
         self.formulae = formulae or Formulae()
         self.n_sd_per_gridbox = n_sd_per_gridbox

{pysdm-2.116 → pysdm-2.118}/examples/PySDM_examples/Szumowski_et_al_1998/gui_settings.py

@@ -250,7 +250,7 @@ class GUISettings:
     def formulae(self) -> Formulae:
         return Formulae(
             **{widget.description: widget.value for widget in self.ui_formulae_options},
-            constants={"NIEMAND_A": 0, "NIEMAND_B": 0, "ABIFM_M": 0, "ABIFM_C": 0}
+            constants={"NIEMAND_A": 0, "NIEMAND_B": 0, "ABIFM_M": 0, "ABIFM_C": 0},
         )
 
     @property

{pysdm-2.116 → pysdm-2.118}/examples/PySDM_examples/Szumowski_et_al_1998/mpdata_2d.py

@@ -28,7 +28,7 @@ class MPDATA_2D:
         n_iters=2,
         infinite_gauge=True,
         nonoscillatory=True,
-        third_order_terms=False
+        third_order_terms=False,
     ):
         self._grid = grid
         self.size = size
@@ -65,7 +65,7 @@ class MPDATA_2D:
             options=self._options,
             grid=self._grid,
             non_unit_g_factor=True,
-            **disable_threads_if_needed
+            **disable_threads_if_needed,
         )
 
         advector_impl = VectorField(

{pysdm-2.116 → pysdm-2.118}/examples/PySDM_examples/deJong_Azimi/settings1D.py

@@ -42,7 +42,7 @@ class Settings1D(SettingsSH):
         precip: bool = True,
         formulae: Formulae = None,
         save_spec_and_attr_times=(),
-        z_part=(0.5, 0.75)
+        z_part=(0.5, 0.75),
     ):
         super().__init__(
             n_sd_per_gridbox=n_sd_per_gridbox,

{pysdm-2.116 → pysdm-2.118}/examples/PySDM_examples/deJong_Mackay_et_al_2023/settings1D.py

@@ -49,7 +49,7 @@ class Settings1D(SettingsSH):
         stochastic_breakup: bool = False,
         warn_breakup_overflow: bool = False,
         output_every_n_steps: int = 1,
-        save_spec_at=()
+        save_spec_at=(),
     ):
         if stochastic_breakup:
             self.coalescence_efficiency = Straub2010Ec()

pysdm-2.118/pyproject.toml

@@ -0,0 +1,46 @@
+[tool.isort]
+profile = "black"
+
+[tool.setuptools_scm]
+local_scheme = "no-local-version"
+version_scheme = "post-release"
+
+[tool.setuptools.packages.find]
+include = ["PySDM", "PySDM*"]
+
+[build-system]
+requires = ['setuptools==75.3.0', 'setuptools-scm==8.1.0']
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pysdm"
+description = "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"
+readme = "README.md"
+keywords = ["physics-simulation", "monte-carlo-simulation", "gpu-computing",
+    "atmospheric-modelling", "particle-system", "numba", "thrust",
+    "nvrtc", "pint", "atmospheric-physics",
+    ]
+license = {text = "GPL-3.0"}
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Scientific/Engineering :: Atmospheric Science",
+    "Topic :: Scientific/Engineering :: Mathematics",
+    "Topic :: Scientific/Engineering :: Physics",
+    "Topic :: Software Development :: Libraries",
+]
+requires-python = ">= 3.8"
+authors = [
+    {name = "https://github.com/open-atmos/PySDM/graphs/contributors", email = "sylwester.arabas@agh.edu.pl"}
+]     
+dynamic = ["version", "dependencies", "optional-dependencies"]
+[project.urls]
+Tracker = "https://github.com/open-atmos/PySDM/issues"
+Documentation = "https://open-atmos.github.io/PySDM"
+Source = "https://github.com/open-atmos/PySDM"
+
+

{pysdm-2.116 → pysdm-2.118}/pysdm.egg-info/PKG-INFO

@@ -1,10 +1,8 @@
 Metadata-Version: 2.1
 Name: pysdm
-Version: 2.116
+Version: 2.118
 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
-Author-email: sylwester.arabas@agh.edu.pl
+Author-email: "https://github.com/open-atmos/PySDM/graphs/contributors" <sylwester.arabas@agh.edu.pl>
 License: GPL-3.0
 Project-URL: Tracker, https://github.com/open-atmos/PySDM/issues
 Project-URL: Documentation, https://open-atmos.github.io/PySDM
@@ -20,6 +18,7 @@ Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ThrustRTC==0.3.20
@@ -40,7 +39,7 @@ Requires-Dist: pyrcel; extra == "tests"
 Requires-Dist: jupyter-core<5.0.0; extra == "tests"
 Requires-Dist: ipywidgets!=8.0.3; extra == "tests"
 
-# <img src="https://raw.githubusercontent.com/open-atmos/PySDM/main/docs/logos/pysdm_logo.png" width=100 height=146 alt="pysdm logo">
+# <img src="https://raw.githubusercontent.com/open-atmos/PySDM/main/docs/logos/pysdm_logo.svg" width=100 height=146 alt="pysdm logo">
 
 [![Python 3](https://img.shields.io/static/v1?label=Python&logo=Python&color=3776AB&message=3)](https://www.python.org/)
 [![LLVM](https://img.shields.io/static/v1?label=LLVM&logo=LLVM&color=gold&message=Numba)](https://numba.pydata.org)

pysdm-2.118/setup.py

@@ -0,0 +1,78 @@
+# pylint:disable=missing-module-docstring
+import os
+import sys
+
+from setuptools import setup
+
+CI = "CI" in os.environ
+
+dependencies = [
+    "ThrustRTC==0.3.20",
+    "CURandRTC" + ("==0.1.6" if CI else ">=0.1.2"),
+    "numba"
+    + (
+        {
+            8: "==0.58.1",
+            9: "==0.60.0",
+            10: "==0.60.0",
+            11: "==0.60.0",
+            12: "==0.60.0",
+            13: "==0.60.0",
+        }[sys.version_info.minor]
+        if CI
+        else ">=0.51.2"
+    ),
+    # TODO #1344: (numpy 2.0.0 incompatibility in https://github.com/bjodah/chempy/issues/234)
+    "numpy"
+    + (
+        {
+            8: "==1.24.4",
+            9: "==1.24.4",
+            10: "==1.24.4",
+            11: "==1.24.4",
+            12: "==1.26.4",
+            13: "==1.26.4",
+        }[sys.version_info.minor]
+        if CI
+        else ""
+    ),
+    "Pint" + ("==0.21.1" if CI else ""),
+    "chempy" + ("==0.8.3" if CI else ""),
+    "scipy"
+    + (
+        {
+            8: "==1.10.1",
+            9: "==1.10.1",
+            10: "==1.10.1",
+            11: "==1.10.1",
+            12: "==1.13.0",
+            13: "==1.13.0",
+        }[sys.version_info.minor]
+        if CI
+        else ""
+    ),
+    "pyevtk" + ("==1.2.0" if CI else ""),
+]
+
+optional_dependencies = {
+    "tests": [
+        "matplotlib",
+        "pytest",
+        "pytest-timeout",
+        "PySDM-examples",
+        "open-atmos-jupyter-utils>=v1.2.0",
+    ]
+    + (["PyPartMC==1.3.6"] if sys.version_info < (3, 12) else [])  # TODO #1410
+    + (
+        [
+            "pyrcel",
+            "jupyter-core<5.0.0",
+            "ipywidgets!=8.0.3",
+        ]
+    )
+}
+
+setup(
+    install_requires=dependencies,
+    extras_require=optional_dependencies,
+)

{pysdm-2.116 → pysdm-2.118}/tests/smoke_tests/box/srivastava_1982/test_eq_13.py

@@ -28,7 +28,7 @@ COMMON_PARAMS = {
                 srivastava_beta=1e-15 / si.s,
                 frag_mass=-1 * si.g,
                 n_sds=(8, 128),
-                **COMMON_PARAMS
+                **COMMON_PARAMS,
             ),
         ),
         (
@@ -38,7 +38,7 @@ COMMON_PARAMS = {
                 srivastava_beta=1e-9 / si.s,
                 frag_mass=0.25 * si.g,
                 n_sds=(64, 256),
-                **COMMON_PARAMS
+                **COMMON_PARAMS,
             ),
         ),
         (
@@ -48,7 +48,7 @@ COMMON_PARAMS = {
                 srivastava_beta=1e-9 / si.s,
                 frag_mass=0.25 * si.g,
                 n_sds=(2**10, 2**12),
-                **COMMON_PARAMS
+                **COMMON_PARAMS,
             ),
         ),
     ),

{pysdm-2.116 → pysdm-2.118}/tests/unit_tests/dynamics/collisions/test_efficiencies.py

@@ -109,7 +109,7 @@ class TestEfficiencies:
                 *np.meshgrid(drop_size_L_diam, drop_size_S_diam),
                 res.T,
                 levels=np.linspace(0.0, 1.0, 11),
-                cmap="jet"
+                cmap="jet",
             )
         )
 

{pysdm-2.116 → pysdm-2.118}/tests/unit_tests/products/test_particle_size_spectrum.py

@@ -50,7 +50,7 @@ class TestParticleSizeSpectrum:
                 product_class(
                     name=name,
                     radius_bins_edges=(min_size, max_size),
-                    **({"stp": stp} if stp else {})
+                    **({"stp": stp} if stp else {}),
                 ),
             ),
             attributes={

pysdm-2.116/pyproject.toml

@@ -1,9 +0,0 @@
-[tool.isort]
-profile = "black"
-
-[tool.setuptools_scm]
-local_scheme = "no-local-version"
-version_scheme = "post-release"
-
-[build-system]
-requires = ['setuptools==75.3.0', 'setuptools-scm==8.2.1']

pysdm-2.116/setup.py

@@ -1,128 +0,0 @@
-"""
-the magick behind "pip install PySDM"
-"""
-
-import os
-import platform
-import sys
-
-from setuptools import find_packages, setup
-
-
-def get_long_description():
-    """returns contents of README.md file"""
-    with open("README.md", "r", encoding="utf8") as file:
-        long_description = file.read()
-        long_description = long_description.replace("pysdm_logo.svg", "pysdm_logo.png")
-    return long_description
-
-
-CI = "CI" in os.environ
-_32bit = platform.architecture()[0] == "32bit"
-
-setup(
-    name="pysdm",
-    description="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",
-    install_requires=[
-        "ThrustRTC==0.3.20",
-        "CURandRTC" + ("==0.1.6" if CI else ">=0.1.2"),
-        "numba"
-        + (
-            {
-                8: "==0.58.1",
-                9: "==0.60.0",
-                10: "==0.60.0",
-                11: "==0.60.0",
-                12: "==0.60.0",
-                13: "==0.60.0",
-            }[sys.version_info.minor]
-            if CI and not _32bit
-            else ">=0.51.2"
-        ),
-        # TODO #1344: (numpy 2.0.0 incompatibility in https://github.com/bjodah/chempy/issues/234)
-        "numpy"
-        + (
-            {
-                8: "==1.24.4",
-                9: "==1.24.4",
-                10: "==1.24.4",
-                11: "==1.24.4",
-                12: "==1.26.4",
-                13: "==1.26.4",
-            }[sys.version_info.minor]
-            if CI
-            else ""
-        ),
-        "Pint" + ("==0.21.1" if CI else ""),
-        "chempy" + ("==0.8.3" if CI else ""),
-        "scipy"
-        + (
-            {
-                8: "==1.10.1",
-                9: "==1.10.1",
-                10: "==1.10.1",
-                11: "==1.10.1",
-                12: "==1.13.0",
-                13: "==1.13.0",
-            }[sys.version_info.minor]
-            if CI and not _32bit
-            else ""
-        ),
-        "pyevtk" + ("==1.2.0" if CI else ""),
-    ],
-    extras_require={
-        "tests": [
-            "matplotlib",
-            "pytest",
-            "pytest-timeout",
-            "PySDM-examples",
-            "open-atmos-jupyter-utils>=v1.2.0",
-        ]
-        + (["PyPartMC==1.3.6"] if sys.version_info < (3, 12) else [])  # TODO #1410
-        + (
-            [
-                "pywinpty" + ("==0.5.7" if CI else ""),
-                "terminado" + ("==0.9.5" if CI else ""),
-                "jupyter-client" + ("==7.4.9" if CI else ""),
-                "jupyter-core" + ("==4.12.0" if CI else ""),
-                "jupyter-server" + ("==1.24.0" if CI else ""),
-                "notebook" + ("==6.5.6" if CI else ""),
-            ]
-            if _32bit
-            else [
-                "pyrcel",
-                "jupyter-core<5.0.0",
-                "ipywidgets!=8.0.3",
-            ]
-        )
-    },
-    author="https://github.com/open-atmos/PySDM/graphs/contributors",
-    author_email="sylwester.arabas@agh.edu.pl",
-    long_description=get_long_description(),
-    long_description_content_type="text/markdown",
-    url="https://github.com/open-atmos/PySDM",
-    license="GPL-3.0",
-    classifiers=[
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Science/Research",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3",
-        "Topic :: Scientific/Engineering",
-        "Topic :: Scientific/Engineering :: Atmospheric Science",
-        "Topic :: Scientific/Engineering :: Mathematics",
-        "Topic :: Scientific/Engineering :: Physics",
-        "Topic :: Software Development :: Libraries",
-    ],
-    keywords="physics-simulation, monte-carlo-simulation, gpu-computing,"
-    " atmospheric-modelling, particle-system, numba, thrust,"
-    " nvrtc, pint, atmospheric-physics",
-    packages=find_packages(include=["PySDM", "PySDM.*"]),
-    project_urls={
-        "Tracker": "https://github.com/open-atmos/PySDM/issues",
-        "Documentation": "https://open-atmos.github.io/PySDM",
-        "Source": "https://github.com/open-atmos/PySDM",
-    },
-)