PySDM 2.107__tar.gz → 2.108__tar.gz

{pysdm-2.107 → pysdm-2.108}/.github/workflows/tests.yml

@@ -267,8 +267,12 @@ jobs:
           pvpython --version
           pvpython -c "from paraview import simple"
 
-      - env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
+      - run: |
           python -m pytest --durations=10 -v -p no:unraisableexception -We tests/examples_tests/test_tests_completeness.py
-          python -m pytest --durations=10 -v -p no:unraisableexception -We tests/examples_tests/test_run* --suite ${{ matrix.test-suite }}
+
+       # TODO #1207
+      - if: startsWith(matrix.platform, 'windows-')
+        run: python -m pytest --durations=10 -v -p no:unraisableexception -We tests/examples_tests/test_run* -k "not Rozanski_and_Sonntag_1982" --suite ${{ matrix.test-suite }}
+
+      - if: ( ! startsWith(matrix.platform, 'windows-') )
+        run: python -m pytest --durations=10 -v -p no:unraisableexception -We tests/examples_tests/test_run* --suite ${{ matrix.test-suite }}

{pysdm-2.107 → pysdm-2.108}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pysdm
-Version: 2.107
+Version: 2.108
 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
@@ -75,7 +75,7 @@ Currently, the development is focused on atmospheric cloud physics
   to represent aerosol/cloud/rain microphysics.
 The package features a Pythonic high-performance implementation of the 
   Super-Droplet Method (SDM) Monte-Carlo algorithm for representing collisional growth 
-  ([Shima et al. 2009](https://rmets.onlinelibrary.wiley.com/doi/abs/10.1002/qj.441)), hence the name. 
+  ([Shima et al. 2009](https://doi.org/10.1002/qj.441)), hence the name. 
 
 PySDM documentation is maintained at: [https://open-atmos.github.io/PySDM](https://open-atmos.github.io/PySDM) 
 

{pysdm-2.107 → pysdm-2.108}/PySDM/particulator.py

@@ -317,7 +317,7 @@ class Particulator:  # pylint: disable=too-many-public-methods,too-many-instance
         moment_0,
         moments,
         specs: dict,
-        attr_name="water mass",
+        attr_name="signed water mass",
         attr_range=(-np.inf, np.inf),
         weighting_attribute="water mass",
         weighting_rank=0,

{pysdm-2.107 → pysdm-2.108}/PySDM/physics/constants_defaults.py

@@ -6,7 +6,6 @@ Unless, there is a very specific and sound reason, everything here should
 """
 
 import numpy as np
-from chempy import Substance
 from scipy import constants as sci
 
 from .constants import (  # pylint: disable=unused-import
@@ -29,14 +28,11 @@ from .constants import (  # pylint: disable=unused-import
 )
 from .trivia import Trivia
 
-# https://physics.nist.gov/cgi-bin/Star/compos.pl?matno=104
-# TODO #1507
-Md = (
-    0.755267 * Substance.from_formula("N2").mass * si.gram / si.mole
-    + 0.231781 * Substance.from_formula("O2").mass * si.gram / si.mole
-    + 0.012827 * Substance.from_formula("Ar").mass * si.gram / si.mole
-    + 0.000124 * Substance.from_formula("C").mass * si.gram / si.mole
-)
+Md = 28.966 * si.g / si.mole
+"""
+A "twenty-first century" value of dry-air molar mass recommended in
+[Gatley et al. 2008](https://doi.org/10.1080/10789669.2008.10391032)
+"""
 
 VSMOW_R_2H = 155.76 * PPM
 """
@@ -194,8 +190,8 @@ p_tri = 611.657 * si.pascal
 [Murphy & Koop 2005](https://doi.org/10.1256/qj.04.94) """
 T_tri = 273.16 * si.kelvin
 """ 〃 """
-
-l_tri = 2.5e6 * si.joule / si.kilogram
+L_tri = 45051.0 * si.joule / si.mol
+""" 〃 """
 
 l_l19_a = 0.167 * si.dimensionless
 """ [Seinfeld and Pandis](https://archive.org/details/0237-pdf-atmospheric-chemistry-and-physics-2nd-ed-j.-seinfeld-s.-pandis-wiley-2006-ww)
@@ -687,3 +683,5 @@ def compute_derived_values(c: dict):
     c["water_molar_volume"] = c["Mv"] / c["rho_w"]
     c["rho_STP"] = c["p_STP"] / c["Rd"] / c["T_STP"]
     c["H_u"] = c["M"] / c["p_STP"]
+
+    c["l_tri"] = c["L_tri"] / c["Mv"]

{pysdm-2.107 → pysdm-2.108}/PySDM/physics/trivia.py

@@ -138,6 +138,14 @@ class Trivia:  # pylint: disable=too-many-public-methods
     def sqrt_re_times_cbrt_sc(const, Re, Sc):
         return np.power(Re, const.ONE_HALF) * np.power(Sc, const.ONE_THIRD)
 
+    @staticmethod
+    def K2C(const, TK):
+        return TK - const.T0
+
+    @staticmethod
+    def C2K(const, TC):
+        return TC + const.T0
+
     @staticmethod
     def poissonian_avoidance_function(r, dt):
         """cumulative probability of zero events occurring within time `dt`

{pysdm-2.107 → pysdm-2.108}/PySDM/products/impl/moment_product.py

@@ -27,7 +27,7 @@ class MomentProduct(Product, ABC):
         *,
         attr,
         rank,
-        filter_attr="water mass",
+        filter_attr="signed water mass",
         filter_range=(-np.inf, np.inf),
         weighting_attribute="water mass",
         weighting_rank=0,

{pysdm-2.107 → pysdm-2.108}/PySDM/products/size_spectral/mean_radius.py

@@ -27,10 +27,14 @@ class MeanRadius(MomentProduct):
             attr="volume",
             rank=1 / 3,
             filter_range=(
-                self.formulae.trivia.volume(self.radius_range[0]),
-                self.formulae.trivia.volume(self.radius_range[1]),
+                self.formulae.particle_shape_and_density.radius_to_mass(
+                    self.radius_range[0]
+                ),
+                self.formulae.particle_shape_and_density.radius_to_mass(
+                    self.radius_range[1]
+                ),
             ),
-            filter_attr="volume",
+            filter_attr="signed water mass",
         )
         self.buffer[:] /= self.formulae.constants.PI_4_3 ** (1 / 3)
         return self.buffer

{pysdm-2.107 → pysdm-2.108}/PySDM/products/size_spectral/water_mixing_ratio.py

@@ -12,13 +12,15 @@ from PySDM.products.impl import MomentProduct, register_product
 class WaterMixingRatio(MomentProduct):
     def __init__(self, radius_range=None, name=None, unit="dimensionless"):
         self.radius_range = radius_range or (0, np.inf)
-        self.mass_range = None
+        self.signed_mass_range = None
         super().__init__(unit=unit, name=name)
 
     def register(self, builder):
         super().register(builder)
-        self.mass_range = self.formulae.particle_shape_and_density.radius_to_mass(
-            np.asarray(self.radius_range)
+        self.signed_mass_range = (
+            self.formulae.particle_shape_and_density.radius_to_mass(
+                np.asarray(self.radius_range)
+            )
         )
         self.radius_range = None
 
@@ -26,16 +28,16 @@ class WaterMixingRatio(MomentProduct):
         self._download_moment_to_buffer(
             attr="water mass",
             rank=0,
-            filter_range=self.mass_range,
-            filter_attr="water mass",
+            filter_range=self.signed_mass_range,
+            filter_attr="signed water mass",
         )
         conc = self.buffer.copy()
 
         self._download_moment_to_buffer(
             attr="water mass",
             rank=1,
-            filter_range=self.mass_range,
-            filter_attr="water mass",
+            filter_range=self.signed_mass_range,
+            filter_attr="signed water mass",
         )
         result = self.buffer.copy()
         result[:] *= conc

{pysdm-2.107 → pysdm-2.108}/README.md

@@ -33,7 +33,7 @@ Currently, the development is focused on atmospheric cloud physics
   to represent aerosol/cloud/rain microphysics.
 The package features a Pythonic high-performance implementation of the 
   Super-Droplet Method (SDM) Monte-Carlo algorithm for representing collisional growth 
-  ([Shima et al. 2009](https://rmets.onlinelibrary.wiley.com/doi/abs/10.1002/qj.441)), hence the name. 
+  ([Shima et al. 2009](https://doi.org/10.1002/qj.441)), hence the name. 
 
 PySDM documentation is maintained at: [https://open-atmos.github.io/PySDM](https://open-atmos.github.io/PySDM) 
 

{pysdm-2.107 → pysdm-2.108}/docs/bibliography.json

@@ -114,6 +114,7 @@
   },
   "https://doi.org/10.1002/qj.441": {
     "usages": [
+      "README.md",
       "docs/markdown/pysdm_landing.md",
       "examples/PySDM_examples/Shima_et_al_2009/fig_2.ipynb",
       "examples/PySDM_examples/Shima_et_al_2009/__init__.py",
@@ -227,7 +228,8 @@
   "https://doi.org/10.3402/tellusa.v34i2.10795": {
     "usages": [
       "examples/PySDM_examples/Rozanski_and_Sonntag_1982/figs_4_5_6.ipynb",
-      "examples/PySDM_examples/Rozanski_and_Sonntag_1982/__init__.py"
+      "examples/PySDM_examples/Rozanski_and_Sonntag_1982/__init__.py",
+      "examples/PySDM_examples/Rozanski_and_Sonntag_1982/multibox.py"
     ],
     "label": "Rozanski & Sonntag 1982 (Tellus A 34)",
     "title": "Vertical distribution of deuterium in atmospheric water vapour"
@@ -290,7 +292,10 @@
   },
   "https://doi.org/10.1029/1999JD901161": {
     "usages": [
-      "examples/PySDM_examples/Abdul_Razzak_Ghan_2000/__init__.py"
+      "examples/PySDM_examples/Abdul_Razzak_Ghan_2000/__init__.py",
+      "examples/PySDM_examples/Abdul_Razzak_Ghan_2000/figs1-5.ipynb",
+      "examples/PySDM_examples/Abdul_Razzak_Ghan_2000/fig_4_kinetic_limitations.ipynb"
+
     ],
     "label": "Abdul-Razzak & Ghan 2000 (J. Geophys. Res. Atmos. 105)",
     "title": "A parameterization of aerosol activation: 2. Multiple aerosol types"
@@ -714,6 +719,11 @@
     "title": "Vapor Pressure Formulation for Water in Range 0 to 100 °C. A Revision",
     "label": "Wexler 1976 (J. Res. NBS A Phys. Ch. 80A)"
   },
+  "https://doi.org/10.1080/10789669.2008.10391032": {
+    "usages": ["PySDM/physics/constants_defaults.py"],
+    "title": "A Twenty-First Century Molar Mass for Dry Air",
+    "label": "Gatley et al. 2008 (HVAC&R Res. 14)"
+  },
   "https://archive.org/details/shortcourseinclo0000roge_m3k2": {
     "usages": ["PySDM/physics/constants_defaults.py", "PySDM/physics/terminal_velocity/rogers_yau.py"],
     "title": "A short course in clouds physics",

{pysdm-2.107 → pysdm-2.108}/examples/PySDM_examples/Abdul_Razzak_Ghan_2000/fig_4_kinetic_limitations.ipynb

@@ -21,7 +21,7 @@
     "\n",
     "An example of kinetic limitations of growth for large aerosols\n",
     "\n",
-    "http://doi.wiley.com/10.1029/1999JD901161"
+    "https://doi.org/10.1029/1999JD901161"
    ]
   },
   {

{pysdm-2.107 → pysdm-2.108}/examples/PySDM_examples/Abdul_Razzak_Ghan_2000/figs1-5.ipynb

@@ -16,7 +16,7 @@
    "metadata": {},
    "source": [
     "#### based on Figs. 1-5 from Abdul-Razzak and Ghan 2000 (JGR: Atmos.)  \"_A parameterization of aerosol activation: 2. Multiple aerosol types_\"\n",
-    "http://doi.wiley.com/10.1029/1999JD901161"
+    "https://doi.org/10.1029/1999JD901161"
    ]
   },
   {

{pysdm-2.107 → pysdm-2.108}/examples/PySDM_examples/Rozanski_and_Sonntag_1982/__init__.py

@@ -7,3 +7,4 @@ figs_4_5_6.ipynb:
 """
 
 # pylint: disable=invalid-name
+from PySDM_examples.Rozanski_and_Sonntag_1982.multibox import MultiBox