PySDM 2.118__tar.gz → 2.119__tar.gz

{pysdm-2.118 → pysdm-2.119}/.github/workflows/readme_snippets.yml

@@ -65,14 +65,14 @@ jobs:
       - uses: actions/checkout@v4.1.6
       - uses: actions/setup-python@v5.0.0
         with:
-          python-version: 3.8
+          python-version: 3.9
       - run: pip install -e .
       - run: pip install pytest-codeblocks pytest
       - run: python -c "import pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pysdm_landing.md'); f=open('readme.m', 'w'); f.writelines(block.code for block in code if block.syntax=='Matlab'); f.close()"
       - run: cat -n readme.m
       - uses: matlab-actions/setup-matlab@v2.1.0
         with:
-          release: R2021a
+          release: R2022a
       - uses: matlab-actions/run-command@v2.1.0
         with:
           command: readme

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

@@ -1,16 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pysdm
-Version: 2.118
+Version: 2.119
 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
 Author-email: "https://github.com/open-atmos/PySDM/graphs/contributors" <sylwester.arabas@agh.edu.pl>
-License: GPL-3.0
+License-Expression: GPL-3.0-only
 Project-URL: Tracker, https://github.com/open-atmos/PySDM/issues
 Project-URL: Documentation, https://open-atmos.github.io/PySDM
 Project-URL: Source, https://github.com/open-atmos/PySDM
 Keywords: physics-simulation,monte-carlo-simulation,gpu-computing,atmospheric-modelling,particle-system,numba,thrust,nvrtc,pint,atmospheric-physics
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
@@ -38,6 +37,9 @@ Requires-Dist: open-atmos-jupyter-utils>=v1.2.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"
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
 
 # <img src="https://raw.githubusercontent.com/open-atmos/PySDM/main/docs/logos/pysdm_logo.svg" width=100 height=146 alt="pysdm logo">
 

{pysdm-2.118 → pysdm-2.119}/examples/PySDM_examples/Bolin_1958/table_1.ipynb

@@ -14,10 +14,13 @@
    "cell_type": "markdown",
    "id": "bb84c52c57a729ec",
    "metadata": {},
-   "source": "### based on Table 1 from B.Bolin 1958 \"On the use of tritium as a tracer for water in nature\" (https://digitallibrary.un.org/record/3892725)"
+   "source": [
+    "### based on Table 1 from B.Bolin 1958 \"On the use of tritium as a tracer for water in nature\" (https://digitallibrary.un.org/record/3892725)"
+   ]
   },
   {
    "cell_type": "code",
+   "execution_count": 1,
    "id": "5e4e58050cc01f64",
    "metadata": {
     "ExecuteTime": {
@@ -25,18 +28,18 @@
      "start_time": "2024-12-05T21:30:20.209298Z"
     }
    },
+   "outputs": [],
    "source": [
     "import sys\n",
     "if 'google.colab' in sys.modules:\n",
     "    !pip --quiet install open-atmos-jupyter-utils\n",
     "    from open_atmos_jupyter_utils import pip_install_on_colab\n",
     "    pip_install_on_colab('PySDM-examples')"
-   ],
-   "outputs": [],
-   "execution_count": 1
+   ]
   },
   {
    "cell_type": "code",
+   "execution_count": 8,
    "id": "95f360dc62f373f9",
    "metadata": {
     "ExecuteTime": {
@@ -44,17 +47,18 @@
      "start_time": "2024-12-05T21:30:20.218383Z"
     }
    },
+   "outputs": [],
    "source": [
     "import numpy as np\n",
     "import pandas\n",
     "from PySDM.physics import in_unit, si\n",
-    "from PySDM import Formulae"
-   ],
-   "outputs": [],
-   "execution_count": 2
+    "from PySDM import Formulae\n",
+    "from IPython.display import display"
+   ]
   },
   {
    "cell_type": "code",
+   "execution_count": 3,
    "id": "e29a92d6680c4e51",
    "metadata": {
     "ExecuteTime": {
@@ -62,92 +66,24 @@
      "start_time": "2024-12-05T21:30:21.687254Z"
     }
    },
-   "source": "radii = np.asarray([0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.15, 0.20]) * si.cm",
    "outputs": [],
-   "execution_count": 3
+   "source": [
+    "radii = np.asarray([0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.15, 0.20]) * si.cm"
+   ]
   },
   {
+   "cell_type": "code",
+   "execution_count": 9,
+   "id": "314f42c310883cfa",
    "metadata": {
     "ExecuteTime": {
      "end_time": "2024-12-05T21:30:24.420354Z",
      "start_time": "2024-12-05T21:30:21.698737Z"
     }
    },
-   "cell_type": "code",
-   "source": [
-    "formulae = Formulae(\n",
-    "    terminal_velocity='RogersYau',\n",
-    "    drop_growth='Mason1951',\n",
-    "    diffusion_thermics='Neglect',\n",
-    "    saturation_vapour_pressure='AugustRocheMagnus',\n",
-    "    ventilation='Froessling1938',\n",
-    "    particle_shape_and_density='LiquidSpheres',\n",
-    "    air_dynamic_viscosity='ZografosEtAl1987',\n",
-    "    constants={'BOLIN_ISOTOPE_TIMESCALE_COEFF_C1': 1.63},\n",
-    "    isotope_relaxation_timescale='Bolin1958',\n",
-    ")\n",
-    "const = formulae.constants\n",
-    "any_non_zero_value = 44.\n",
-    "temperature = const.T0 + 10 * si.K\n",
-    "pressure = const.p_STP\n",
-    "pvs = formulae.saturation_vapour_pressure.pvs_water(temperature)\n",
-    "v_term = formulae.terminal_velocity.v_term(radii)\n",
-    "eta_air=formulae.air_dynamic_viscosity.eta_air(temperature)\n",
-    "D=formulae.diffusion_thermics.D(T=temperature, p=pressure)\n",
-    "\n",
-    "air_density = pressure/const.Rd/temperature\n",
-    "assert abs(air_density - 1)/air_density <.3\n",
-    "Re = formulae.particle_shape_and_density.reynolds_number(\n",
-    "     radius=radii,\n",
-    "     velocity_wrt_air=v_term,\n",
-    "     dynamic_viscosity=eta_air,\n",
-    "     density=air_density,\n",
-    ")\n",
-    "Sc = formulae.trivia.air_schmidt_number(\n",
-    "    dynamic_viscosity=eta_air, \n",
-    "    diffusivity=D, \n",
-    "    density=air_density,\n",
-    ")\n",
-    "F = formulae.ventilation.ventilation_coefficient(sqrt_re_times_cbrt_sc=Re**(1/2) * Sc**(1/3))\n",
-    "\n",
-    "r_dr_dt = formulae.drop_growth.r_dr_dt(\n",
-    "    RH_eq=1,\n",
-    "    T=temperature,\n",
-    "    RH=0,\n",
-    "    lv=0,\n",
-    "    pvs=pvs,\n",
-    "    D=D,\n",
-    "    K=any_non_zero_value,\n",
-    "    ventilation_factor=F\n",
-    ")\n",
-    "adjustment_time = formulae.isotope_relaxation_timescale.tau(radius = radii, r_dr_dt = r_dr_dt)\n",
-    "\n",
-    "\n",
-    "pandas.options.display.float_format = '{:>,.2g}'.format\n",
-    "data = pandas.DataFrame({\n",
-    "    'radius [cm]': in_unit(radii, si.cm),\n",
-    "    'adjustment time [s]': adjustment_time,\n",
-    "    'terminal velocity [m/s]': v_term,\n",
-    "    'distance [m]': v_term * adjustment_time,\n",
-    "})\n",
-    "\n",
-    "data # pylint: disable=pointless-statement"
-   ],
-   "id": "314f42c310883cfa",
    "outputs": [
     {
      "data": {
-      "text/plain": [
-       "   radius [cm]  adjustment time [s]  terminal velocity [m/s]  distance [m]\n",
-       "0        0.005                  1.7                      0.4          0.69\n",
-       "1         0.01                  5.4                      0.8           4.3\n",
-       "2        0.025                   20                        2            40\n",
-       "3         0.05                   48                        4       1.9e+02\n",
-       "4        0.075                   81                      5.5       4.4e+02\n",
-       "5          0.1              1.2e+02                      6.4       7.6e+02\n",
-       "6         0.15                2e+02                      7.8       1.6e+03\n",
-       "7          0.2                3e+02                        9       2.7e+03"
-      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -233,14 +169,90 @@
        "  </tbody>\n",
        "</table>\n",
        "</div>"
+      ],
+      "text/plain": [
+       "   radius [cm]  adjustment time [s]  terminal velocity [m/s]  distance [m]\n",
+       "0        0.005                  1.7                      0.4          0.69\n",
+       "1         0.01                  5.4                      0.8           4.3\n",
+       "2        0.025                   20                        2            40\n",
+       "3         0.05                   48                        4       1.9e+02\n",
+       "4        0.075                   81                      5.5       4.4e+02\n",
+       "5          0.1              1.2e+02                      6.4       7.6e+02\n",
+       "6         0.15                2e+02                      7.8       1.6e+03\n",
+       "7          0.2                3e+02                        9       2.7e+03"
       ]
      },
-     "execution_count": 4,
      "metadata": {},
-     "output_type": "execute_result"
+     "output_type": "display_data"
     }
    ],
-   "execution_count": 4
+   "source": [
+    "formulae = Formulae(\n",
+    "    terminal_velocity='RogersYau',\n",
+    "    drop_growth='Mason1951',\n",
+    "    diffusion_thermics='Neglect',\n",
+    "    saturation_vapour_pressure='AugustRocheMagnus',\n",
+    "    ventilation='Froessling1938',\n",
+    "    particle_shape_and_density='LiquidSpheres',\n",
+    "    air_dynamic_viscosity='ZografosEtAl1987',\n",
+    "    constants={'BOLIN_ISOTOPE_TIMESCALE_COEFF_C1': 1.63},\n",
+    "    isotope_relaxation_timescale='Bolin1958',\n",
+    ")\n",
+    "const = formulae.constants\n",
+    "any_non_zero_value = 44.\n",
+    "temperature = const.T0 + 10 * si.K\n",
+    "pressure = const.p_STP\n",
+    "pvs = formulae.saturation_vapour_pressure.pvs_water(temperature)\n",
+    "v_term = formulae.terminal_velocity.v_term(radii)\n",
+    "eta_air=formulae.air_dynamic_viscosity.eta_air(temperature)\n",
+    "D=formulae.diffusion_thermics.D(T=temperature, p=pressure)\n",
+    "\n",
+    "air_density = pressure/const.Rd/temperature\n",
+    "assert abs(air_density - 1)/air_density <.3\n",
+    "Re = formulae.particle_shape_and_density.reynolds_number(\n",
+    "     radius=radii,\n",
+    "     velocity_wrt_air=v_term,\n",
+    "     dynamic_viscosity=eta_air,\n",
+    "     density=air_density,\n",
+    ")\n",
+    "Sc = formulae.trivia.air_schmidt_number(\n",
+    "    dynamic_viscosity=eta_air, \n",
+    "    diffusivity=D, \n",
+    "    density=air_density,\n",
+    ")\n",
+    "F = formulae.ventilation.ventilation_coefficient(sqrt_re_times_cbrt_sc=Re**(1/2) * Sc**(1/3))\n",
+    "\n",
+    "r_dr_dt = formulae.drop_growth.r_dr_dt(\n",
+    "    RH_eq=1,\n",
+    "    T=temperature,\n",
+    "    RH=0,\n",
+    "    lv=0,\n",
+    "    pvs=pvs,\n",
+    "    D=D,\n",
+    "    K=any_non_zero_value,\n",
+    "    ventilation_factor=F\n",
+    ")\n",
+    "adjustment_time = formulae.isotope_relaxation_timescale.tau(radius = radii, r_dr_dt = r_dr_dt)\n",
+    "\n",
+    "\n",
+    "pandas.options.display.float_format = '{:>,.2g}'.format\n",
+    "data = pandas.DataFrame({\n",
+    "    'radius [cm]': in_unit(radii, si.cm),\n",
+    "    'adjustment time [s]': adjustment_time,\n",
+    "    'terminal velocity [m/s]': v_term,\n",
+    "    'distance [m]': v_term * adjustment_time,\n",
+    "})\n",
+    "\n",
+    "display(data)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0bef57bc-7e19-4a3f-8f77-6ec762e8f236",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -259,7 +271,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.6"
+   "version": "3.9.2"
   }
  },
  "nbformat": 4,

{pysdm-2.118 → pysdm-2.119}/examples/PySDM_examples/Pyrcel/simulation.py

@@ -91,7 +91,9 @@ class Simulation(BasicSimulation):
                 attr[drop_id].append(attr_data[drop_id])
         super()._save(output)
 
-    def run(self):
+    def run(self, observers=()):
+        for observer in observers:
+            self.particulator.observers.append(observer)
         output_products = super()._run(
             self.settings.nt, self.settings.steps_per_output_interval
         )

{pysdm-2.118 → pysdm-2.119}/examples/pyproject.toml

@@ -4,4 +4,4 @@ local_scheme = "no-local-version"
 version_scheme = "post-release"
 
 [build-system]
-requires = ['setuptools==76.0.0', 'setuptools-scm==8.2.1']
+requires = ['setuptools==80.4.0', 'setuptools-scm==8.3.1']

{pysdm-2.118 → pysdm-2.119}/pyproject.toml

@@ -9,7 +9,7 @@ version_scheme = "post-release"
 include = ["PySDM", "PySDM*"]
 
 [build-system]
-requires = ['setuptools==75.3.0', 'setuptools-scm==8.1.0']
+requires = ['setuptools==80.4.0', 'setuptools-scm==8.3.1']
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -20,11 +20,10 @@ keywords = ["physics-simulation", "monte-carlo-simulation", "gpu-computing",
     "atmospheric-modelling", "particle-system", "numba", "thrust",
     "nvrtc", "pint", "atmospheric-physics",
     ]
-license = {text = "GPL-3.0"}
+license = "GPL-3.0-only"
 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",
@@ -42,5 +41,3 @@ dynamic = ["version", "dependencies", "optional-dependencies"]
 Tracker = "https://github.com/open-atmos/PySDM/issues"
 Documentation = "https://open-atmos.github.io/PySDM"
 Source = "https://github.com/open-atmos/PySDM"
-
-

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

@@ -1,16 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pysdm
-Version: 2.118
+Version: 2.119
 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
 Author-email: "https://github.com/open-atmos/PySDM/graphs/contributors" <sylwester.arabas@agh.edu.pl>
-License: GPL-3.0
+License-Expression: GPL-3.0-only
 Project-URL: Tracker, https://github.com/open-atmos/PySDM/issues
 Project-URL: Documentation, https://open-atmos.github.io/PySDM
 Project-URL: Source, https://github.com/open-atmos/PySDM
 Keywords: physics-simulation,monte-carlo-simulation,gpu-computing,atmospheric-modelling,particle-system,numba,thrust,nvrtc,pint,atmospheric-physics
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
@@ -38,6 +37,9 @@ Requires-Dist: open-atmos-jupyter-utils>=v1.2.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"
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
 
 # <img src="https://raw.githubusercontent.com/open-atmos/PySDM/main/docs/logos/pysdm_logo.svg" width=100 height=146 alt="pysdm logo">
 

{pysdm-2.118 → pysdm-2.119}/pysdm.egg-info/SOURCES.txt

@@ -583,8 +583,6 @@ examples/PySDM_examples/Pyrcel/example_basic_run.ipynb
 examples/PySDM_examples/Pyrcel/profile_plotter.py
 examples/PySDM_examples/Pyrcel/settings.py
 examples/PySDM_examples/Pyrcel/simulation.py
-examples/PySDM_examples/Pyrcel/tutorial_settings.py
-examples/PySDM_examples/Pyrcel/tutorial_simulation.py
 examples/PySDM_examples/Rozanski_and_Sonntag_1982/__init__.py
 examples/PySDM_examples/Rozanski_and_Sonntag_1982/figs_4_5_6.ipynb
 examples/PySDM_examples/Rozanski_and_Sonntag_1982/multibox.py

{pysdm-2.118 → pysdm-2.119}/tutorials/collisions/collisions_playground.ipynb

@@ -24,8 +24,8 @@
    "cell_type": "code",
    "metadata": {
     "ExecuteTime": {
-     "end_time": "2024-12-05T22:12:53.537976Z",
-     "start_time": "2024-12-05T22:12:53.509740Z"
+     "end_time": "2025-05-15T15:58:05.775543Z",
+     "start_time": "2025-05-15T15:58:05.772087Z"
     }
    },
    "source": [
@@ -36,7 +36,7 @@
     "    pip_install_on_colab('PySDM-examples')"
    ],
    "outputs": [],
-   "execution_count": 5
+   "execution_count": 6
   },
   {
    "metadata": {},
@@ -72,8 +72,8 @@
    "cell_type": "code",
    "metadata": {
     "ExecuteTime": {
-     "end_time": "2024-12-05T22:12:53.555929Z",
-     "start_time": "2024-12-05T22:12:53.542388Z"
+     "end_time": "2025-05-15T15:58:05.785980Z",
+     "start_time": "2025-05-15T15:58:05.784129Z"
     }
    },
    "source": [
@@ -92,14 +92,14 @@
     "from PySDM_examples.Shima_et_al_2009.tutorial_example import run"
    ],
    "outputs": [],
-   "execution_count": 6
+   "execution_count": 7
   },
   {
    "cell_type": "code",
    "metadata": {
     "ExecuteTime": {
-     "end_time": "2024-12-05T22:12:53.589430Z",
-     "start_time": "2024-12-05T22:12:53.577604Z"
+     "end_time": "2025-05-15T15:58:05.797240Z",
+     "start_time": "2025-05-15T15:58:05.792780Z"
     }
    },
    "source": [
@@ -128,7 +128,7 @@
     "            plotter.show()"
    ],
    "outputs": [],
-   "execution_count": 7
+   "execution_count": 8
   },
   {
    "cell_type": "markdown",
@@ -151,8 +151,8 @@
      "is_executing": true
     },
     "ExecuteTime": {
-     "end_time": "2024-12-05T22:12:55.865731Z",
-     "start_time": "2024-12-05T22:12:53.596622Z"
+     "end_time": "2025-05-15T15:58:07.011791Z",
+     "start_time": "2025-05-15T15:58:05.806155Z"
     }
    },
    "source": [
@@ -174,7 +174,9 @@
     "progbar = widgets.IntProgress(min=0, max=100, description='%')\n",
     "\n",
     "if 'CI' not in os.environ:\n",
-    "    widgets.display(sliders, boxes, progbar, widgets.interactive_output(demo, inputs))"
+    "    widgets.display(sliders, boxes, progbar, widgets.interactive_output(demo, inputs))\n",
+    "else:\n",
+    "    demo(**{k:v.value for k,v in inputs.items()})"
    ],
    "outputs": [
     {
@@ -185,7 +187,7 @@
       "application/vnd.jupyter.widget-view+json": {
        "version_major": 2,
        "version_minor": 0,
-       "model_id": "bdfd1e87e43745bebed2fee0a1bc4c5f"
+       "model_id": "3496ed2134e4414eaa22d17c076cadd3"
       }
      },
      "metadata": {},
@@ -199,7 +201,7 @@
       "application/vnd.jupyter.widget-view+json": {
        "version_major": 2,
        "version_minor": 0,
-       "model_id": "76294dfff7c94e12a6c7bc50d74b2b70"
+       "model_id": "93a049b67eb841fd922feab04fddbc06"
       }
      },
      "metadata": {},
@@ -213,7 +215,7 @@
       "application/vnd.jupyter.widget-view+json": {
        "version_major": 2,
        "version_minor": 0,
-       "model_id": "a698fc09aef847e28bf5b94321de4d19"
+       "model_id": "40f367276c294cecbe7b87c0d53a698a"
       }
      },
      "metadata": {},
@@ -227,14 +229,14 @@
       "application/vnd.jupyter.widget-view+json": {
        "version_major": 2,
        "version_minor": 0,
-       "model_id": "c2a987c930ec456ba119b36c4661d99b"
+       "model_id": "33aaa5a61fc14d8c9b281049c0cbfb82"
       }
      },
      "metadata": {},
      "output_type": "display_data"
     }
    ],
-   "execution_count": 8
+   "execution_count": 9
   },
   {
    "cell_type": "markdown",
@@ -255,18 +257,6 @@
     "\n",
     "4. How does the mean radius of the droplets affect the collision rate? "
    ]
-  },
-  {
-   "cell_type": "code",
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2024-12-05T22:12:55.882614Z",
-     "start_time": "2024-12-05T22:12:55.881190Z"
-    }
-   },
-   "source": [],
-   "outputs": [],
-   "execution_count": null
   }
  ],
  "metadata": {