PySDM 3.0.0rc25__tar.gz → 3.0.0rc26__tar.gz

pysdm-3.0.0rc25/.github/workflows/readme_snippets.yml → pysdm-3.0.0rc26/.github/workflows/tutorial_code.yml

@@ -1,4 +1,4 @@
-name: readme_snippets
+name: tutorial_code
 
 defaults:
   run:
@@ -26,12 +26,12 @@ jobs:
       - run: python -m pip install $PIP_INSTALL_ARGS -e .[CI_version_pins]
       - run: python -m pip install $PIP_INSTALL_ARGS pytest-codeblocks pytest
       - run: |
-          python -c "import os,pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pysdm_landing.md'); f=open('readme.py', 'w', encoding='utf-8'); f.write('# coding: utf-8'+os.linesep); f.writelines(block.code for block in code if block.syntax=='Python'); f.close()"
-      - run: cat -n readme.py
+          python -c "import os,pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pysdm_landing.md'); f=open('tutorial_code.py', 'w', encoding='utf-8'); f.write('# coding: utf-8'+os.linesep); f.writelines(block.code for block in code if block.syntax=='Python'); f.close()"
+      - run: cat -n tutorial_code.py
       - run: |
-          python -We readme.py
-          sed -i -e 's/CPU/GPU/g' readme.py
-          python -We readme.py
+          python -We tutorial_code.py
+          sed -i -e 's/CPU/GPU/g' tutorial_code.py
+          python -We tutorial_code.py
       
       - name: artefacts
         if: github.ref == 'refs/heads/main' && matrix.platform == 'ubuntu-latest'
@@ -50,13 +50,13 @@ jobs:
           python-version: "3.10"
       - run: pip install -e .[CI_version_pins]
       - 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.jl', 'w'); f.writelines(block.code for block in code if block.syntax=='Julia'); f.close()"
+      - run: python -c "import pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pysdm_landing.md'); f=open('tutorial_code.jl', 'w'); f.writelines(block.code for block in code if block.syntax=='Julia'); f.close()"
       - uses: julia-actions/setup-julia@v2
-      - run: cat -n readme.jl
+      - run: cat -n tutorial_code.jl
       - run: echo PYTHON=`which python` >> $GITHUB_ENV
-      - run: julia readme.jl
-      - run: sed -i -e 's/CPU/GPU/g' readme.jl
-      - run: julia readme.jl
+      - run: julia tutorial_code.jl
+      - run: sed -i -e 's/CPU/GPU/g' tutorial_code.jl
+      - run: julia tutorial_code.jl
 
   matlab:
     runs-on: ubuntu-latest
@@ -70,19 +70,19 @@ jobs:
 
       - run: pip install -e .[CI_version_pins]
       - 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
+      - run: python -c "import pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pysdm_landing.md'); f=open('tutorial_code.m', 'w'); f.writelines(block.code for block in code if block.syntax=='Matlab'); f.close()"
+      - run: cat -n tutorial_code.m
       - uses: matlab-actions/setup-matlab@v2.1.0
         with:
           release: R2024b
           cache: true
       - uses: matlab-actions/run-command@v2.1.0
         with:
-          command: readme
-      - run: sed -i -e 's/CPU/GPU/g' readme.m
+          command: tutorial_code
+      - run: sed -i -e 's/CPU/GPU/g' tutorial_code.m
       - uses: matlab-actions/run-command@v2.1.0
         with:
-          command: readme
+          command: tutorial_code
 
       - name: artefacts
         if: github.ref == 'refs/heads/main'

{pysdm-3.0.0rc25/pysdm.egg-info → pysdm-3.0.0rc26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm
-Version: 3.0.0rc25
+Version: 3.0.0rc26
 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-Expression: GPL-3.0-only

{pysdm-3.0.0rc25 → pysdm-3.0.0rc26}/PySDM/attributes/isotopes/bolin_numbers.py

@@ -25,7 +25,7 @@ class BolinNumberImpl(DerivedAttribute):
             Heavy isotopologue identifier (entry of ``HEAVY_ISOTOPES``).
         """
         self.moles_heavy = builder.get_attribute(f"moles_{heavy_isotope}")
-        self.moles_light = builder.get_attribute("moles light water")
+        self.moles_light = builder.get_attribute("moles light water")  # TODO #1787
         self.cell_id = builder.get_attribute("cell id")
         self.molality_in_dry_air = builder.particulator.environment[
             f"molality {heavy_isotope} in dry air"

{pysdm-3.0.0rc25 → pysdm-3.0.0rc26}/PySDM/backends/impl_numba/methods/isotope_methods.py

@@ -64,19 +64,16 @@ class IsotopeMethods(BackendMethods):
             moles_heavy_molecule,
             bolin_number,
             molality_in_dry_air,
-        ):
+        ):  # pylint: disable=too-many-locals
             for sd_id in range(multiplicity.shape[0]):
+                Bo = bolin_number[sd_id]
                 mass_ratio_heavy_to_total = (
                     moles_heavy_molecule[sd_id] * molar_mass_heavy_molecule
                 ) / signed_water_mass[sd_id]
-                if bolin_number[sd_id] == 0:
+                if Bo == 0:
                     dm_heavy = 0
                 else:
-                    dm_heavy = (
-                        dm_total[sd_id]
-                        / bolin_number[sd_id]
-                        * mass_ratio_heavy_to_total
-                    )
+                    dm_heavy = dm_total[sd_id] / Bo * mass_ratio_heavy_to_total
                 dn_heavy_molecule = dm_heavy / molar_mass_heavy_molecule
                 moles_heavy_molecule[sd_id] += dn_heavy_molecule
                 mass_of_dry_air = (

{pysdm-3.0.0rc25 → pysdm-3.0.0rc26}/PySDM/dynamics/collisions/collision_kernels/golovin.py

@@ -1,5 +1,7 @@
 """
-Golovin kernel with analytic solution (see [Golovin 1963](http://mi.mathnet.ru/dan27630))
+Safranov-Golovin kernel with analytic solution
+(see [Safranov 1962](http://mi.mathnet.ru/dan27172),
+[Golovin 1963](http://mi.mathnet.ru/dan27630))
 """
 
 import numpy as np

{pysdm-3.0.0rc25 → pysdm-3.0.0rc26}/PySDM/physics/constants_defaults.py

@@ -103,7 +103,7 @@ MAC_ice = 0.5
 [Kaercher & Lohmann 2002](https://doi.org/10.1029/2001JD000470) """
 HAC_ice = 1.0
 """ thermal accommodation coefficient for vapour deposition as recommended in
-[Pruppacher & Klett 2010](https://doi.org/10.1007/978-0-306-48100-0) """
+[Pruppacher & Klett](https://doi.org/10.1007/978-0-306-48100-0) """
 
 C_cunn = 0.7
 """ Cunningham correction factor as used in
@@ -222,12 +222,12 @@ k_l19_c = 0.017 / si.kelvin
 """ 〃 """
 
 dv_pk05 = 0.0 * si.metres
-""" Delta v for diffusivity in [Pruppacher & Klett 2010](https://doi.org/10.1007/978-0-306-48100-0)
+""" Delta v for diffusivity in [Pruppacher & Klett](https://doi.org/10.1007/978-0-306-48100-0)
 eq. 13-14 """
 
 lmbd_w_0 = 6.6e-8 * si.metre
 """ Mean free path of water molecules as in table 13.1 in
-[Pruppacher & Klett 2010](https://doi.org/10.1007/978-0-306-48100-0) """
+[Pruppacher & Klett](https://doi.org/10.1007/978-0-306-48100-0) """
 
 d_l19_a = 0.211e-4 * si.metre**2 / si.second
 """ [Seinfeld & Pandis](https://archive.org/details/0237-pdf-atmospheric-chemistry-and-physics-2nd-ed-j.-seinfeld-s.-pandis-wiley-2006-ww)

{pysdm-3.0.0rc25 → pysdm-3.0.0rc26}/PySDM/physics/diffusion_kinetics/grabowski_et_al_2011.py

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

{pysdm-3.0.0rc25 → pysdm-3.0.0rc26}/PySDM/physics/diffusion_kinetics/lowe_et_al_2019.py

@@ -1,10 +1,10 @@
 """
 as in [Lowe et al. 2019](https://doi.org/10.1038/s41467-019-12982-0)
-uses eq. 13-14 in [Pruppacher & Klett 2010](https://doi.org/10.1007/978-0-306-48100-0)
-with Delta v = 0 and no corrections for thermal conductivity
+uses eq. 13-14 in [Pruppacher & Klett](https://doi.org/10.1007/978-0-306-48100-0) with Delta v = 0
+and no corrections for thermal conductivity
 """
 
-from PySDM.physics.diffusion_kinetics.pruppacher_and_klett_2010 import PruppacherKlett
+from PySDM.physics.diffusion_kinetics.pruppacher_and_klett_2005 import PruppacherKlett
 
 
 class LoweEtAl2019(PruppacherKlett):

pysdm-3.0.0rc25/PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2010.py → pysdm-3.0.0rc26/PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2005.py

@@ -1,5 +1,5 @@
 """
-as in [Pruppacher & Klett 2010](https://doi.org/10.1007/978-0-306-48100-0) (eq. 13-14)
+as in Pruppacher and Klett 2005 (eq. 13-14)
 with reference to [Okuyama and Zung 1967](https://doi.org/10.1063/1.1840906)
 """
 

{pysdm-3.0.0rc25 → pysdm-3.0.0rc26}/PySDM/physics/isotope_relaxation_timescale/zaba_et_al.py

@@ -22,6 +22,7 @@ class ZabaEtAl:  # pylint: disable=too-few-public-methods
 
     @staticmethod
     def bolin_number(
+        const,
         D_ratio_heavy_to_light,
         alpha,
         D_light,
@@ -42,8 +43,10 @@ class ZabaEtAl:  # pylint: disable=too-few-public-methods
             * (1 - relative_humidity)
             / D_ratio_heavy_to_light
             / (
-                (1 + rho_v * D_light * Fk)
+                (1 + rho_v * D_light * Fk / const.rho_w)
                 * relative_humidity
                 * (1 - alpha * R_vap / R_liq)
+                - relative_humidity
+                + 1
             )
         )

{pysdm-3.0.0rc25 → pysdm-3.0.0rc26}/docs/bibliography.json

@@ -251,7 +251,7 @@
   },
   "https://doi.org/10.1063/1.1840906": {
     "usages": [
-      "PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2010.py"
+      "PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2005.py"
     ],
     "label": "Okuyama & Zung 1967 (J. Chem. Phys. 1967)",
     "title": "Evaporation—Condensation Coefficient for Small Droplets"
@@ -705,6 +705,15 @@
     "label": "Golovin 1963 (Dokl. Akad. Nauk SSSR 148)",
     "title": "К вопросу о решении уравнения коагуляции дождевых капель с учетом конденсации (On solving the equation of rain drop coagulation with allowance for condensation)"
   },
+  "http://mi.mathnet.ru/dan27172": {
+    "usages": [
+      "PySDM/dynamics/collisions/collision_kernels/golovin.py",
+      "tutorials/README.md",
+      "tutorials/wikipedia/sdm.ipynb"
+    ],
+    "label": "Safranov 1962 (Dokl. Akad. Nauk SSSR 147)",
+    "title": "Частный случай решения уравнения коагуляции (A particular solution of the coagulation equation)"
+  },
   "https://doi.org/10.5194/acp-16-1693-2016": {
     "usages": ["PySDM/backends/impl_numba/methods/chemistry_methods.py"],
     "label": "Hoyle et al. 2016 (Atmos. Chem. Phys. 16)",
@@ -789,8 +798,7 @@
   "https://doi.org/10.1007/978-0-306-48100-0": {
     "usages": [
       "PySDM/physics/constants_defaults.py",
-      "PySDM/physics/diffusion_kinetics/lowe_et_al_2019.py",
-      "PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2010.py"
+      "PySDM/physics/diffusion_kinetics/lowe_et_al_2019.py"
     ],
     "title": "Microphysics of Clouds and Precipitation",
     "label": "Pruppacher & Klett 2010 (Springer Dordrecht)"

{pysdm-3.0.0rc25 → pysdm-3.0.0rc26}/docs/markdown/pysdm_landing.md

@@ -759,3 +759,4 @@ See [README.md](https://github.com/open-atmos/PySDM/tree/main/README.md)
 
 - DustPy: https://stammler.github.io/dustpy
 - Cloudy.jl: https://github.com/CliMA/Cloudy.jl
+- BinMod1D-PARS: https://github.com/NOAA-National-Severe-Storms-Laboratory/BinMod1D-PARS