PySDM-examples 2.46__tar.gz → 2.48__tar.gz

{PySDM-examples-2.46 → PySDM-examples-2.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM-examples
-Version: 2.46
+Version: 2.48
 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.46 → PySDM-examples-2.48}/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-2.46 → PySDM-examples-2.48}/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-2.46 → PySDM-examples-2.48}/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.46 → PySDM-examples-2.48}/PySDM_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM-examples
-Version: 2.46
+Version: 2.48
 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