PySDM 2.102__tar.gz → 2.103__tar.gz

{pysdm-2.102 → pysdm-2.103}/.github/workflows/tests.yml

@@ -213,7 +213,7 @@ jobs:
       matrix:
         platform: [ubuntu-24.04, macos-13, windows-latest]
         python-version: ["3.9", "3.12"]
-        test-suite: [ "chemistry_freezing", "isotopes", "condensation_a", "condensation_b", "condensation_c", "coagulation", "breakup", "multi-process_a", "multi-process_b", "multi-process_c", "multi-process_d", "multi-process_e"]
+        test-suite: [ "chemistry_freezing_extraterrestrial", "isotopes", "condensation_a", "condensation_b", "condensation_c", "coagulation", "breakup", "multi-process_a", "multi-process_b", "multi-process_c", "multi-process_d", "multi-process_e"]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 35

{pysdm-2.102 → pysdm-2.103}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.102
+Version: 2.103
 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.102 → pysdm-2.103}/PySDM/environments/parcel.py

@@ -114,7 +114,6 @@ class Parcel(Moist):  # pylint: disable=too-many-instance-attributes
 
         # derivative evaluated at p_old, T_old, mixrat_mid, w_mid
         drho_dz = formulae.hydrostatics.drho_dz(
-            g=formulae.constants.g_std,
             p=p,
             T=T,
             water_vapour_mixing_ratio=water_vapour_mixing_ratio,

{pysdm-2.102 → pysdm-2.103}/PySDM/formulae.py

@@ -41,7 +41,7 @@ class Formulae:  # pylint: disable=too-few-public-methods,too-many-instance-attr
         ventilation: str = "Neglect",
         state_variable_triplet: str = "LibcloudphPlusPlus",
         particle_advection: str = "ImplicitInSpace",
-        hydrostatics: str = "Default",
+        hydrostatics: str = "ConstantGVapourMixingRatioAndThetaStd",
         freezing_temperature_spectrum: str = "Null",
         heterogeneous_ice_nucleation_rate: str = "Null",
         fragmentation_function: str = "AlwaysN",

{pysdm-2.102 → pysdm-2.103}/PySDM/physics/constants_defaults.py

@@ -606,6 +606,9 @@ c_pw = 4218 * si.joule / si.kilogram / si.kelvin
 g_std = sci.g * si.metre / si.second**2
 """ standard gravitational acceleration (value from SciPy) """
 
+celestial_body_radius = np.nan
+""" radius of the considered celestial body (Earth, Titan, ...) """
+
 bulk_phase_partitioning_T_cold = 235 * si.K
 """ [Kaul et al. 2015](https://doi.org/10.1175/MWR-D-14-00319.1) """
 bulk_phase_partitioning_T_warm = 273 * si.K

pysdm-2.103/PySDM/physics/hydrostatics/__init__.py

@@ -0,0 +1,8 @@
+"""
+Helper routines for hydrostatic pressure and density profiles
+"""
+
+from .constant_g_vapour_mixing_ratio_and_theta_std import (
+    ConstantGVapourMixingRatioAndThetaStd,
+)
+from .variable_g_isothermal import VariableGIsothermal

pysdm-2.102/PySDM/physics/hydrostatics/default.py → pysdm-2.103/PySDM/physics/hydrostatics/constant_g_vapour_mixing_ratio_and_theta_std.py

@@ -1,18 +1,19 @@
 """
-# TODO #407
+hydrostatic profile assuming constant g, constant water vapour mixing ratio
+and constant (standard) potential temperature
 """
 
 import numpy as np
 
 
-class Default:
+class ConstantGVapourMixingRatioAndThetaStd:
     def __init__(self, _):
         pass
 
     # pylint: disable=too-many-arguments
     @staticmethod
     def drho_dz(
-        const, g, p, T, water_vapour_mixing_ratio, lv, d_liquid_water_mixing_ratio__dz=0
+        const, p, T, water_vapour_mixing_ratio, lv, d_liquid_water_mixing_ratio__dz=0
     ):
         Rq = const.Rv / (1 / water_vapour_mixing_ratio + 1) + const.Rd / (
             1 + water_vapour_mixing_ratio
@@ -22,14 +23,14 @@ class Default:
         )
         rho = p / Rq / T
         return (
-            g / T * rho * (Rq / cp - 1)
+            const.g_std / T * rho * (Rq / cp - 1)
             - p * lv / cp / T**2 * d_liquid_water_mixing_ratio__dz
         ) / Rq
 
     # pylint: disable=too-many-arguments
     @staticmethod
     def p_of_z_assuming_const_th_and_initial_water_vapour_mixing_ratio(
-        const, g, p0, thstd, water_vapour_mixing_ratio, z
+        const, p0, thstd, water_vapour_mixing_ratio, z
     ):
         z0 = 0
         Rq = const.Rv / (1 / water_vapour_mixing_ratio + 1) + const.Rd / (
@@ -37,6 +38,6 @@ class Default:
         )
         arg = (
             np.power(p0 / const.p1000, const.Rd_over_c_pd)
-            - (z - z0) * const.Rd_over_c_pd * g / thstd / Rq
+            - (z - z0) * const.Rd_over_c_pd * const.g_std / thstd / Rq
         )
         return const.p1000 * np.power(arg, 1 / const.Rd_over_c_pd)

pysdm-2.103/PySDM/physics/hydrostatics/variable_g_isothermal.py

@@ -0,0 +1,25 @@
+"""
+assuming constant temperature and variable
+gravitational acceleration g(z) = g0 * R^2 / (R+z)^2
+as in [Toon et al. 1980](https://doi.org/10.1016/0019-1035(80)90173-6)
+"""
+
+import numpy as np
+from PySDM.physics import constants_defaults
+
+
+class VariableGIsothermal:  # pylint: disable=too-few-public-methods
+    def __init__(self, const):
+        assert np.isfinite(const.celestial_body_radius)
+        assert const.g_std != constants_defaults.g_std
+
+    @staticmethod
+    def pressure(const, z, p0, temperature, molar_mass):
+        return p0 * np.exp(
+            -const.g_std
+            / const.R_str
+            * molar_mass
+            / temperature
+            * z
+            / (1 + z / const.celestial_body_radius)
+        )

{pysdm-2.102 → pysdm-2.103}/PySDM/physics/impl/fake_unit_registry.py

@@ -16,6 +16,7 @@ class FakeUnitRegistry:  # pylint: disable=too-few-public-methods
             for unit in (
                 "bar",
                 "metre",
+                "meter",
                 "gram",
                 "hertz",
                 "mole",
@@ -25,6 +26,7 @@ class FakeUnitRegistry:  # pylint: disable=too-few-public-methods
                 "minute",
                 "pascal",
                 "litre",
+                "liter",
                 "hour",
                 "newton",
                 "watt",

{pysdm-2.102 → pysdm-2.103}/PySDM.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.102
+Version: 2.103
 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.102 → pysdm-2.103}/PySDM.egg-info/SOURCES.txt

@@ -272,7 +272,8 @@ PySDM/physics/heterogeneous_ice_nucleation_rate/abifm.py
 PySDM/physics/heterogeneous_ice_nucleation_rate/constant.py
 PySDM/physics/heterogeneous_ice_nucleation_rate/null.py
 PySDM/physics/hydrostatics/__init__.py
-PySDM/physics/hydrostatics/default.py
+PySDM/physics/hydrostatics/constant_g_vapour_mixing_ratio_and_theta_std.py
+PySDM/physics/hydrostatics/variable_g_isothermal.py
 PySDM/physics/hygroscopicity/__init__.py
 PySDM/physics/hygroscopicity/kappa_koehler.py
 PySDM/physics/hygroscopicity/kappa_koehler_leading_terms.py
@@ -613,6 +614,8 @@ examples/PySDM_examples/Szumowski_et_al_1998/plots.py
 examples/PySDM_examples/Szumowski_et_al_1998/simulation.py
 examples/PySDM_examples/Szumowski_et_al_1998/sounding.py
 examples/PySDM_examples/Szumowski_et_al_1998/storage.py
+examples/PySDM_examples/Toon_et_al_1980/__init__.py
+examples/PySDM_examples/Toon_et_al_1980/fig_1.ipynb
 examples/PySDM_examples/Van_Hook_1968/__init__.py
 examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb
 examples/PySDM_examples/Yang_et_al_2018/__init__.py
@@ -707,6 +710,7 @@ tests/smoke_tests/kinematic_2d/arabas_et_al_2015/test_freezing.py
 tests/smoke_tests/kinematic_2d/arabas_et_al_2015/test_gui_settings.py
 tests/smoke_tests/kinematic_2d/arabas_et_al_2015/test_initialisation.py
 tests/smoke_tests/kinematic_2d/arabas_et_al_2015/test_spin_up.py
+tests/smoke_tests/no_env/bolin_1958/__init__.py
 tests/smoke_tests/no_env/bolin_1958/test_table_1.py
 tests/smoke_tests/no_env/gedzelman_and_arnold_1994/__init__.py
 tests/smoke_tests/no_env/gedzelman_and_arnold_1994/test_fig_2.py
@@ -718,6 +722,8 @@ tests/smoke_tests/no_env/pierchala_et_al_2022/__init__.py
 tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_3.py
 tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_4.py
 tests/smoke_tests/no_env/pierchala_et_al_2022/test_supplement.py
+tests/smoke_tests/no_env/toon_et_al_1980/__init__.py
+tests/smoke_tests/no_env/toon_et_al_1980/test_fig_1.py
 tests/smoke_tests/parcel_a/lowe_et_al_2019/__init__.py
 tests/smoke_tests/parcel_a/lowe_et_al_2019/conftest.py
 tests/smoke_tests/parcel_a/lowe_et_al_2019/test_dz_sensitivity.py
@@ -865,6 +871,7 @@ tests/unit_tests/physics/test_fake_unit_registry.py
 tests/unit_tests/physics/test_formulae.py
 tests/unit_tests/physics/test_fragmentation_functions.py
 tests/unit_tests/physics/test_freezing_temperature_spectra.py
+tests/unit_tests/physics/test_hydrostatics_var_g.py
 tests/unit_tests/physics/test_hygroscopicity_fierce_diagrams.py
 tests/unit_tests/physics/test_isotope_diffusivity_ratios.py
 tests/unit_tests/physics/test_isotope_equilibrium_fractionation_factors.py

{pysdm-2.102 → pysdm-2.103}/docs/bibliography.json

@@ -755,5 +755,13 @@
     ],
     "title": "Isotopic Composition and Temperature of Formation of Antarctic Snows",
     "label": "Picciotto et al. 1960 (Nature 187)"
+  },
+  "https://doi.org/10.1016/0019-1035(80)90173-6": {
+    "usages": [
+      "examples/PySDM_examples/Toon_et_al_1980/fig_1.ipynb",
+      "PySDM/physics/hydrostatics/variable_g_isothermal.py"
+    ],
+    "title": "A physical model of Titan’s clouds",
+    "label": "Toon et al. 1980 (Icarus 43)"
   }
 }

{pysdm-2.102 → pysdm-2.103}/examples/PySDM_examples/Morrison_and_Grabowski_2007/cumulus.py

@@ -50,7 +50,7 @@ class Cumulus(Common):
         def drhod_dz(z, _):
             lv = self.formulae.latent_heat.lv(T_of_z(z))
             return self.formulae.hydrostatics.drho_dz(
-                self.formulae.constants.g_std, p_of_z(z), T_of_z(z), q_of_z(z), lv
+                p_of_z(z), T_of_z(z), q_of_z(z), lv
             )
 
         theta_std0 = self.formulae.trivia.th_std(

{pysdm-2.102 → pysdm-2.103}/examples/PySDM_examples/Morrison_and_Grabowski_2007/strato_cumulus.py

@@ -23,7 +23,6 @@ class StratoCumulus(Common):
             self.formulae.hydrostatics,
             "p_of_z_assuming_const_th_and_initial_water_vapour_mixing_ratio",
         )(
-            self.formulae.constants.g_std,
             self.p0,
             self.th_std0,
             self.initial_water_vapour_mixing_ratio,

{pysdm-2.102 → pysdm-2.103}/examples/PySDM_examples/Shipway_and_Hill_2012/settings.py

@@ -99,7 +99,6 @@ class Settings:
             )
         )
 
-        g = self.formulae.constants.g_std
         self.rhod0 = self.formulae.state_variable_triplet.rho_d(
             p=p0,
             water_vapour_mixing_ratio=self.water_vapour_mixing_ratio(0 * si.m),
@@ -123,7 +122,7 @@ class Settings:
             )
             lv = self.formulae.latent_heat.lv(T)
             return self.formulae.hydrostatics.drho_dz(
-                g, p, T, water_vapour_mixing_ratio, lv
+                p, T, water_vapour_mixing_ratio, lv
             ) / (
                 1 + water_vapour_mixing_ratio
             ) - rhod * d_water_vapour_mixing_ratio__dz / (