PySDM 2.122__tar.gz → 2.124__tar.gz

{pysdm-2.122 → pysdm-2.124}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm
-Version: 2.122
+Version: 2.124
 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

{pysdm-2.122 → pysdm-2.124}/PySDM/backends/impl_numba/methods/condensation_methods.py

@@ -188,7 +188,7 @@ class CondensationMethods(BackendMethods):
         n_substeps_min = math.ceil(timestep / dt_range[1])
 
         @numba.njit(**jit_flags)
-        def adapt_substeps(args, n_substeps, thd, rtol_thd):
+        def adapt_substeps(step_impl_args, n_substeps, thd, rtol_thd):
             n_substeps = np.maximum(n_substeps_min, n_substeps // multiplier)
             success = False
             for burnout in range(fuse + 1):
@@ -202,7 +202,7 @@ class CondensationMethods(BackendMethods):
                         ),
                         return_value=(0, False),
                     )
-                thd_new_long, success = step_fake(args, timestep, n_substeps)
+                thd_new_long, success = step_fake(step_impl_args, timestep, n_substeps)
                 if success:
                     break
                 n_substeps *= multiplier
@@ -210,7 +210,7 @@ class CondensationMethods(BackendMethods):
                 if burnout == fuse:
                     return warn("burnout (short)", __file__, return_value=(0, False))
                 thd_new_short, success = step_fake(
-                    args, timestep, n_substeps * multiplier
+                    step_impl_args, timestep, n_substeps * multiplier
                 )
                 if not success:
                     return warn("short failed", __file__, return_value=(0, False))
@@ -230,9 +230,9 @@ class CondensationMethods(BackendMethods):
     @staticmethod
     def make_step_fake(jit_flags, step_impl):
         @numba.njit(**jit_flags)
-        def step_fake(args, dt, n_substeps):
+        def step_fake(step_impl_args, dt, n_substeps):
             dt /= n_substeps
-            _, thd_new, _, _, _, _, success = step_impl(*args, dt, 1, True)
+            _, thd_new, _, _, _, _, success = step_impl(*step_impl_args, dt, 1, True)
             return thd_new, success
 
         return step_fake
@@ -240,8 +240,8 @@ class CondensationMethods(BackendMethods):
     @staticmethod
     def make_step(jit_flags, step_impl):
         @numba.njit(**jit_flags)
-        def step(args, dt, n_substeps):
-            return step_impl(*args, dt, n_substeps, False)
+        def step(step_impl_args, dt, n_substeps):
+            return step_impl(*step_impl_args, dt, n_substeps, False)
 
         return step
 
@@ -293,6 +293,7 @@ class CondensationMethods(BackendMethods):
                 lv = formulae.latent_heat_vapourisation__lv(T)
                 pvs = formulae.saturation_vapour_pressure__pvs_water(T)
                 DTp = formulae.diffusion_thermics__D(T, p)
+                KTp = formulae.diffusion_thermics__K(T, p)
                 RH = pv / pvs
                 Sc = formulae.trivia__air_schmidt_number(
                     dynamic_viscosity=air_dynamic_viscosity,
@@ -317,7 +318,7 @@ class CondensationMethods(BackendMethods):
                     lv,
                     pvs,
                     DTp,
-                    formulae.diffusion_thermics__K(T, p),
+                    KTp,
                     rtol_x,
                 )
                 dml_dt = (ml_new - ml_old) / timestep
@@ -376,21 +377,12 @@ class CondensationMethods(BackendMethods):
     ):
         @numba.njit(**jit_flags)
         def minfun(  # pylint: disable=too-many-arguments,too-many-locals
-            x_new,
-            x_old,
-            timestep,
-            kappa,
-            f_org,
-            rd3,
-            temperature,
-            RH,
-            lv,
-            pvs,
-            D,
-            K,
-            mass_ventilation_factor,
-            heat_ventilation_factor,
+            x_new, x_old, timestep, kappa, f_org, rd3, temperature, RH, Fk, Fd
         ):
+            """
+            root finding problem for the implicit-in-x Euler step
+            neglecting dependence of `Fk` and `Fd` on particle size
+            """
             if x_new > formulae.diffusion_coordinate__x_max():
                 return x_old - x_new
             mass_new = formulae.diffusion_coordinate__mass(x_new)
@@ -405,15 +397,7 @@ class CondensationMethods(BackendMethods):
                     temperature, volume_new, formulae.constants.PI_4_3 * rd3, f_org
                 ),
             )
-            r_dr_dt = formulae.drop_growth__r_dr_dt(
-                RH_eq,
-                temperature,
-                RH,
-                lv,
-                pvs,
-                D * mass_ventilation_factor,
-                K * heat_ventilation_factor,
-            )
+            r_dr_dt = formulae.drop_growth__r_dr_dt(RH_eq=RH_eq, RH=RH, Fk=Fk, Fd=Fd)
             dm_dt = formulae.particle_shape_and_density__dm_dt(r=r_new, r_dr_dt=r_dr_dt)
             return (
                 x_old
@@ -476,7 +460,13 @@ class CondensationMethods(BackendMethods):
                         )
                     )
                     heat_ventilation_factor = mass_ventilation_factor  # TODO #1588
-                    args = (
+                    Fk = formulae.drop_growth__Fk(
+                        T=T, K=Kr * heat_ventilation_factor, lv=lv
+                    )
+                    Fd = formulae.drop_growth__Fd(
+                        T=T, D=Dr * mass_ventilation_factor, pvs=pvs
+                    )
+                    minfun_args = (
                         x_old,
                         timestep,
                         attributes.kappa[drop],
@@ -484,21 +474,11 @@ class CondensationMethods(BackendMethods):
                         rd3,
                         T,
                         RH,
-                        lv,
-                        pvs,
-                        Dr,
-                        Kr,
-                        mass_ventilation_factor,
-                        heat_ventilation_factor,
+                        Fk,
+                        Fd,
                     )
                     r_dr_dt_old = formulae.drop_growth__r_dr_dt(
-                        RH_eq,
-                        T,
-                        RH,
-                        lv,
-                        pvs,
-                        mass_ventilation_factor * Dr,
-                        heat_ventilation_factor * Kr,
+                        RH_eq=RH_eq, RH=RH, Fk=Fk, Fd=Fd
                     )
                     mass_old = formulae.diffusion_coordinate__mass(x_old)
                     dm_dt_old = formulae.particle_shape_and_density__dm_dt(
@@ -514,8 +494,8 @@ class CondensationMethods(BackendMethods):
                 else:
                     a = x_old
                     b = max(x_insane, a + dx_old)
-                    fa = minfun(a, *args)
-                    fb = minfun(b, *args)
+                    fa = minfun(a, *minfun_args)
+                    fb = minfun(b, *minfun_args)
 
                     counter = 0
                     while not fa * fb < 0:
@@ -545,7 +525,7 @@ class CondensationMethods(BackendMethods):
                             success = False
                             break
                         b = max(x_insane, a + math.ldexp(dx_old, counter))
-                        fb = minfun(b, *args)
+                        fb = minfun(b, *minfun_args)
 
                     if not success:
                         break
@@ -556,7 +536,7 @@ class CondensationMethods(BackendMethods):
 
                         x_new, iters_taken = toms748_solve(
                             minfun,
-                            args,
+                            minfun_args,
                             a,
                             b,
                             fa,
@@ -673,7 +653,7 @@ class CondensationMethods(BackendMethods):
             timestep,
             n_substeps,
         ):
-            args = (
+            step_impl_args = (
                 attributes,
                 cell_idx,
                 thd,
@@ -689,7 +669,9 @@ class CondensationMethods(BackendMethods):
             )
             success = True
             if adaptive:
-                n_substeps, success = adapt_substeps(args, n_substeps, thd, rtols.thd)
+                n_substeps, success = adapt_substeps(
+                    step_impl_args, n_substeps, thd, rtols.thd
+                )
             if success:
                 (
                     water_vapour_mixing_ratio,
@@ -699,7 +681,7 @@ class CondensationMethods(BackendMethods):
                     n_ripening,
                     RH_max,
                     success,
-                ) = step(args, timestep, n_substeps)
+                ) = step(step_impl_args, timestep, n_substeps)
             else:
                 n_activating, n_deactivating, n_ripening, RH_max = -1, -1, -1, -1
             return (

{pysdm-2.122 → pysdm-2.124}/PySDM/backends/impl_numba/methods/deposition_methods.py

@@ -83,19 +83,24 @@ class DepositionMethods(BackendMethods):  # pylint:disable=too-few-public-method
                     saturation_ratio_ice = (
                         current_relative_humidity[cid] / current_water_activity[cid]
                     )
-
                     if saturation_ratio_ice == 1:
                         continue
-
+                    Fk = formulae.drop_growth__Fk(
+                        T=temperature,
+                        K=thermal_conductivity * heat_ventilation_factor,
+                        lv=latent_heat_sub,
+                    )
+                    Fd = formulae.drop_growth__Fd(
+                        T=temperature,
+                        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,
-                            T=temperature,
                             RH=saturation_ratio_ice,
-                            lv=latent_heat_sub,
-                            pvs=pvs_ice,
-                            D=mass_ventilation_factor * diffusion_coefficient,
-                            K=heat_ventilation_factor * thermal_conductivity,
+                            Fk=Fk,
+                            Fd=Fd,
                         )
                         * formulae.constants.rho_w
                     )

{pysdm-2.122 → pysdm-2.124}/PySDM/backends/impl_numba/test_helpers/scipy_ode_condensation_solver.py

@@ -140,16 +140,23 @@ def _make_solve(formulae):  # pylint: disable=too-many-statements,too-many-local
             )
             heat_ventilation_factor = mass_ventilation_factor  # TODO #1588
             sgm = jit_formulae.surface_tension__sigma(T, v, dry_volume[i], f_org[i])
+            Fk = jit_formulae.drop_growth__Fk(
+                T=T,
+                lv=lv,
+                K=heat_ventilation_factor * Kr,
+            )
+            Fd = jit_formulae.drop_growth__Fd(
+                T=T,
+                pvs=pvs,
+                D=mass_ventilation_factor * Dr,
+            )
             r_dr_dt = jit_formulae.drop_growth__r_dr_dt(
-                jit_formulae.hygroscopicity__RH_eq(
+                RH_eq=jit_formulae.hygroscopicity__RH_eq(
                     r, T, kappa[i], dry_volume[i] / PI_4_3, sgm
                 ),
-                T,
-                RH,
-                lv,
-                pvs,
-                mass_ventilation_factor * Dr,
-                heat_ventilation_factor * Kr,
+                RH=RH,
+                Fk=Fk,
+                Fd=Fd,
             )
             dm_dt = jit_formulae.particle_shape_and_density__dm_dt(r, r_dr_dt)
             dy_dt[idx_x + i] = jit_formulae.diffusion_coordinate__dx_dt(m, dm_dt)

{pysdm-2.122 → pysdm-2.124}/PySDM/backends/impl_thrust_rtc/methods/condensation_methods.py

@@ -13,24 +13,11 @@ from PySDM.backends.impl_thrust_rtc.nice_thrust import nice_thrust
 from ..conf import trtc
 from ..methods.thrust_rtc_backend_methods import ThrustRTCBackendMethods
 
-ARGS_VARS = (
-    "x_old",
-    "dt",
-    "kappa",
-    "f_org",
-    "rd3",
-    "_T",
-    "_RH",
-    "_lv",
-    "_pvs",
-    "Dr",
-    "Kr",
-    "mass_ventilation_factor",
-)
-
-
-def args(arg):
-    return f"args[{ARGS_VARS.index(arg)}]"
+MINFUN_ARGS_VARS = ("x_old", "dt", "kappa", "f_org", "rd3", "_T", "_RH", "Fk", "Fd")
+
+
+def arg(name):
+    return f"minfun_args[{MINFUN_ARGS_VARS.index(name)}]"
 
 
 class CondensationMethods(
@@ -44,6 +31,7 @@ class CondensationMethods(
         "pvs",
         "RH",
         "DTp",
+        "KTp",
         "lambdaK",
         "lambdaD",
         "schmidt_number",
@@ -98,40 +86,37 @@ class CondensationMethods(
             name_iter="i",
             body=f"""
             struct Minfun {{
-                static __device__ real_type value(real_type x_new, void* args_p) {{
-                    auto args = static_cast<real_type*>(args_p);
+                static __device__ real_type value(real_type x_new, void* minfun_args_p) {{
+                    auto minfun_args = static_cast<real_type*>(minfun_args_p);
                     if (x_new > {phys.diffusion_coordinate.x_max.c_inline()}) {{
-                        return {args("x_old")} - x_new;
+                        return {arg("x_old")} - x_new;
                     }}
                     auto m_new = {phys.diffusion_coordinate.mass.c_inline(x="x_new")};
                     auto v_new = {phys.particle_shape_and_density.mass_to_volume.c_inline(mass="m_new")};
                     auto r_new = {phys.trivia.radius.c_inline(volume="v_new")};
                     auto sgm = {phys.surface_tension.sigma.c_inline(
-                        T=args('_T'),
+                        T=arg('_T'),
                         v_wet="v_new",
-                        v_dry=f"const.PI_4_3 * {args('rd3')}",
-                        f_org=args("f_org")
+                        v_dry=f"const.PI_4_3 * {arg('rd3')}",
+                        f_org=arg("f_org")
                     )};
                     auto RH_eq = {phys.hygroscopicity.RH_eq.c_inline(
                         r="r_new",
-                        T=args('_T'),
-                        kp=args("kappa"),
-                        rd3=args("rd3"),
+                        T=arg('_T'),
+                        kp=arg("kappa"),
+                        rd3=arg("rd3"),
                         sgm="sgm"
                     )};
                     auto r_dr_dt = {phys.drop_growth.r_dr_dt.c_inline(
                         RH_eq="RH_eq",
-                        T=args("_T"),
-                        RH=args("_RH"),
-                        lv=args("_lv"),
-                        pvs=args("_pvs"),
-                        D=f'{args("mass_ventilation_factor")}*{args("Dr")}',
-                        K=f'{args("mass_ventilation_factor")}*{args("Kr")}',
-                    )}; // TODO #1588
+                        RH=arg("_RH"),
+                        Fk=arg("Fk"),
+                        Fd=arg("Fd"),
+                    )};
                     auto dm_dt = {phys.particle_shape_and_density.dm_dt.c_inline(
                         r="r_new", r_dr_dt="r_dr_dt"
                     )};
-                    return {args("x_old")} - x_new + {args("dt")} * {
+                    return {arg("x_old")} - x_new + {arg("dt")} * {
                         phys.diffusion_coordinate.dx_dt.c_inline(m="m_new", dm_dt="dm_dt")
                     };
                 }}
@@ -144,6 +129,7 @@ class CondensationMethods(
             auto _pvs = pvs[cell_id[i]];
             auto _RH = RH[cell_id[i]];
             auto _DTp = DTp[cell_id[i]];
+            auto _KTp = KTp[cell_id[i]];
             auto _lambdaK = lambdaK[cell_id[i]];
             auto _lambdaD = lambdaD[cell_id[i]];
             auto _schmidt_number = schmidt_number[cell_id[i]];
@@ -163,10 +149,8 @@ class CondensationMethods(
                 r="r_old", T="_T", kp="_kappa[i]", rd3="rd3", sgm="sgm"
             )};
 
-            real_type Dr=0;
-            real_type Kr=0;
-            real_type qrt_re_times_cbrt_sc=0;
-            real_type mass_ventilation_factor=0;
+            real_type Fk=0;
+            real_type Fd=0;
             real_type r_dr_dt_old=0;
             real_type dm_dt_old=0;
             real_type dx_old=0;
@@ -175,23 +159,31 @@ class CondensationMethods(
             if ( ! {phys.trivia.within_tolerance.c_inline(
                 return_type='bool', error_estimate="abs(_RH - RH_eq)", value="_RH", rtol="RH_rtol"
             )}) {{
-                Dr = {phys.diffusion_kinetics.D.c_inline(
-                    D="_DTp", r="r_old", lmbd="_lambdaD"
-                )};
-                Kr = {phys.diffusion_kinetics.K.c_inline(
-                    K="const.K0", r="r_old", lmbd="_lambdaK"
-                )};
-                qrt_re_times_cbrt_sc={phys.trivia.sqrt_re_times_cbrt_sc.c_inline(
+                auto Dr = {phys.diffusion_kinetics.D.c_inline(D="_DTp", r="r_old", lmbd="_lambdaD")};
+                auto Kr = {phys.diffusion_kinetics.K.c_inline(K="_KTp", r="r_old", lmbd="_lambdaK")};
+                auto qrt_re_times_cbrt_sc={phys.trivia.sqrt_re_times_cbrt_sc.c_inline(
                     Re="reynolds_number[i]",
                     Sc="_schmidt_number",
                 )};
-                mass_ventilation_factor = {phys.ventilation.ventilation_coefficient.c_inline(
+                auto mass_ventilation_factor = {phys.ventilation.ventilation_coefficient.c_inline(
                     sqrt_re_times_cbrt_sc="qrt_re_times_cbrt_sc"
                 )};
                 auto heat_ventilation_factor = mass_ventilation_factor; // TODO #1588
+                Fk = {phys.drop_growth.Fk.c_inline(
+                    T="_T",
+                    K="heat_ventilation_factor*Kr",
+                    lv="_lv",
+                )}; // TODO #1588
+                Fd = {phys.drop_growth.Fd.c_inline(
+                    T="_T",
+                    D="mass_ventilation_factor*Dr",
+                    pvs="_pvs",
+                )};
                 r_dr_dt_old = {phys.drop_growth.r_dr_dt.c_inline(
-                    RH_eq="RH_eq", T="_T", RH="_RH", lv="_lv", pvs="_pvs",
-                    D="mass_ventilation_factor*Dr", K="heat_ventilation_factor*Kr",
+                    RH_eq="RH_eq",
+                    RH="_RH",
+                    Fk="Fk",
+                    Fd="Fd",
                 )};
                 dm_dt_old = {phys.particle_shape_and_density.dm_dt.c_inline(r="r_old", r_dr_dt="r_dr_dt_old")};
                 dx_old = dt * {phys.diffusion_coordinate.dx_dt.c_inline(
@@ -203,7 +195,7 @@ class CondensationMethods(
             }}
             real_type kappa = _kappa[i];
             real_type f_org = _f_org[i];
-            real_type args[] = {{{','.join(ARGS_VARS)}}}; // array
+            real_type minfun_args[] = {{{','.join(MINFUN_ARGS_VARS)}}}; // array
 
             if (dx_old == 0) {{
                 x_new = x_old;
@@ -211,8 +203,8 @@ class CondensationMethods(
             else {{
                 auto a = x_old;
                 auto b = max(x_insane, a + dx_old);
-                auto fa = Minfun::value(a, &args);
-                auto fb = Minfun::value(b, &args);
+                auto fa = Minfun::value(a, &minfun_args);
+                auto fb = Minfun::value(b, &minfun_args);
 
                 auto counter = 0;
                 while ( ! fa * fb < 0) {{
@@ -223,7 +215,7 @@ class CondensationMethods(
                         return;
                     }}
                     b = max(x_insane, a + ldexp(dx_old, 1.*counter));
-                    fb = Minfun::value(b, &args);
+                    fb = Minfun::value(b, &minfun_args);
                 }}
 
                 //if not success:
@@ -238,7 +230,7 @@ class CondensationMethods(
                         fa = fb;
                         fb = ftmp;
                     }}
-                    x_new = Bisect::bisect(Minfun::value, &args, a, b, fa, fb, rtol_x);
+                    x_new = Bisect::bisect(Minfun::value, &minfun_args, a, b, fa, fb, rtol_x);
                     //if iters_taken in (-1, max_iters):
                     //    if not fake:
                     //        print("TOMS failed")
@@ -331,6 +323,9 @@ class CondensationMethods(
             RH_max[i] = max(RH_max[i], RH[i]);
             DTp[i] = {phys.diffusion_thermics.D.c_inline(
                 T='T[i]', p='p[i]')};
+            KTp[i] = {phys.diffusion_thermics.K.c_inline(
+                T='T[i]', p='p[i]'
+            )};
             lambdaK[i] = {phys.diffusion_kinetics.lambdaK.c_inline(
                 T='T[i]', p='p[i]')};
             lambdaD[i] = {phys.diffusion_kinetics.lambdaD.c_inline(

{pysdm-2.122 → pysdm-2.124}/PySDM/formulae.py

@@ -23,7 +23,7 @@ from PySDM.dynamics.terminal_velocity import GunnKinzer1949, PowerSeries, Rogers
 from PySDM.dynamics.terminal_velocity.gunn_and_kinzer import TpDependent
 
 
-class Formulae:  # pylint: disable=too-few-public-methods,too-many-instance-attributes
+class Formulae:  # pylint: disable=too-few-public-methods,too-many-instance-attributes,too-many-statements
     def __init__(  # pylint: disable=too-many-locals
         self,
         *,
@@ -55,6 +55,7 @@ class Formulae:  # pylint: disable=too-few-public-methods,too-many-instance-attr
         isotope_diffusivity_ratios: str = "Null",
         isotope_relaxation_timescale: str = "Null",
         isotope_temperature_inference: str = "Null",
+        isotope_ventilation_ratio: str = "Null",
         optical_albedo: str = "Null",
         optical_depth: str = "Null",
         particle_shape_and_density: str = "LiquidSpheres",
@@ -97,6 +98,7 @@ class Formulae:  # pylint: disable=too-few-public-methods,too-many-instance-attr
         self.isotope_diffusivity_ratios = isotope_diffusivity_ratios
         self.isotope_relaxation_timescale = isotope_relaxation_timescale
         self.isotope_temperature_inference = isotope_temperature_inference
+        self.isotope_ventilation_ratio = isotope_ventilation_ratio
         self.particle_shape_and_density = particle_shape_and_density
         self.air_dynamic_viscosity = air_dynamic_viscosity
         self.terminal_velocity = terminal_velocity

{pysdm-2.122 → pysdm-2.124}/PySDM/physics/__init__.py

@@ -37,6 +37,7 @@ from . import (
     isotope_diffusivity_ratios,
     isotope_relaxation_timescale,
     isotope_temperature_inference,
+    isotope_ventilation_ratio,
     latent_heat_vapourisation,
     latent_heat_sublimation,
     optical_albedo,

{pysdm-2.122 → pysdm-2.124}/PySDM/physics/constants_defaults.py

@@ -519,6 +519,8 @@ diffusion_thermics_K_G11_D = -3.9e-4 * si.W / si.m / si.K
 PRUPPACHER_RASMUSSEN_1979_XTHRES = 1.4 * si.dimensionless
 """
 [Pruppacher & Rasmussen 1979](https://doi.org/10.1175/1520-0469%281979%29036%3C1255:AWTIOT%3E2.0.CO;2)
+also in
+[Beard & Pruppacher 1971](https://doi.org/10.1175/1520-0469%281971%29028%3C1455:AWTIOT%3E2.0.CO;2)
 """  # pylint: disable=line-too-long
 PRUPPACHER_RASMUSSEN_1979_CONSTSMALL = 1.0 * si.dimensionless
 """ 〃 """

pysdm-2.124/PySDM/physics/drop_growth/fick.py

@@ -0,0 +1,34 @@
+"""
+Fickian diffusion only drop growth
+
+The notation for terms associated with heat conduction and diffusion are from
+[Rogers & Yau 1989](https://archive.org/details/shortcourseinclo0000roge_m3k2).
+"""
+
+
+class Fick:
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def Fk(const, T, K, lv):  # pylint: disable=unused-argument
+        """heat conduction not taken into account"""
+        return 0
+
+    @staticmethod
+    def Fd(const, T, D, pvs):
+        """the term associated with vapour diffusion"""
+        return const.rho_w * const.Rv * T / D / pvs
+
+    @staticmethod
+    def r_dr_dt(RH_eq, RH, Fk, Fd):  # pylint: disable=unused-argument
+        """Drop growth equation with radius r.
+
+        Parameters
+        ----------
+        Fk
+            Thermodynamic term associated with heat conduction from Rogers & Yau 1989.
+        Fd
+            Term associated with vapour diffusion.
+        """
+        return (RH - RH_eq) / Fd

pysdm-2.124/PySDM/physics/drop_growth/howell_1949.py

@@ -0,0 +1,31 @@
+"""
+single-equation approximation of the vapour and heat diffusion problem
+as proposed in [Howell 1949](https://doi.org/10.1175/1520-0469(1949)006%3C0134:TGOCDI%3E2.0.CO;2)
+same as in [Mason 1951](https://doi.org/10.1088/0370-1301/64/9/307)
+
+The notation for terms associated with heat conduction and diffusion are from eq. 7.17
+ in [Rogers & Yau 1971](https://archive.org/details/shortcourseinclo0000roge_m3k2).
+"""
+
+from .fick import Fick
+
+
+class Howell1949(Fick):  # pylint: disable=too-few-public-methods
+
+    @staticmethod
+    def Fk(const, T, K, lv):
+        """thermodynamic term associated with heat conduction"""
+        return const.rho_w * lv / T / K * (lv / T / const.Rv)
+
+    @staticmethod
+    def r_dr_dt(RH_eq, RH, Fk, Fd):
+        """Drop growth equation with radius r.
+
+        Parameters
+        ----------
+        Fk
+            Thermodynamic term associated with heat conduction from Rogers & Yau 1989.
+        Fd
+            Term associated with vapour diffusion.
+        """
+        return (RH - RH_eq) / (Fk + Fd)

pysdm-2.124/PySDM/physics/drop_growth/mason_1971.py

@@ -0,0 +1,19 @@
+"""
+single-equation approximation of the vapour and heat diffusion problem
+as given in eq. 3.11 in [Mason 1971](https://archive.org/details/physicsofclouds0000maso)
+(see also discussion of the ventilation effect on page 125).
+The difference between Howell'49 and Mason'71 is `-1` in the `Fk` definition.
+
+The notation for terms associated with heat conduction and diffusion are from
+[Rogers & Yau 1989](https://archive.org/details/shortcourseinclo0000roge_m3k2).
+"""
+
+from .howell_1949 import Howell1949
+
+
+class Mason1971(Howell1949):  # pylint: disable=too-few-public-methods
+
+    @staticmethod
+    def Fk(const, T, K, lv):
+        """thermodynamic term associated with heat conduction"""
+        return const.rho_w * lv / T / K * (lv / T / const.Rv - 1)

{pysdm-2.122 → pysdm-2.124}/PySDM/physics/isotope_diffusivity_ratios/grahams_law.py

@@ -8,7 +8,7 @@ class GrahamsLaw:  # pylint: disable=too-few-public-methods
         pass
 
     @staticmethod
-    def ratio_2H(const, temperature):  # pylint: disable=unused-argument
+    def ratio_2H_heavy_to_light(const, temperature):  # pylint: disable=unused-argument
         return (
             (2 * const.M_1H + const.M_16O) / (const.M_2H + const.M_1H + const.M_16O)
         ) ** const.ONE_HALF

{pysdm-2.122 → pysdm-2.124}/PySDM/physics/isotope_diffusivity_ratios/hellmann_and_harvey_2020.py

@@ -9,7 +9,7 @@ class HellmannAndHarvey2020:
         pass
 
     @staticmethod
-    def ratio_2H(const, temperature):
+    def ratio_2H_heavy_to_light(const, temperature):
         return (
             const.HELLMANN_HARVEY_EQ6_COEFF0
             + const.HELLMANN_HARVEY_EQ6_COEFF1
@@ -19,7 +19,7 @@ class HellmannAndHarvey2020:
         )
 
     @staticmethod
-    def ratio_17O(const, temperature):
+    def ratio_17O_heavy_to_light(const, temperature):
         return (
             const.HELLMANN_HARVEY_EQ7_COEFF0
             + const.HELLMANN_HARVEY_EQ7_COEFF1
@@ -29,7 +29,7 @@ class HellmannAndHarvey2020:
         )
 
     @staticmethod
-    def ratio_18O(const, temperature):
+    def ratio_18O_heavy_to_light(const, temperature):
         return (
             const.HELLMANN_HARVEY_EQ8_COEFF0
             + const.HELLMANN_HARVEY_EQ8_COEFF1

{pysdm-2.122 → pysdm-2.124}/PySDM/physics/isotope_diffusivity_ratios/stewart_1975.py

@@ -17,7 +17,7 @@ class Stewart1975:
         pass
 
     @staticmethod
-    def ratio_2H(const, temperature):  # pylint: disable=unused-argument
+    def ratio_2H_heavy_to_light(const, temperature):  # pylint: disable=unused-argument
         return (
             (
                 (2 * const.M_1H + const.M_16O)
@@ -30,7 +30,7 @@ class Stewart1975:
         ) ** const.ONE_HALF
 
     @staticmethod
-    def ratio_18O(const, temperature):  # pylint: disable=unused-argument
+    def ratio_18O_heavy_to_light(const, temperature):  # pylint: disable=unused-argument
         return (
             ((2 * const.M_1H + const.M_16O) * (const.Md + 2 * const.M_1H + const.M_18O))
             / (