PySDM 2.44__py3-none-any.whl → 2.45__py3-none-any.whl

PySDM/initialisation/sampling/spectral_sampling.py

@@ -55,7 +55,8 @@ class DeterministicSpectralSampling(
         diff = abs(1 - np.sum(y_float) / spectrum.norm_factor)
         if diff > self.error_threshold:
             raise ValueError(
-                f"{100*diff}% error in total real-droplet number due to sampling"
+                f"{diff * 100:.3g}% error in total real-droplet number due to sampling "
+                f"({len(x)} samples)"
             )
 
         return x, y_float

PySDM/physics/constants_defaults.py

@@ -321,6 +321,16 @@ CRAIG_1961_INTERCEPT_COEFF = 10 * PER_MILLE
 """ [Bohren 1987](https://doi.org/10.1119/1.15109) """
 asymmetry_g = 0.85  # forward scattering from cloud droplets
 
+""" TODO #1266 """
+diffussion_thermics_D_G11_A = 1e-5 * si.m**2 / si.s
+diffussion_thermics_D_G11_B = 0.15 / si.K
+diffussion_thermics_D_G11_C = -1.9
+
+diffussion_thermics_K_G11_A = 1.5e-11 * si.W / si.m / si.K**4
+diffussion_thermics_K_G11_B = -4.8e-8 * si.W / si.m / si.K**3
+diffussion_thermics_K_G11_C = 1e-4 * si.W / si.m / si.K**2
+diffussion_thermics_K_G11_D = -3.9e-4 * si.W / si.m / si.K
+
 
 def compute_derived_values(c: dict):
     c["eps"] = c["Mv"] / c["Md"]

PySDM/physics/diffusion_kinetics/__init__.py

@@ -5,3 +5,5 @@ Formulae for handling transition-régime corrections in condensational growth/ev
 from .fuchs_sutugin import FuchsSutugin
 from .lowe_et_al_2019 import LoweEtAl2019
 from .neglect import Neglect
+from .grabowski_et_al_2011 import GrabowskiEtAl2011
+from .jensen_and_nugent_2017 import JensenAndNugent2017

PySDM/physics/diffusion_kinetics/grabowski_et_al_2011.py

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

PySDM/physics/diffusion_kinetics/jensen_and_nugent_2017.py

@@ -0,0 +1,14 @@
+"""
+as in [Jensen and Nugent 2017](https://doi.org/10.1175/JAS-D-15-0370.1)
+(which refers to [Grabowski et al. (2011)](https://doi.org/10.1016/j.atmosres.2010.10.020)
+but uses different gas constant, typo?)
+"""
+
+import numpy as np
+from .grabowski_et_al_2011 import GrabowskiEtAl2011
+
+
+class JensenAndNugent2017(GrabowskiEtAl2011):
+    @staticmethod
+    def lambdaD(const, D, T):
+        return D / np.sqrt(2 * const.Rd * T)

PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2005.py

@@ -19,3 +19,11 @@ class PruppacherKlett:
         return D / (
             (r / (r + const.dv_pk05)) + 2 * np.sqrt(const.PI) * lmbd / r / const.MAC
         )
+
+    @staticmethod
+    def lambdaK(_, T, p):  # pylint: disable=unused-argument
+        return -1
+
+    @staticmethod
+    def K(const, K, r, lmbd):  # pylint: disable=unused-argument
+        return K  # TODO #1266

PySDM/physics/diffusion_thermics/__init__.py

@@ -5,3 +5,4 @@ Formulae for representing the temperature and pressure dependence of vapour diff
 from .lowe_et_al_2019 import LoweEtAl2019
 from .neglect import Neglect
 from .tracy_welch_porter import TracyWelchPorter
+from .grabowski_et_al_2011 import GrabowskiEtAl2011

PySDM/physics/diffusion_thermics/grabowski_et_al_2011.py

@@ -0,0 +1,23 @@
+"""
+as in [Grabowski et al. (2011)](https://doi.org/10.1016/j.atmosres.2010.10.020)
+"""
+
+
+class GrabowskiEtAl2011:
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def D(const, T, p):  # pylint: disable=unused-argument
+        return const.diffussion_thermics_D_G11_A * (
+            const.diffussion_thermics_D_G11_B * T + const.diffussion_thermics_D_G11_C
+        )
+
+    @staticmethod
+    def K(const, T, p):  # pylint: disable=unused-argument
+        return (
+            const.diffussion_thermics_K_G11_A * T**3
+            + const.diffussion_thermics_K_G11_B * T**2
+            + const.diffussion_thermics_K_G11_C * T
+            + const.diffussion_thermics_K_G11_D
+        )

PySDM/physics/impl/fake_unit_registry.py

@@ -26,6 +26,7 @@ class FakeUnitRegistry:  # pylint: disable=too-few-public-methods
                 "litre",
                 "hour",
                 "newton",
+                "watt",
             ):
                 self.__setattr__(prefix + unit, _fake(si.__getattr__(prefix + unit)))
                 self.__setattr__(
@@ -48,5 +49,6 @@ class FakeUnitRegistry:  # pylint: disable=too-few-public-methods
                 "h",
                 "bar",
                 "N",
+                "W",
             ):
                 self.__setattr__(prefix + unit, _fake(si.__getattr__(prefix + unit)))

PySDM/physics/trivia.py

@@ -125,3 +125,7 @@ class Trivia:  # pylint: disable=too-many-public-methods
     @staticmethod
     def mixing_ratio_to_specific_content(mixing_ratio):
         return mixing_ratio / (1 + mixing_ratio)
+
+    @staticmethod
+    def dn_dlogr(r, dn_dr):
+        return np.log(10) * r * dn_dr

PySDM/products/condensation/peak_supersaturation.py

@@ -19,6 +19,10 @@ class PeakSupersaturation(Product):
     def register(self, builder):
         super().register(builder)
         self.particulator.observers.append(self)
+
+        assert (
+            "Condensation" in self.particulator.dynamics
+        ), "It seems the Condensation dynamic was not added when building particulator"
         self.condensation = self.particulator.dynamics["Condensation"]
         self.RH_max = np.full_like(self.buffer, np.nan)
 

{PySDM-2.44.dist-info → PySDM-2.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.44
+Version: 2.45
 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.44.dist-info → PySDM-2.45.dist-info}/RECORD

@@ -181,7 +181,7 @@ PySDM/initialisation/impl/__init__.py,sha256=vejuF9ebIGXb7l9zEiBBbNjs1Qct1KZuZRP
 PySDM/initialisation/impl/spectrum.py,sha256=mnhodIKZUReelgxgT3GwT8FH9LnyaUigmr1GaQIJkv8,1138
 PySDM/initialisation/sampling/__init__.py,sha256=zVwv6m1lrC4moviau-rL-tdGNL1pjx9KujEfEAmLe-Y,42
 PySDM/initialisation/sampling/spatial_sampling.py,sha256=HPDEEjTN_CWU9KX2Fw_7wMMKzQRMqi1tKVhzZ1KLcWY,1000
-PySDM/initialisation/sampling/spectral_sampling.py,sha256=-zD3wR9RuM9Q9WazCKaGbU--QiEBPB_W6eEzSvGT-jc,4313
+PySDM/initialisation/sampling/spectral_sampling.py,sha256=9Nd38R06EnbPLnpucu8occ-u1qmCGO6xD6PSSx8PYZY,4358
 PySDM/initialisation/sampling/spectro_glacial_sampling.py,sha256=Wtq-NvZGX3-hFzRe_2LI2Ab8vi1BAcHNtdrC5gk3Rfo,1662
 PySDM/initialisation/spectra/__init__.py,sha256=jU86INl3-p7HPOroJ5kGy7k43U4bxbXkfvffmvlIHz0,309
 PySDM/initialisation/spectra/exponential.py,sha256=bF61am70p4KJsU910SamlY_PO-rXVs9yErKXQIZ2LGE,364
@@ -192,18 +192,21 @@ PySDM/initialisation/spectra/sum.py,sha256=SaxepweOdCozWlUkxCfr6Udo-KjGKWXgrdS0a
 PySDM/initialisation/spectra/top_hat.py,sha256=xmBr_IrctsnguPNgX-jR7JnQnQl1qzIaEyz75fvAJho,563
 PySDM/physics/__init__.py,sha256=FLer5MXgu69MztiUN91rpVVRV75SX-_YCRZohTF3y-U,1745
 PySDM/physics/constants.py,sha256=wrIR-prH5ougsrL7jmpaIdmdmGZ5BejjmIEf5yFQpZs,1293
-PySDM/physics/constants_defaults.py,sha256=XGKJ6WhaJPZsRK0of8Oya5YyJjpCEq4ufWTu69DWo4A,10500
+PySDM/physics/constants_defaults.py,sha256=kha03ZhX3ZewG1L6CaHQJsWJhoxeOO8WU8V2J1NvQAc,10892
 PySDM/physics/dimensional_analysis.py,sha256=6_myMgc_eKhcbuNr7RqiQGj0OKNQ1TNqEMRb6Kzsqj0,688
-PySDM/physics/trivia.py,sha256=Y6DxnBp5a6BqGvfZNYlOWlP6X6mr2HHOUfWJ759N_sg,3677
+PySDM/physics/trivia.py,sha256=8fWqTP2G2jbnuK9xqpAIo-gfZ5ORx7In-b7AEUFAhBQ,3762
 PySDM/physics/condensation_coordinate/__init__.py,sha256=LlSg1TLiLRQ46tfsKA1Khg7SaVPd2wg-MF0Syk5O7ng,151
 PySDM/physics/condensation_coordinate/volume.py,sha256=DvkuOTHEq_vLFnJMjfEr0K0OUxTvcBBgFPlBb606sk8,410
 PySDM/physics/condensation_coordinate/volume_logarithm.py,sha256=92xFq-qSIN8llu9HM59DQvbwawzbeRBIZ5hi7KEs7gc,512
-PySDM/physics/diffusion_kinetics/__init__.py,sha256=kwHERKnqQdVa8Wv8qlTCL-Y4WxC5mInUuMoU6AVAQvs,210
+PySDM/physics/diffusion_kinetics/__init__.py,sha256=CWyIRClhDMzTLeNORHbg1izb-aGz00T6yORefVjwMsY,318
 PySDM/physics/diffusion_kinetics/fuchs_sutugin.py,sha256=6HSMZoyKzCa1Vl-CkIOFJalGNnQB5Cl5MFFVsRtibFc,1025
+PySDM/physics/diffusion_kinetics/grabowski_et_al_2011.py,sha256=_-bvXLcSfjPH2KEnRpSxyxG0olGi-hxkV2-nLBN4SwE,197
+PySDM/physics/diffusion_kinetics/jensen_and_nugent_2017.py,sha256=YVUVyLhwjs_i1LQ40ULXZri2--t41I0otzTEGj4UJQ0,424
 PySDM/physics/diffusion_kinetics/lowe_et_al_2019.py,sha256=mIR5jH00SNurVzKEgWk0e3-KKq65NbFqTHo3ZBDqzjY,621
 PySDM/physics/diffusion_kinetics/neglect.py,sha256=QCiLZwQo7VW29dftNuwQjLdOePz0kZSvjepGmqr_Ar8,500
-PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2005.py,sha256=ZsFuoGlPOoMuzdJ_h4pOM70lGhtyeiIATFcuEWlWwGY,473
-PySDM/physics/diffusion_thermics/__init__.py,sha256=70pZ4RhK-Ykz46r00gxfnkFYjPNf8i9KFc0oHzRtFtg,227
+PySDM/physics/diffusion_kinetics/pruppacher_and_klett_2005.py,sha256=1GVoKpZ9sw5se-uxvnyjcOc4khLJ64hYTPoztMM5nz0,686
+PySDM/physics/diffusion_thermics/__init__.py,sha256=0m8nbzap79JQDOa6NOKaKX6issZi76KoBib9qxDV65Q,279
+PySDM/physics/diffusion_thermics/grabowski_et_al_2011.py,sha256=_JRfeYa_Bo9ylYbGPWKPVaNGJUNm5M4YJL4cm6c5zoI,695
 PySDM/physics/diffusion_thermics/lowe_et_al_2019.py,sha256=JkzhyHQwRHgui3M_fh3-QqXPlzjgtNrfHrcYFzAtl4Y,452
 PySDM/physics/diffusion_thermics/neglect.py,sha256=m_yXkbDMb_bnMlfQR2qjteTQ9cmbE3E6tDRC3M2DtUM,312
 PySDM/physics/diffusion_thermics/seinfeld_and_pandis_2010.py,sha256=Efz20-SZzbapGaxXlywj26BtGU3zATDMk9FkbYA9MTw,316
@@ -234,7 +237,7 @@ PySDM/physics/hygroscopicity/__init__.py,sha256=Iu3uM5NzjY9RCffhguD_hHrRy4DoVlz-
 PySDM/physics/hygroscopicity/kappa_koehler.py,sha256=cTuuShyG7v9PbTTjRc9Xp6Wua_5YZS6XycTMXOwb6Ok,606
 PySDM/physics/hygroscopicity/kappa_koehler_leading_terms.py,sha256=PzKLb9fPeR1jH872jtY5unNKGrmpLrFquXaT9WkCFu0,712
 PySDM/physics/impl/__init__.py,sha256=M0WoRoBIUk2fXAL2GKv4AS8QTIcOJQ5fzE1x53X1YHI,154
-PySDM/physics/impl/fake_unit_registry.py,sha256=IEwYsXHFCJrhLLD_ZcTyRDhPJKPPwErH2koCJiW8-kw,1683
+PySDM/physics/impl/fake_unit_registry.py,sha256=3Iv5vbMde_pTncJVQO51lzmnqGR1905oOjIPVG-NlFk,1728
 PySDM/physics/impl/flag.py,sha256=zjTKmfWEKY60AiNUWbxLVy3DBzXFMy-YaMxKnUjMap8,192
 PySDM/physics/isotope_equilibrium_fractionation_factors/__init__.py,sha256=BNh6k8VAqAX8BKH0LsVVTH1662wpvpIoGfbXbT5XQSg,681
 PySDM/physics/isotope_equilibrium_fractionation_factors/barkan_and_luz_2005.py,sha256=W_GaRPlA905UpoS4OYG7uIrBxSAb5UXwK2TyBZd-gHY,350
@@ -312,7 +315,7 @@ PySDM/products/condensation/__init__.py,sha256=4Trl0rt4f2j3XFnBMooMDIPaq2pjl86hF
 PySDM/products/condensation/activable_fraction.py,sha256=YoGJH7jTL2P6NH9-9E4og8ZUGb0sHpZTRs9pj1MZcxM,891
 PySDM/products/condensation/condensation_timestep.py,sha256=7vi2V0BwVXZDngVwY2u-zFpgN42_Dd_ykYg_NhjYyj0,1540
 PySDM/products/condensation/event_rates.py,sha256=-djWcPHbsO2V0tv9NoGp98y1MU-qHjFyceGm1I75P98,1812
-PySDM/products/condensation/peak_supersaturation.py,sha256=dVJdt-J1woS-YqdjDzgl7TKcPHig3HturJY5d5_RRS8,1111
+PySDM/products/condensation/peak_supersaturation.py,sha256=e0AwMjooCueuQ3YLrUZ6AxahGQLJdh5ocOE1SVMYyaE,1274
 PySDM/products/displacement/__init__.py,sha256=dHAXQ2b7jmQVMYdWkIuGjGz56EU0UyJMRDyKV0meo1w,315
 PySDM/products/displacement/averaged_terminal_velocity.py,sha256=h2JBUmYkTeyGwGdVJoGsYeY0XJStg2pwGcuDpZVT-mk,1172
 PySDM/products/displacement/flow_velocity_component.py,sha256=I5K8gpKeMDYlCeIYuwF3W7hGsHHSKLp-my-OPcwYb0k,1383
@@ -361,8 +364,8 @@ PySDM/products/size_spectral/size_standard_deviation.py,sha256=ikW_BefV27gwUlDPo
 PySDM/products/size_spectral/total_particle_concentration.py,sha256=stDEn67KGhxEkrOC4CCfCFVgjtQPMphZTfJ1Vy_H5aw,454
 PySDM/products/size_spectral/total_particle_specific_concentration.py,sha256=z6SfknIoXgT2XbVeuswrwBew9yTlmbW7qWFRmD4rqUg,460
 PySDM/products/size_spectral/water_mixing_ratio.py,sha256=i2g2s8Hj_ZTmggZvXuGRWnqyxutSknncY8Imzw_Vfhk,1301
-PySDM-2.44.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-PySDM-2.44.dist-info/METADATA,sha256=CQezSfXn6JrrZkS0D32PSu_vzkZT79UPOe8dqR8j3hY,45361
-PySDM-2.44.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-PySDM-2.44.dist-info/top_level.txt,sha256=6NYaDAhUnaYMD7ebD_dQ7HlhiJS7NMuKEXb0ck7Wcsg,6
-PySDM-2.44.dist-info/RECORD,,
+PySDM-2.45.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+PySDM-2.45.dist-info/METADATA,sha256=8azh6MqIvPeMTMBcvLKqPIOH5pi-ETHBMnqzXfm-GDM,45361
+PySDM-2.45.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+PySDM-2.45.dist-info/top_level.txt,sha256=6NYaDAhUnaYMD7ebD_dQ7HlhiJS7NMuKEXb0ck7Wcsg,6
+PySDM-2.45.dist-info/RECORD,,