PySDM 2.130__tar.gz → 2.131__tar.gz

{pysdm-2.130 → pysdm-2.131}/.github/workflows/readme_snippets.yml

@@ -26,6 +26,7 @@ jobs:
       - run: python -m pip install $PIP_INSTALL_ARGS -e .
       - run: python -m pip install $PIP_INSTALL_ARGS pytest-codeblocks pytest
       - run: python -m pip install $PIP_INSTALL_ARGS "pyparsing<3.0.0"  # https://github.com/matplotlib/matplotlib/issues/25204
+      - run: python -m pip install $PIP_INSTALL_ARGS "pillow<11.3.0"  # matplotlib triggers deprecation warnings in 11.3.0
       - run: |
           python -c "import os,pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pysdm_landing.md'); f=open('readme.py', 'w', encoding='utf-8'); f.write('# coding: utf-8'+os.linesep); f.writelines(block.code for block in code if block.syntax=='Python'); f.close()"
       - run: cat -n readme.py

{pysdm-2.130 → pysdm-2.131}/.github/workflows/tests.yml

@@ -170,6 +170,7 @@ jobs:
         run: |
           python -m pip uninstall -y jupyterlab-server # https://github.com/pypa/pip/issues/6275
           python -m pip install -e . -e ./examples
+          python -m pip install pytest-timeout
           python -m pip install -r tests/devops_tests/requirements.txt
       - if: steps.cache.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
@@ -186,7 +187,7 @@ jobs:
         test-suite: [ "chemistry_extraterrestrial", "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"]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
-    timeout-minutes: 35
+    timeout-minutes: ${{ startsWith(matrix.platform, 'windows-') && 40 || 30 }}
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -245,7 +246,7 @@ jobs:
         run: python -m pytest --basetemp=/tmp/pytest ${{ env.pytest_options }} tests/examples_tests/test_run* -k "not Rozanski_and_Sonntag_1982" --suite ${{ matrix.test-suite }}
 
       - if: ( ! startsWith(matrix.platform, 'macos-13') )
-        run: python -m pytest ${{ env.pytest_options }} --basetemp=/tmp/pytest tests/examples_tests/test_run* --suite ${{ matrix.test-suite }}
+        run: python -m pytest ${{ env.pytest_options }} --basetemp=/tmp/pytest --timeout_method=thread --timeout=${{ startsWith(matrix.platform, 'windows-') && 1000 || 900 }} tests/examples_tests/test_run* --suite ${{ matrix.test-suite }}
         
       - if: ( ! startsWith(matrix.platform, 'windows-') ) && matrix.test-suite == env.anim_test-suite && matrix.python-version == env.anim_python-version
         run: |

{pysdm-2.130/pysdm.egg-info → pysdm-2.131}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm
-Version: 2.130
+Version: 2.131
 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
 Author-email: "https://github.com/open-atmos/PySDM/graphs/contributors" <sylwester.arabas@agh.edu.pl>
 License-Expression: GPL-3.0-only
@@ -30,6 +30,7 @@ Requires-Dist: scipy
 Requires-Dist: pyevtk
 Provides-Extra: tests
 Requires-Dist: matplotlib; extra == "tests"
+Requires-Dist: Pillow; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-timeout; extra == "tests"
 Requires-Dist: PySDM-examples; extra == "tests"

{pysdm-2.130 → pysdm-2.131}/PySDM/backends/impl_numba/methods/deposition_methods.py

@@ -16,7 +16,7 @@ class DepositionMethods(BackendMethods):  # pylint:disable=too-few-public-method
         formulae = self.formulae_flattened
 
         @numba.njit(**{**self.default_jit_flags, **{"parallel": False}})
-        def body(  # pylint: disable=too-many-arguments
+        def body(  # pylint: disable=too-many-arguments,unused-argument
             *,
             multiplicity,
             signed_water_mass,
@@ -47,22 +47,15 @@ class DepositionMethods(BackendMethods):  # pylint:disable=too-few-public-method
                         signed_water_mass[i]
                     )
 
-                    diameter = radius * 2.0
-
                     temperature = current_temperature[cid]
                     pressure = current_total_pressure[cid]
                     rho = current_dry_air_density[cid]
                     pvs_ice = formulae.saturation_vapour_pressure__pvs_ice(temperature)
                     latent_heat_sub = formulae.latent_heat_sublimation__ls(temperature)
 
-                    capacity = formulae.diffusion_ice_capacity__capacity(diameter)
+                    capacity = formulae.diffusion_ice_capacity__capacity(ice_mass)
 
-                    mass_ventilation_factor = formulae.ventilation__ventilation_coefficient(
-                        sqrt_re_times_cbrt_sc=formulae.trivia__sqrt_re_times_cbrt_sc(
-                            Re=reynolds_number[i],
-                            Sc=schmidt_number[cid],
-                        )
-                    )
+                    mass_ventilation_factor = 1  # TODO #1655
                     heat_ventilation_factor = mass_ventilation_factor  # TODO #1588
 
                     Dv_const = formulae.diffusion_thermics__D(temperature, pressure)
@@ -95,6 +88,7 @@ class DepositionMethods(BackendMethods):  # pylint:disable=too-few-public-method
                         D=diffusion_coefficient * mass_ventilation_factor,
                         pvs=pvs_ice,
                     )
+
                     howell_factor_x_diffcoef_x_rhovsice_x_icess = (
                         formulae.drop_growth__r_dr_dt(
                             RH_eq=1,

pysdm-2.131/PySDM/dynamics/terminal_velocity/power_series.py

@@ -0,0 +1,33 @@
+"""
+Power series expression - a simple and mutable power-law (where the coefficients are specified
+by the user), which is a form used in many more complex terminal velocity parameterizations
+such as Rogers & Yau. This formulation emerges from balancing drag and gravitational forces on
+a spherical object, and the power depends on the drag coefficient (and thus the Reynolds number
+and flow regime). Rogers and Yau distinguishes different power law parameters for three regimes,
+whereas this much simpler formulation applies across the full range of particle sizes.
+It is introduced it as a simple option for comparison against bulk methods, think of it as the
+terminal-velocity analogue to the Geometric collision kernel.
+"""
+
+import numpy as np
+
+from PySDM.physics import si, constants as const
+
+
+class PowerSeries:  # pylint: disable=too-few-public-methods
+    def __init__(self, particulator, *, prefactors=None, powers=None):
+        self.particulator = particulator
+        self.prefactors = np.array(prefactors or [2.0e-1 * si.m / si.s / np.sqrt(si.m)])
+        self.powers = np.array(powers or [1 / 6])
+        assert len(self.prefactors) == len(self.powers)
+        for i, p in enumerate(self.powers):
+            self.prefactors[i] *= const.PI_4_3**p / si.um ** (3 * p)
+
+    def __call__(self, output, radius):
+        self.particulator.backend.power_series(
+            values=output.data,
+            radius=radius.data,
+            num_terms=len(self.powers),
+            prefactors=self.prefactors,
+            powers=self.powers,
+        )

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/constants_defaults.py

@@ -90,7 +90,6 @@ R_str = sci.R * si.joule / si.kelvin / si.mole
 N_A = sci.N_A / si.mole
 """ Avogadro constant (value from SciPy) """
 
-# mass and heat accommodation coefficients for condensation
 MAC = 1.0
 """ mass accommodation coefficient of unity as recommended in
 [Laaksonen et al. 2005](https://doi.org/10.5194/acp-5-461-2005) """
@@ -98,14 +97,17 @@ HAC = 1.0
 """ thermal accommodation coefficient of unity as recommended in
 [Laaksonen et al. 2005](https://doi.org/10.5194/acp-5-461-2005) """
 
-# mass and heat accommodation coefficients for vapour deposition on ice
 MAC_ice = 0.5
 """ mass accommodation coefficient for vapour deposition as recommended in
 [Kaercher & Lohmann 2002](https://doi.org/10.1029/2001JD000470) """
-HAC_ice = 0.7
+HAC_ice = 1.0
 """ thermal accommodation coefficient for vapour deposition as recommended in
 [Pruppacher & Klett](https://doi.org/10.1007/978-0-306-48100-0) """
 
+C_cunn = 0.7
+""" Cunningham correction factor as used in
+[Spichtinger & Gierens 2009](https://doi.org/10.5194/acp-9-685-2009) """
+
 ARM_C1 = 6.1094 * si.hectopascal
 """ [August](https://doi.org/10.1002/andp.18280890511) Roche Magnus formula coefficients
 (values from [Alduchov & Eskridge 1996](https://doi.org/10.1175%2F1520-0450%281996%29035%3C0601%3AIMFAOS%3E2.0.CO%3B2))
@@ -527,6 +529,28 @@ CRAIG_1961_SLOPE_COEFF = 8
 CRAIG_1961_INTERCEPT_COEFF = 10 * PER_MILLE
 """ 〃 """
 
+capacity_columnar_ice_B1 = 0.3
+""" eq. A11 & A12 in [Spichtinger et al. 2023](https://doi.org/10.5194/acp-23-2035-2023)  """
+capacity_columnar_ice_B2 = 0.43
+""" 〃 """
+capacity_columnar_ice_A1 = 0.015755 * si.m / si.kg**capacity_columnar_ice_B1
+""" 〃 """
+capacity_columnar_ice_A2 = 0.33565 * si.m / si.kg**capacity_columnar_ice_B2
+""" 〃 """
+
+columnar_ice_mass_transition = 2.146e-13 * si.kg
+""" tab. 1 in [Spichtinger & Gierens 2009](https://doi.org/10.5194/acp-9-685-2009) """
+columnar_ice_length_beta_1 = 3.0
+""" 〃 """
+columnar_ice_length_beta_2 = 2.2
+""" 〃 """
+columnar_ice_length_alpha_1 = 526.1 * si.kg / si.m**columnar_ice_length_beta_1
+""" 〃 """
+columnar_ice_length_alpha_2 = 0.04142 * si.kg / si.m**columnar_ice_length_beta_2
+""" 〃 """
+columnar_bulk_ice_density = 0.81e3 * si.kg / si.m**3
+""" 〃 """
+
 asymmetry_g = 0.85  # forward scattering from cloud droplets
 """ [Bohren 1987](https://doi.org/10.1119/1.15109) """
 

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/diffusion_ice_capacity/__init__.py

@@ -3,3 +3,4 @@ Formulae for capacity in diffusional growh/evaporation of ice
 """
 
 from .spherical import Spherical
+from .columnar import Columnar

pysdm-2.131/PySDM/physics/diffusion_ice_capacity/columnar.py

@@ -0,0 +1,29 @@
+"""
+capacity for columnar ice crystals approximated as prolate ellipsoids
+eq. A11 & A12 in Spichtinger et al. 2023 (https://doi.org/10.5194/acp-23-2035-2023)
+"""
+
+import numpy as np
+
+
+class Columnar:  # pylint: disable=too-few-public-methods
+
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def capacity(const, mass):
+        return (
+            const.capacity_columnar_ice_A1 * mass**const.capacity_columnar_ice_B1
+            + const.capacity_columnar_ice_A2 * mass**const.capacity_columnar_ice_B2
+        )
+
+    @staticmethod
+    def reference_capacity(
+        const, polar_diameter, eccentricity
+    ):  # pylint: disable=unused-argument
+        return (
+            polar_diameter
+            * eccentricity
+            / np.log((1 + eccentricity) / (1 - eccentricity))
+        )

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/diffusion_ice_capacity/spherical.py

@@ -2,6 +2,8 @@
 capacity for approximation of ice crystals as spheres
 """
 
+import numpy as np
+
 
 class Spherical:  # pylint: disable=too-few-public-methods
 
@@ -9,5 +11,5 @@ class Spherical:  # pylint: disable=too-few-public-methods
         pass
 
     @staticmethod
-    def capacity(const, diameter):
-        return diameter / const.TWO
+    def capacity(const, mass):
+        return np.power(mass / const.PI_4_3 / const.rho_i, const.ONE_THIRD)

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/diffusion_ice_kinetics/standard.py

@@ -23,7 +23,7 @@ class Standard:
     @staticmethod
     def D(const, D, r, lmbd, T):
         return D / (
-            r / (r + lmbd)
+            r / (r + lmbd * const.C_cunn)
             + 4.0 * D / const.MAC_ice / np.sqrt(8.0 * const.Rv * T / const.PI) / r
         )
 
@@ -31,8 +31,7 @@ class Standard:
     def K(const, K, r, lmbd, T, rho):  # pylint: disable=too-many-arguments
         return K / (
             r / (r + lmbd)
-            + 4.0
-            * K
+            + K
             / const.HAC_ice
             / np.sqrt(8.0 * const.Rd * T / const.PI)
             / const.c_pd

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/drop_growth/howell_1949.py

@@ -14,7 +14,17 @@ class Howell1949(Fick):  # pylint: disable=too-few-public-methods
 
     @staticmethod
     def Fk(const, T, K, lv):
-        """thermodynamic term associated with heat conduction"""
+        """Thermodynamic term associated with heat conduction.
+
+        Parameters
+        ----------
+        T
+            Temperature.
+        K
+            Thermal diffusivity with heat ventilation factor.
+        lv
+            Latent heat of evaporation or sublimation.
+        """
         return const.rho_w * lv / T / K * (lv / T / const.Rv)
 
     @staticmethod

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/homogeneous_ice_nucleation_rate/constant.py

@@ -5,7 +5,7 @@ constant rate formulation (for tests)
 import numpy as np
 
 
-class Constant:  # pylint: disable=too-few-public-methods
+class Constant:
     def __init__(self, const):
         assert np.isfinite(const.J_HOM)
 

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/homogeneous_ice_nucleation_rate/koop.py

@@ -7,7 +7,7 @@ valid for 0.26 < da_w_ice < 0.34
 import numpy as np
 
 
-class Koop2000:  # pylint: disable=too-few-public-methods
+class Koop2000:
     def __init__(self, const):
         pass
 

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/homogeneous_ice_nucleation_rate/koop_corr.py

@@ -8,7 +8,7 @@ such that it coincides with homogeneous nucleation rate parameterization for pur
 import numpy as np
 
 
-class Koop_Correction:  # pylint: disable=too-few-public-methods
+class Koop_Correction:
     def __init__(self, const):
         pass
 

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/homogeneous_ice_nucleation_rate/koop_murray.py

@@ -7,7 +7,7 @@ at water saturation
 import numpy as np
 
 
-class KoopMurray2016:  # pylint: disable=too-few-public-methods
+class KoopMurray2016:
     def __init__(self, const):
         pass
 

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/homogeneous_ice_nucleation_rate/null.py

@@ -6,7 +6,7 @@ do-nothing null formulation (needed as other formulations require parameters
 import numpy as np
 
 
-class Null:  # pylint: disable=too-few-public-methods,unused-argument
+class Null:  # pylint: disable=unused-argument
     def __init__(self, _):
         pass
 

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/isotope_diffusivity_ratios/grahams_law.py

@@ -12,3 +12,9 @@ class GrahamsLaw:  # pylint: disable=too-few-public-methods
         return (
             (2 * const.M_1H + const.M_16O) / (const.M_2H + const.M_1H + const.M_16O)
         ) ** const.ONE_HALF
+
+    @staticmethod
+    def ratio_3H_heavy_to_light(const, temperature):  # pylint: disable=unused-argument
+        return (
+            (2 * const.M_1H + const.M_16O) / (const.M_3H + const.M_1H + const.M_16O)
+        ) ** const.ONE_HALF

pysdm-2.131/PySDM/physics/isotope_kinetic_fractionation_factors/jouzel_and_merlivat_1984.py

@@ -0,0 +1,32 @@
+"""
+kinetic fractionation factor [Jouzel & Merlivat 1984](https://doi.org/10.1029/JD089iD07p11749),
+as eq. 3e for n=1 in [Stewart 1975](https://doi.org/10.1029/JC080i009p01133)
+and eq. 1 in [Bolot 2013](https://doi.org/10.5194/acp-13-7903-2013),
+where alpha_kinetic is multiplied by alpha equilibrium (eq. 1 defines effective alpha).
+"""
+
+
+class JouzelAndMerlivat1984:  # pylint: disable=too-few-public-methods
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def alpha_kinetic(alpha_equilibrium, saturation, D_ratio_heavy_to_light):
+        """eq. (11)
+
+        Parameters
+        ----------
+        alpha_equilibrium
+            Equilibrium fractionation factor.
+        saturation
+            Over liquid water or ice.
+        D_ratio_heavy_to_light
+            Diffusivity ratio for heavy to light isotope.
+
+        Returns
+        ----------
+        alpha_kinetic
+            Kinetic fractionation factor for liquid water or ice."""
+        return saturation / (
+            alpha_equilibrium / D_ratio_heavy_to_light * (saturation - 1) + 1
+        )

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/isotope_relaxation_timescale/__init__.py

@@ -5,3 +5,5 @@ isotope relaxation timescale formulae
 from PySDM.impl.null_physics_class import Null
 from .miyake_et_al_1968 import MiyakeEtAl1968
 from .bolin_1958 import Bolin1958
+from .zaba_et_al import ZabaEtAl
+from .jouzel_et_al_1975 import JouzelEtAl1975

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/isotope_relaxation_timescale/bolin_1958.py

@@ -11,7 +11,5 @@ class Bolin1958:  # pylint: disable=too-few-public-methods
         assert np.isfinite(const.BOLIN_ISOTOPE_TIMESCALE_COEFF_C1)
 
     @staticmethod
-    # pylint: disable=too-many-arguments
-    def tau(const, radius, r_dr_dt):
-        """timescale for evaporation of a falling drop with tritium"""
-        return (-3 / radius**2 * r_dr_dt * const.BOLIN_ISOTOPE_TIMESCALE_COEFF_C1) ** -1
+    def tau(const, dm_dt_over_m):
+        return 1 / (const.BOLIN_ISOTOPE_TIMESCALE_COEFF_C1 * dm_dt_over_m)

pysdm-2.131/PySDM/physics/isotope_relaxation_timescale/jouzel_et_al_1975.py

@@ -0,0 +1,26 @@
+"""eq. 7 in [Jouzel et al. 1975](https://doi.org/10.1029/JC080i036p05015)
+with assumptions that the supersaturation is absent (S=1)
+and at constant vapour phase (R_liq = alpha * R_vap).
+D_iso (diffusivity coefficient for heavy isotopes) is replaced by D in calculations of timescale
+as stated to be very similar
+ventilation coefficient from [Kinzer & Gunn 1951 (J. Meteor.)](https://doi.org/10.1175/1520-0469(1951)008%3C0071:TETATR%3E2.0.CO;2)
+with empirical calculations of F-coefficient
+"""  # pylint: disable=line-too-long
+
+
+class JouzelEtAl1975:  # pylint: disable=too-few-public-methods
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def tau(
+        const, rho_s, radius, D_iso, D, S, R_liq, alpha, R_vap, Fk
+    ):  # pylint: disable=too-many-arguments, unused-argument
+        """relative growth of heavy isotope as a function of mass
+
+        Parameters
+        ----------
+        D_iso
+            diffusivity of the heavy isotope multiplied by ventilation coefficient
+        """
+        return (radius**2 * const.rho_w * alpha) / (3 * rho_s * D_iso)

pysdm-2.131/PySDM/physics/isotope_relaxation_timescale/miyake_et_al_1968.py

@@ -0,0 +1,24 @@
+"""eq. 28 in [Miyake et al. 1968](https://doi.org/10.2467/mripapers1950.19.2_243)
+theta is as discussed in [Kinzer & Gunn 1951 (J. Meteor.)](https://doi.org/10.1175/1520-0469(1951)008%3C0071:TETATR%3E2.0.CO;2)
+"""  # pylint: disable=line-too-long
+
+
+class MiyakeEtAl1968:  # pylint:disable=too-few-public-methods
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def tau(
+        const, rho_s, radius, D_iso, D, S, R_liq, alpha, R_vap, Fk
+    ):  # pylint: disable=too-many-arguments, unused-argument
+        """
+        relative growth of heavy isotope as a function of mass from eq. (28)
+
+        Parameters
+        ----------
+        rho_s
+            is equal to (e_s * M / R_str / T) in eq. (28)
+        D
+            diffusivity * theta, where theta from eq. (25) is ventilation_coefficient
+        """
+        return (radius**2 * alpha * const.rho_w) / (3 * rho_s * D)

pysdm-2.131/PySDM/physics/isotope_relaxation_timescale/zaba_et_al.py

@@ -0,0 +1,21 @@
+"""isotope e-folding timescale based on Fick's first law and Fourier's law"""
+
+
+class ZabaEtAl:  # pylint: disable=too-few-public-methods
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def tau(
+        const, rho_s, radius, D_iso, D, S, R_liq, alpha, R_vap, Fk
+    ):  # pylint: disable=too-many-arguments, unused-argument
+        """relative growth of heavy isotope as a function of mass"""
+        return 1 / (
+            3
+            * rho_s
+            / radius**2
+            / const.rho_w
+            / alpha
+            * D_iso
+            * (S * (alpha * R_vap / R_liq - 1) + (S - 1) / (1 + D * Fk))
+        )

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/particle_shape_and_density/__init__.py

@@ -5,3 +5,4 @@ particle shape and density relationships
 from .liquid_spheres import LiquidSpheres
 from .mixed_phase_spheres import MixedPhaseSpheres
 from .porous_spheroids import PorousSpheroid
+from .columnar_ice import ColumnarIce

pysdm-2.131/PySDM/physics/particle_shape_and_density/columnar_ice.py

@@ -0,0 +1,46 @@
+"""
+for columnar ice crystals as in
+[Spichtinger & Gierens 2009](https://doi.org/10.5194/acp-9-685-2009)
+"""
+
+import numpy as np
+from .porous_spheroids import PorousSpheroid
+
+
+class ColumnarIce(PorousSpheroid):
+
+    @staticmethod
+    def polar_radius_empirical_parametrisation(const, mass):
+        """Sec. 3.1.2 in [Spichtinger & Gierens 2009].
+        Note that the notation in the paper is incorrect.
+        """
+        return np.where(
+            mass < const.columnar_ice_mass_transition,
+            (mass / const.columnar_ice_length_alpha_1)
+            ** (1 / const.columnar_ice_length_beta_1)
+            / 2,
+            (mass / const.columnar_ice_length_alpha_2)
+            ** (1 / const.columnar_ice_length_beta_2)
+            / 2,
+        )
+
+    @staticmethod
+    def aspect_ratio_empirical_parametrisation(const, mass):
+        """Eq. 17 in [Spichtinger & Gierens 2009]"""
+        return np.where(
+            mass < const.columnar_ice_mass_transition,
+            1,
+            np.sqrt(
+                np.sqrt(27)
+                * const.columnar_bulk_ice_density
+                / 8.0
+                / const.columnar_ice_length_alpha_2
+                ** (3 / const.columnar_ice_length_beta_2)
+            )
+            * mass
+            ** (
+                (3 - const.columnar_ice_length_beta_2)
+                / 2
+                / const.columnar_ice_length_beta_2
+            ),
+        )

{pysdm-2.130 → pysdm-2.131}/PySDM/physics/particle_shape_and_density/liquid_spheres.py

@@ -39,3 +39,11 @@ class LiquidSpheres:
               = 4 pi rho_w cbrt(mass/rho_w/pi/(4/3)) r_dr_dt
         """
         return 4 * const.PI * const.rho_w * r * r_dr_dt
+
+    @staticmethod
+    def dm_dt_over_m(r, r_dr_dt):
+        return 3 / r**2 * r_dr_dt
+
+    @staticmethod
+    def r_dr_dt(r, dm_dt_over_m):
+        return r**2 / 3 * dm_dt_over_m

pysdm-2.131/PySDM/physics/particle_shape_and_density/porous_spheroids.py

@@ -0,0 +1,33 @@
+"""
+for porous spheriods  as in
+[Shima et al. 2020](https://doi.org/10.5194/gmd-13-4107-2020)
+and prolate spheriods as in
+[Spichtinger & Gierens 2009](https://doi.org/10.5194/acp-9-685-2009)
+"""
+
+import numpy as np
+
+
+class PorousSpheroid:  # pylint: disable=too-few-public-methods
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def supports_mixed_phase(_=None):
+        return True
+
+    @staticmethod
+    def aspect_ratio(polar_radius, equatorial_radius):
+        return polar_radius / equatorial_radius
+
+    @staticmethod
+    def equatorial_radius(polar_radius, aspect_ratio):
+        return polar_radius / aspect_ratio
+
+    @staticmethod
+    def polar_radius(equatorial_radius, aspect_ratio):
+        return equatorial_radius * aspect_ratio
+
+    @staticmethod
+    def eccentricity(aspect_ratio):
+        return np.sqrt(1 - aspect_ratio**-2.0)