PySDM 2.52__py3-none-any.whl → 2.53__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
PySDM/formulae.py CHANGED
@@ -34,7 +34,7 @@ class Formulae: # pylint: disable=too-few-public-methods,too-many-instance-attr
34
34
  saturation_vapour_pressure: str = "FlatauWalkoCotton",
35
35
  latent_heat: str = "Kirchhoff",
36
36
  hygroscopicity: str = "KappaKoehlerLeadingTerms",
37
- drop_growth: str = "MaxwellMason",
37
+ drop_growth: str = "Mason1971",
38
38
  surface_tension: str = "Constant",
39
39
  diffusion_kinetics: str = "FuchsSutugin",
40
40
  diffusion_thermics: str = "Neglect",
@@ -12,6 +12,9 @@ from PySDM.initialisation.impl.spectrum import Spectrum
12
12
 
13
13
  class Lognormal(Spectrum):
14
14
  def __init__(self, norm_factor: float, m_mode: float, s_geom: float):
15
+ """`norm_factor=1` corresponds to standard normalised probability density,
16
+ other settings allow to express, e.g., size or mass distributions;
17
+ `m_mode` is the median value, `s_geom` is the geometric standard deviation"""
15
18
  super().__init__(lognorm, (math.log(s_geom), 0, m_mode), norm_factor)
16
19
 
17
20
  @property
@@ -2,4 +2,5 @@
2
2
  Formulation of the coupled heat-moisture diffusion problem
3
3
  """
4
4
 
5
- from .maxwell_mason import MaxwellMason
5
+ from .mason_1951 import Mason1951
6
+ from .mason_1971 import Mason1971
@@ -0,0 +1,23 @@
1
+ """
2
+ single-equation approximation of the vapour and heat diffusion problem
3
+ as derived in [Mason 1951](https://doi.org/10.1088/0370-1301/64/9/307)
4
+ (note that Mason's work did not include the ventilation factor, it
5
+ is included here for code maintainability - to reduce duplication at the
6
+ calling scopes; it is not ignored and is used as a multiplicative factor
7
+ in the same way as in `PySDM.physics.drop_growth.mason_1971.Mason1971`)
8
+ """
9
+
10
+
11
+ class Mason1951: # pylint: disable=too-few-public-methods
12
+ def __init__(self, _):
13
+ pass
14
+
15
+ # pylint: disable=too-many-arguments
16
+ @staticmethod
17
+ def r_dr_dt(const, RH_eq, T, RH, lv, pvs, D, K, ventilation_factor):
18
+ return (
19
+ ventilation_factor
20
+ * (RH - RH_eq)
21
+ / const.rho_w
22
+ / (const.Rv * T / D / pvs + lv**2 / K / T**2 / const.Rv)
23
+ )
@@ -1,9 +1,11 @@
1
1
  """
2
2
  single-equation approximation of the vapour and heat diffusion problem
3
+ as given in eq. 3.11 in [Mason 1971](https://archive.org/details/physicsofclouds0000maso)
4
+ (see also discussion of the ventilation effect on page 125)
3
5
  """
4
6
 
5
7
 
6
- class MaxwellMason: # pylint: disable=too-few-public-methods
8
+ class Mason1971: # pylint: disable=too-few-public-methods
7
9
  def __init__(self, _):
8
10
  pass
9
11
 
@@ -13,8 +15,6 @@ class MaxwellMason: # pylint: disable=too-few-public-methods
13
15
  return (
14
16
  ventilation_factor
15
17
  * (RH - RH_eq)
16
- / (
17
- const.rho_w * const.Rv * T / D / pvs
18
- + const.rho_w * lv / K / T * (lv / const.Rv / T - 1)
19
- )
18
+ / const.rho_w
19
+ / (const.Rv * T / D / pvs + lv / K / T * (lv / T / const.Rv - 1))
20
20
  )
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: PySDM
3
- Version: 2.52
3
+ Version: 2.53
4
4
  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
5
5
  Home-page: https://github.com/open-atmos/PySDM
6
6
  Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -34,7 +34,7 @@ Provides-Extra: tests
34
34
  Requires-Dist: matplotlib ; extra == 'tests'
35
35
  Requires-Dist: pytest ; extra == 'tests'
36
36
  Requires-Dist: pytest-timeout ; extra == 'tests'
37
- Requires-Dist: PyPartMC ==1.1.4 ; extra == 'tests'
37
+ Requires-Dist: PyPartMC ==1.2.0 ; extra == 'tests'
38
38
  Requires-Dist: pyrcel ; extra == 'tests'
39
39
  Requires-Dist: jupyter-core <5.0.0 ; extra == 'tests'
40
40
  Requires-Dist: ipywidgets !=8.0.3 ; extra == 'tests'
@@ -1,6 +1,6 @@
1
1
  PySDM/__init__.py,sha256=-jFr7iN9cgzKvlcRdCA3NLAxMc_1NHyQR4uk0ZfF_A0,1640
2
2
  PySDM/builder.py,sha256=3xwlnz2HijK4FHYm1YlkxPE02udj-WbZULZcq-iXaSk,5682
3
- PySDM/formulae.py,sha256=BuYFK0gQmVZRSZRx4hB3Ril5TPYzdjvlXrdrX6k2dmU,12952
3
+ PySDM/formulae.py,sha256=XyW3vr9PMophQqlMWTzuxs86ryVhsCYzINBe0yPGTPk,12949
4
4
  PySDM/particulator.py,sha256=Qlv0DQLNI_7x23IO5bZ6gxzNYkEXZvRKCq1ZHDcrmos,16789
5
5
  PySDM/attributes/__init__.py,sha256=wR9DAJL3beWY_9IyDsbSjLV9BqJrOXdNScVCYy-Qtw8,55
6
6
  PySDM/attributes/chemistry/__init__.py,sha256=sv9kFUXgcZjbjmrQKK8sgdgqM05MPxAw73Euj0O3n40,223
@@ -188,7 +188,7 @@ PySDM/initialisation/spectra/__init__.py,sha256=jU86INl3-p7HPOroJ5kGy7k43U4bxbXk
188
188
  PySDM/initialisation/spectra/exponential.py,sha256=bF61am70p4KJsU910SamlY_PO-rXVs9yErKXQIZ2LGE,364
189
189
  PySDM/initialisation/spectra/gamma.py,sha256=juKhalmSv4nRcSPrGxJwH42wUc_qz7irXzES5zfNvNA,385
190
190
  PySDM/initialisation/spectra/gaussian.py,sha256=SmTZYyrBJaTAKhZzjuKfiXXwL3jiPlDW0ZkKs2g-ln8,362
191
- PySDM/initialisation/spectra/lognormal.py,sha256=xxrnvFurW9BXj8XXdsM6_KVqO1kr5ok4dmEucMVeUZg,925
191
+ PySDM/initialisation/spectra/lognormal.py,sha256=pa1z5zWsAHlQFZ9CRse0wvMoc91S8fSRosXtKQTuVkY,1169
192
192
  PySDM/initialisation/spectra/sum.py,sha256=SaxepweOdCozWlUkxCfr6Udo-KjGKWXgrdS0ahyUNfA,1315
193
193
  PySDM/initialisation/spectra/top_hat.py,sha256=xmBr_IrctsnguPNgX-jR7JnQnQl1qzIaEyz75fvAJho,563
194
194
  PySDM/physics/__init__.py,sha256=ERbn_ncEWQfkDavYd-xmr6V8INuP2w54BwM45lUvLq4,1772
@@ -213,8 +213,9 @@ PySDM/physics/diffusion_thermics/lowe_et_al_2019.py,sha256=JkzhyHQwRHgui3M_fh3-Q
213
213
  PySDM/physics/diffusion_thermics/neglect.py,sha256=m_yXkbDMb_bnMlfQR2qjteTQ9cmbE3E6tDRC3M2DtUM,312
214
214
  PySDM/physics/diffusion_thermics/seinfeld_and_pandis_2010.py,sha256=Efz20-SZzbapGaxXlywj26BtGU3zATDMk9FkbYA9MTw,316
215
215
  PySDM/physics/diffusion_thermics/tracy_welch_porter.py,sha256=c6qFg2wSMlo6rl9k8LrQH662vfFKFYHAc2eRRmBQeBM,424
216
- PySDM/physics/drop_growth/__init__.py,sha256=evkTwPeeGXDQVt43XMUE6n3gyUa3LTr8VNubbLgIUEo,108
217
- PySDM/physics/drop_growth/maxwell_mason.py,sha256=B_RZvFHaytevuoXzowkNIY0E0yeW0ViUzgYfb_FcDQ4,553
216
+ PySDM/physics/drop_growth/__init__.py,sha256=FG2J2hZ3V1SaQ9aYMdPCBrFWT4Z5tfez6CbMzl2DYGU,136
217
+ PySDM/physics/drop_growth/mason_1951.py,sha256=SJqon9F-Hxs8XzUP5i92RPut-w0j_6SQzc9t907vX4Y,849
218
+ PySDM/physics/drop_growth/mason_1971.py,sha256=ZMRXyXN5I8_w_uQB_ZJyaTIz-yOfYhRDS_WOSb08N58,652
218
219
  PySDM/physics/fragmentation_function/__init__.py,sha256=-kn2Yhj_jjMKTuETSzXt5ATdDtlzRxC-UzW5z7cydvA,366
219
220
  PySDM/physics/fragmentation_function/always_n.py,sha256=k7R9su0zD5oB75mW7xg2wGHDo3_S3Cb7F9TZme2c4Nk,187
220
221
  PySDM/physics/fragmentation_function/constant_mass.py,sha256=mKLnNivDzTEABmhImmfvU8MMR0eXs_81VVYIZeI8KG0,197
@@ -366,8 +367,8 @@ PySDM/products/size_spectral/size_standard_deviation.py,sha256=ikW_BefV27gwUlDPo
366
367
  PySDM/products/size_spectral/total_particle_concentration.py,sha256=stDEn67KGhxEkrOC4CCfCFVgjtQPMphZTfJ1Vy_H5aw,454
367
368
  PySDM/products/size_spectral/total_particle_specific_concentration.py,sha256=z6SfknIoXgT2XbVeuswrwBew9yTlmbW7qWFRmD4rqUg,460
368
369
  PySDM/products/size_spectral/water_mixing_ratio.py,sha256=i2g2s8Hj_ZTmggZvXuGRWnqyxutSknncY8Imzw_Vfhk,1301
369
- PySDM-2.52.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
370
- PySDM-2.52.dist-info/METADATA,sha256=VzJDm-gx1X2U5ds9LTg8kF0Z-fSTsTxRKnwAwu8fQ_g,45406
371
- PySDM-2.52.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
372
- PySDM-2.52.dist-info/top_level.txt,sha256=6NYaDAhUnaYMD7ebD_dQ7HlhiJS7NMuKEXb0ck7Wcsg,6
373
- PySDM-2.52.dist-info/RECORD,,
370
+ PySDM-2.53.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
371
+ PySDM-2.53.dist-info/METADATA,sha256=W76w9UAcY1WdN3uYboWHN4udxYlf8h101RenAHAqn_s,45406
372
+ PySDM-2.53.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
373
+ PySDM-2.53.dist-info/top_level.txt,sha256=6NYaDAhUnaYMD7ebD_dQ7HlhiJS7NMuKEXb0ck7Wcsg,6
374
+ PySDM-2.53.dist-info/RECORD,,
File without changes
File without changes