PySDM-examples 2.47__py3-none-any.whl → 2.49__py3-none-any.whl

PySDM_examples/Bieli_et_al_2022/simulation.py

@@ -26,8 +26,14 @@ def make_core(settings, coal_eff):
         adaptive=settings.adaptive,
     )
     builder.add_dynamic(collision)
-    M0 = am.make_arbitrary_moment_product(rank=0, attr="volume", attr_unit="m^3")
-    M1 = am.make_arbitrary_moment_product(rank=1, attr="volume", attr_unit="m^3")
-    M2 = am.make_arbitrary_moment_product(rank=2, attr="volume", attr_unit="m^3")
-    products = (M0(name="M0"), M1(name="M1"), M2(name="M2"))
+    common_args = {
+        "attr": "volume",
+        "attr_unit": "m^3",
+        "skip_division_by_m0": True,
+        "skip_division_by_dv": True,
+    }
+    products = tuple(
+        am.make_arbitrary_moment_product(rank=rank, **common_args)(name=f"M{rank}")
+        for rank in range(3)
+    )
     return builder.build(attributes, products)

PySDM_examples/Jensen_and_Nugent_2017/settings.py

@@ -3,15 +3,19 @@ from PySDM import Formulae
 from PySDM.physics import si
 from PySDM.initialisation.spectra import Lognormal, Sum
 
+INITIAL_RELATIVE_HUMIDITY = 0.8561
+INITIAL_TEMPERATURE = 284.3 * si.K
+INITIAL_PRESSURE = 938.5 * si.hPa
+INITIAL_ALTITUDE = 600 * si.metres
+
 
 @strict
 class Settings:
     def __init__(self, *, aerosol: str, cloud_type: str):
-        # TODO #1266 reuse these values in the Yang et al. '18 example which is based on J&N'16
-        self.p0 = 938.5 * si.hPa
-        self.RH0 = 0.8561
-        self.T0 = 284.3 * si.K
-        self.z0 = 600 * si.m
+        self.p0 = INITIAL_PRESSURE
+        self.RH0 = INITIAL_RELATIVE_HUMIDITY
+        self.T0 = INITIAL_TEMPERATURE
+        self.z0 = INITIAL_ALTITUDE
         self.t_end_of_ascent = 1500 * si.s if cloud_type == "Sc" else None
         self.dt = 1 * si.s  # TODO #1266: not found in the paper yet
 

PySDM_examples/Yang_et_al_2018/settings.py

@@ -1,6 +1,8 @@
 import numpy as np
 from pystrict import strict
 
+from PySDM_examples import Jensen_and_Nugent_2017
+
 from PySDM.backends import CPU
 from PySDM.dynamics import condensation
 from PySDM.initialisation import spectra
@@ -47,10 +49,10 @@ class Settings:
         self.rtol_thd = condensation.DEFAULTS.rtol_thd
         self.dt_cond_range = condensation.DEFAULTS.cond_range
 
-        self.T0 = 284.3 * si.kelvin
-        self.initial_water_vapour_mixing_ratio = 7.6 * si.grams / si.kilogram
-        self.p0 = 938.5 * si.hectopascals
-        self.z0 = 600 * si.metres
+        self.T0 = Jensen_and_Nugent_2017.settings.INITIAL_TEMPERATURE
+        self.RH0 = Jensen_and_Nugent_2017.settings.INITIAL_RELATIVE_HUMIDITY
+        self.p0 = Jensen_and_Nugent_2017.settings.INITIAL_PRESSURE
+        self.z0 = Jensen_and_Nugent_2017.settings.INITIAL_ALTITUDE
         self.kappa = 0.53  # Petters and S. M. Kreidenweis mean growth-factor derived
 
         self.t0 = 1200 * si.second

PySDM_examples/Yang_et_al_2018/simulation.py

@@ -26,7 +26,15 @@ class Simulation:
             dt=dt_output / self.n_substeps,
             mass_of_dry_air=settings.mass_of_dry_air,
             p0=settings.p0,
-            initial_water_vapour_mixing_ratio=settings.initial_water_vapour_mixing_ratio,
+            initial_water_vapour_mixing_ratio=self.formulae.constants.eps
+            / (
+                settings.p0
+                / settings.RH0
+                / self.formulae.saturation_vapour_pressure.pvs_Celsius(
+                    settings.T0 - self.formulae.constants.T0
+                )
+                - 1
+            ),
             T0=settings.T0,
             w=settings.w,
             z0=settings.z0,

{PySDM_examples-2.47.dist-info → PySDM_examples-2.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM-examples
-Version: 2.47
+Version: 2.49
 Summary: PySDM usage examples reproducing results from literature and depicting how to use PySDM from Python Jupyter notebooks
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors

{PySDM_examples-2.47.dist-info → PySDM_examples-2.49.dist-info}/RECORD

@@ -37,7 +37,7 @@ PySDM_examples/Berry_1967/settings.py,sha256=9VmVS4zBTGQff-xBdxb9AjUB9iNNm-qMznU
 PySDM_examples/Berry_1967/spectrum_plotter.py,sha256=WEEaryYBDydStKyx6H915LVTxeFFKj0pmpdVotktjI4,1023
 PySDM_examples/Bieli_et_al_2022/__init__.py,sha256=YdI2papu13HSfH973XxfrwGZkP_nbiXO4lgGHime_7M,141
 PySDM_examples/Bieli_et_al_2022/settings.py,sha256=qJxoGChzqta-c_O2yv4E3wEM4yoECa2dyhKmE8AGrtI,1679
-PySDM_examples/Bieli_et_al_2022/simulation.py,sha256=i-EEZvt37VuUXOEzbFBy7YrJez7_YHiI-gCtsPj_EbM,1304
+PySDM_examples/Bieli_et_al_2022/simulation.py,sha256=NmLPIwrsV-MTrnZPOQNnxDqVaYsnzq51K_6avIdHZFg,1292
 PySDM_examples/Bolot_et_al_2013/__init__.py,sha256=6yZ-PdTBwwN9f4HqOe-E0m-CyM47mgg2E4ezVKVELF4,136
 PySDM_examples/Bulenok_2023_MasterThesis/__init__.py,sha256=GPHWvxMGulWIaSH7CQlESd2jNTRJeMcXRqjzzJ-AAf8,164
 PySDM_examples/Bulenok_2023_MasterThesis/setups.py,sha256=UVTp0oBMblcR46J29aylfZ6g6-8jlhXCb90ODdcfaSE,3424
@@ -51,7 +51,7 @@ PySDM_examples/Graf_et_al_2019/__init__.py,sha256=nT6uOv3PODePRUzFoyOfH_eOCjJkg5
 PySDM_examples/Jaruga_and_Pawlowska_2018/__init__.py,sha256=VJz_xFOhVvnqYHKbAPRnZQ3Vky6JEOZxBx8kV0kHIcg,161
 PySDM_examples/Jensen_and_Nugent_2017/__init__.py,sha256=3iMpMdkdy_BEBBhjD9WR-2HbRHn7dop8kEk2uJJYe9U,66
 PySDM_examples/Jensen_and_Nugent_2017/plotting.py,sha256=-e6mkOIugGwfydBquGEEaW2JhJ6mI1-pl-7sT1p6v08,2181
-PySDM_examples/Jensen_and_Nugent_2017/settings.py,sha256=3HTGTN7Pf7zhC_KCOCrOtKzSmnCHaizc5L8eb1l73GI,2056
+PySDM_examples/Jensen_and_Nugent_2017/settings.py,sha256=rok_FJJxfB9kOeWbKPONmtfV1DOX0RRihcBW2HVGeks,2134
 PySDM_examples/Jensen_and_Nugent_2017/simulation.py,sha256=g_S1w9vnwzwcpc7U6571zR_fswmHP2bOwTH4r7ZiZ7M,3989
 PySDM_examples/Jensen_and_Nugent_2017/table_3.py,sha256=HVhqXwNIqkUyl0k718qVaZaf0lnENWpE-sjqj5b08bc,952
 PySDM_examples/Kreidenweis_et_al_2003/__init__.py,sha256=9QbrxhPe0QJxboGKeqHhq9rrvQ5VUcjTpqWgWsxnM1E,225
@@ -116,8 +116,8 @@ PySDM_examples/Szumowski_et_al_1998/sounding.py,sha256=vk3KHRPrBbZpz6QCqj2RtWyEp
 PySDM_examples/Szumowski_et_al_1998/storage.py,sha256=NaGoujCRLubSEbhLA0QZDaSkATpJuF09HCnGdWQzcxQ,2579
 PySDM_examples/Van_Hook_1968/__init__.py,sha256=nTGyMcf6D4l6Ib0hMwyx4es1nX5dpuPbM9AYEleaIPE,119
 PySDM_examples/Yang_et_al_2018/__init__.py,sha256=zY7OnJ0d5eyWh3j0VvuHJMYOum9jY596-Ek2po0efmE,227
-PySDM_examples/Yang_et_al_2018/settings.py,sha256=J62kB5pEThmMcWSLsLKgcv0Pii6VLPDbfz6HPgs7O9o,2185
-PySDM_examples/Yang_et_al_2018/simulation.py,sha256=sG2kO_l66ec5XRYIDygB6_493jqKh6fF2hc_TyAh8z8,3928
+PySDM_examples/Yang_et_al_2018/settings.py,sha256=snD3ehCPaWD2QBJosdCYKX4X-dHb0LnBiayhPkXUY3w,2327
+PySDM_examples/Yang_et_al_2018/simulation.py,sha256=N1XsZAMDfT7n9423Tt2PN2NDXVsOYjQIAZMMY2hWXNg,4173
 PySDM_examples/deJong_Azimi/__init__.py,sha256=VSVGYB3ckDnW2WVTnrn0tebEIbsE3xYNL6_gdQh4XMs,264
 PySDM_examples/deJong_Azimi/cloudy_data.py,sha256=WrseLwj7uF0cESY7xRWqXbXzOu-WPJCNAPyrNMOqQHE,11258
 PySDM_examples/deJong_Azimi/cloudy_data_0d.py,sha256=uadPxR4zMQFViIFjoqiGfAxTFLAVaUd9Xf6Coj-lXVg,12260
@@ -139,7 +139,7 @@ PySDM_examples/utils/read_vtk_1d.py,sha256=7_3sagEbX_FxqFuGkFWdwQapd1-9echFghU8T
 PySDM_examples/utils/widgets/__init__.py,sha256=U67WZ2YDcXSocMraI7pzcMxCfcxzXNqehDzoG6ogsh4,519
 PySDM_examples/utils/widgets/freezer.py,sha256=tFlZWShXUzA2X0cxgeE44N1g9kD33q3KQWZBqkgBP0A,407
 PySDM_examples/utils/widgets/progbar_updater.py,sha256=3uhG32QkAiSM3dTV7DoROJl7fAUNA6ZsJEIKSg3tdmk,267
-PySDM_examples-2.47.dist-info/METADATA,sha256=AbwJKzZZzY02CRdyvMQZ2fNdo1TEtq81o0-nuEfBkmM,36124
-PySDM_examples-2.47.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PySDM_examples-2.47.dist-info/top_level.txt,sha256=axw2inuuYKPWkQhzBYtkZJTPDlo5LrpGLOA0iSAf9v0,15
-PySDM_examples-2.47.dist-info/RECORD,,
+PySDM_examples-2.49.dist-info/METADATA,sha256=wDGKl9UYNtJ9Q-iYpsQUjdRX6jcA7FF-BTPfCLL41-8,36124
+PySDM_examples-2.49.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+PySDM_examples-2.49.dist-info/top_level.txt,sha256=axw2inuuYKPWkQhzBYtkZJTPDlo5LrpGLOA0iSAf9v0,15
+PySDM_examples-2.49.dist-info/RECORD,,