PySDM 2.108__tar.gz → 2.109__tar.gz

{pysdm-2.108 → pysdm-2.109}/.github/workflows/tests.yml

@@ -271,8 +271,8 @@ jobs:
           python -m pytest --durations=10 -v -p no:unraisableexception -We tests/examples_tests/test_tests_completeness.py
 
        # TODO #1207
-      - if: startsWith(matrix.platform, 'windows-')
+      - if: startsWith(matrix.platform, 'macos-13')
         run: python -m pytest --durations=10 -v -p no:unraisableexception -We tests/examples_tests/test_run* -k "not Rozanski_and_Sonntag_1982" --suite ${{ matrix.test-suite }}
 
-      - if: ( ! startsWith(matrix.platform, 'windows-') )
+      - if: ( ! startsWith(matrix.platform, 'macos-13') )
         run: python -m pytest --durations=10 -v -p no:unraisableexception -We tests/examples_tests/test_run* --suite ${{ matrix.test-suite }}

{pysdm-2.108 → pysdm-2.109}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pysdm
-Version: 2.108
+Version: 2.109
 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.108 → pysdm-2.109}/PySDM/backends/impl_numba/methods/condensation_methods.py

@@ -390,14 +390,18 @@ class CondensationMethods(BackendMethods):
             K,
             ventilation_factor,
         ):
-            volume = formulae.condensation_coordinate__volume(x_new)
+            if x_new > formulae.condensation_coordinate__x_max():
+                return x_old - x_new
+            mass_new = formulae.condensation_coordinate__mass(x_new)
+            volume_new = formulae.particle_shape_and_density__mass_to_volume(mass_new)
+            r_new = formulae.trivia__radius(volume_new)
             RH_eq = formulae.hygroscopicity__RH_eq(
-                formulae.trivia__radius(volume),
+                r_new,
                 temperature,
                 kappa,
                 rd3,
                 formulae.surface_tension__sigma(
-                    temperature, volume, formulae.constants.PI_4_3 * rd3, f_org
+                    temperature, volume_new, formulae.constants.PI_4_3 * rd3, f_org
                 ),
             )
             r_dr_dt = formulae.drop_growth__r_dr_dt(
@@ -410,10 +414,11 @@ class CondensationMethods(BackendMethods):
                 K,
                 ventilation_factor,
             )
+            dm_dt = formulae.particle_shape_and_density__dm_dt(r=r_new, r_dr_dt=r_dr_dt)
             return (
                 x_old
                 - x_new
-                + timestep * formulae.condensation_coordinate__dx_dt(x_new, r_dr_dt)
+                + timestep * formulae.condensation_coordinate__dx_dt(mass_new, dm_dt)
             )
 
         @numba.njit(**jit_flags)
@@ -440,15 +445,17 @@ class CondensationMethods(BackendMethods):
             lambdaK = formulae.diffusion_kinetics__lambdaK(T, p)
             lambdaD = formulae.diffusion_kinetics__lambdaD(DTp, T)
             for drop in cell_idx:
+                if attributes.water_mass[drop] <= 0:
+                    continue
                 v_drop = formulae.particle_shape_and_density__mass_to_volume(
                     attributes.water_mass[drop]
                 )
-                if v_drop <= 0:
-                    continue
-                x_old = formulae.condensation_coordinate__x(v_drop)
+                x_old = formulae.condensation_coordinate__x(attributes.water_mass[drop])
                 r_old = formulae.trivia__radius(v_drop)
                 x_insane = formulae.condensation_coordinate__x(
-                    attributes.vdry[drop] / 100
+                    formulae.particle_shape_and_density__volume_to_mass(
+                        attributes.vdry[drop] / 100
+                    )
                 )
                 rd3 = attributes.vdry[drop] / formulae.constants.PI_4_3
                 sgm = formulae.surface_tension__sigma(
@@ -492,8 +499,12 @@ class CondensationMethods(BackendMethods):
                         Kr,
                         ventilation_factor,
                     )
+                    mass_old = formulae.condensation_coordinate__mass(x_old)
+                    dm_dt_old = formulae.particle_shape_and_density__dm_dt(
+                        r=r_old, r_dr_dt=r_dr_dt_old
+                    )
                     dx_old = timestep * formulae.condensation_coordinate__dx_dt(
-                        x_old, r_dr_dt_old
+                        mass_old, dm_dt_old
                     )
                 else:
                     dx_old = 0.0
@@ -561,9 +572,7 @@ class CondensationMethods(BackendMethods):
                     else:
                         x_new = x_old
 
-                mass_new = formulae.particle_shape_and_density__volume_to_mass(
-                    formulae.condensation_coordinate__volume(x_new)
-                )
+                mass_new = formulae.condensation_coordinate__mass(x_new)
                 mass_cr = formulae.particle_shape_and_density__volume_to_mass(
                     attributes.v_cr[drop]
                 )

{pysdm-2.108 → pysdm-2.109}/PySDM/backends/impl_numba/test_helpers/scipy_ode_condensation_solver.py

@@ -92,15 +92,7 @@ def _make_solve(formulae):  # pylint: disable=too-many-statements,too-many-local
 
     @numba.njit(**{**JIT_FLAGS, **{"parallel": False}})
     def _liquid_water_mixing_ratio(n, x, m_d_mean):
-        return (
-            np.sum(
-                n
-                * jit_formulae.particle_shape_and_density__volume_to_mass(
-                    jit_formulae.condensation_coordinate__volume(x)
-                )
-            )
-            / m_d_mean
-        )
+        return np.sum(n * jit_formulae.condensation_coordinate__mass(x)) / m_d_mean
 
     @numba.njit(**{**JIT_FLAGS, **{"parallel": False}})
     def _impl(  # pylint: disable=too-many-arguments,too-many-locals
@@ -133,8 +125,10 @@ def _make_solve(formulae):  # pylint: disable=too-many-statements,too-many-local
             diffusivity=DTp,
             density=air_density,
         )
+        sum_n_dm_dt = 0
         for i, x_i in enumerate(x):
-            v = jit_formulae.condensation_coordinate__volume(x_i)
+            m = jit_formulae.condensation_coordinate__mass(x_i)
+            v = jit_formulae.particle_shape_and_density__mass_to_volume(m)
             r = jit_formulae.trivia__radius(v)
             Dr = jit_formulae.diffusion_kinetics__D(DTp, r, lambdaD)
             Kr = jit_formulae.diffusion_kinetics__K(KTp, r, lambdaK)
@@ -145,34 +139,23 @@ def _make_solve(formulae):  # pylint: disable=too-many-statements,too-many-local
                 )
             )
             sgm = jit_formulae.surface_tension__sigma(T, v, dry_volume[i], f_org[i])
-            dy_dt[idx_x + i] = jit_formulae.condensation_coordinate__dx_dt(
-                x_i,
-                jit_formulae.drop_growth__r_dr_dt(
-                    jit_formulae.hygroscopicity__RH_eq(
-                        r, T, kappa[i], dry_volume[i] / PI_4_3, sgm
-                    ),
-                    T,
-                    RH,
-                    lv,
-                    pvs,
-                    Dr,
-                    Kr,
-                    ventilation_factor,
+            r_dr_dt = jit_formulae.drop_growth__r_dr_dt(
+                jit_formulae.hygroscopicity__RH_eq(
+                    r, T, kappa[i], dry_volume[i] / PI_4_3, sgm
                 ),
+                T,
+                RH,
+                lv,
+                pvs,
+                Dr,
+                Kr,
+                ventilation_factor,
             )
-        d_water_vapour_mixing_ratio__dt = (
-            dot_water_vapour_mixing_ratio
-            - np.sum(
-                n
-                * jit_formulae.particle_shape_and_density__volume_to_mass(
-                    jit_formulae.condensation_coordinate__volume(x)
-                )
-                * dy_dt[idx_x:]
-            )
-            / m_d_mean
-        )
+            dm_dt = jit_formulae.particle_shape_and_density__dm_dt(r, r_dr_dt)
+            dy_dt[idx_x + i] = jit_formulae.condensation_coordinate__dx_dt(m, dm_dt)
+            sum_n_dm_dt += n[i] * dm_dt
         dy_dt[idx_thd] = dot_thd + jit_formulae.state_variable_triplet__dthd_dt(
-            rhod, thd, T, d_water_vapour_mixing_ratio__dt, lv
+            rhod, thd, T, dot_water_vapour_mixing_ratio - sum_n_dm_dt / m_d_mean, lv
         )
 
     @numba.njit(**{**JIT_FLAGS, **{"parallel": False}})
@@ -252,9 +235,7 @@ def _make_solve(formulae):  # pylint: disable=too-many-statements,too-many-local
         y0 = np.empty(n_sd_in_cell + idx_x)
         y0[idx_thd] = thd
         y0[idx_x:] = jit_formulae.condensation_coordinate__x(
-            jit_formulae.particle_shape_and_density__mass_to_volume(
-                attributes.water_mass[cell_idx]
-            )
+            attributes.water_mass[cell_idx]
         )
         total_water_mixing_ratio = (
             water_vapour_mixing_ratio
@@ -301,9 +282,7 @@ def _make_solve(formulae):  # pylint: disable=too-many-statements,too-many-local
         m_new = 0
         for i in range(n_sd_in_cell):
             attributes.water_mass[cell_idx[i]] = (
-                jit_formulae.particle_shape_and_density__volume_to_mass(
-                    jit_formulae.condensation_coordinate__volume(y1[idx_x + i])
-                )
+                jit_formulae.condensation_coordinate__mass(y1[idx_x + i])
             )
             m_new += (
                 attributes.multiplicity[cell_idx[i]]

{pysdm-2.108 → pysdm-2.109}/PySDM/backends/impl_thrust_rtc/methods/condensation_methods.py

@@ -100,11 +100,15 @@ class CondensationMethods(
             struct Minfun {{
                 static __device__ real_type value(real_type x_new, void* args_p) {{
                     auto args = static_cast<real_type*>(args_p);
-                    auto vol = {phys.condensation_coordinate.volume.c_inline(x="x_new")};
-                    auto r_new = {phys.trivia.radius.c_inline(volume="vol")};
+                    if (x_new > {phys.condensation_coordinate.x_max.c_inline()}) {{
+                        return {args("x_old")} - x_new;
+                    }}
+                    auto m_new = {phys.condensation_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'),
-                        v_wet="vol",
+                        v_wet="v_new",
                         v_dry=f"const.PI_4_3 * {args('rd3')}",
                         f_org=args("f_org")
                     )};
@@ -125,8 +129,11 @@ class CondensationMethods(
                         K=args("Kr"),
                         ventilation_factor=args("ventilation_factor"),
                     )};
+                    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")} * {
-                        phys.condensation_coordinate.dx_dt.c_inline(x="x_new", r_dr_dt="r_dr_dt")
+                        phys.condensation_coordinate.dx_dt.c_inline(m="m_new", dm_dt="dm_dt")
                     };
                 }}
             }};
@@ -145,9 +152,10 @@ class CondensationMethods(
             auto v_old = {phys.particle_shape_and_density.mass_to_volume.c_inline(
                 mass="water_mass[i]"
             )};
-            auto x_old = {phys.condensation_coordinate.x.c_inline(volume="v_old")};
+            auto x_old = {phys.condensation_coordinate.x.c_inline(mass="water_mass[i]")};
             auto r_old = {phys.trivia.radius.c_inline(volume="v_old")};
-            auto x_insane = {phys.condensation_coordinate.x.c_inline(volume="vdry[i]/100")};
+            auto m_insane = {phys.particle_shape_and_density.volume_to_mass.c_inline(volume="vdry[i] / 100")};
+            auto x_insane = {phys.condensation_coordinate.x.c_inline(mass="m_insane")};
             auto rd3 = vdry[i] / {const.PI_4_3};
             auto sgm = {phys.surface_tension.sigma.c_inline(
                 T="_T", v_wet="v", v_dry="vdry[i]", f_org="_f_org[i]"
@@ -161,6 +169,7 @@ class CondensationMethods(
             real_type qrt_re_times_cbrt_sc=0;
             real_type ventilation_factor=0;
             real_type r_dr_dt_old=0;
+            real_type dm_dt_old=0;
             real_type dx_old=0;
 
             real_type x_new = 0;
@@ -184,8 +193,9 @@ class CondensationMethods(
                     RH_eq="RH_eq", T="_T", RH="_RH", lv="_lv", pvs="_pvs", D="Dr", K="Kr",
                     ventilation_factor="ventilation_factor",
                 )};
+                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.condensation_coordinate.dx_dt.c_inline(
-                    x="x_old", r_dr_dt="r_dr_dt_old"
+                    m="water_mass[i]", dm_dt="dm_dt_old"
                 )};
             }}
             else {{
@@ -239,10 +249,7 @@ class CondensationMethods(
                     x_new = x_old;
                 }}
             }}
-            auto v_new = {phys.condensation_coordinate.volume.c_inline(x="x_new")};
-            water_mass[i] = {phys.particle_shape_and_density.volume_to_mass.c_inline(
-                volume="v_new"
-            )};
+            water_mass[i] = {phys.condensation_coordinate.mass.c_inline(x="x_new")};
         """.replace(
                 "real_type", self._get_c_type()
             ),

{pysdm-2.108 → pysdm-2.109}/PySDM/formulae.py

@@ -30,7 +30,7 @@ class Formulae:  # pylint: disable=too-few-public-methods,too-many-instance-attr
         constants: Optional[dict] = None,
         seed: int = None,
         fastmath: bool = True,
-        condensation_coordinate: str = "VolumeLogarithm",
+        condensation_coordinate: str = "WaterMassLogarithm",
         saturation_vapour_pressure: str = "FlatauWalkoCotton",
         latent_heat: str = "Kirchhoff",
         hygroscopicity: str = "KappaKoehlerLeadingTerms",
@@ -203,9 +203,11 @@ def _formula(func, constants, dimensional_analysis, **kw):
     source = re.sub(r"\n\s+\):", "):", source)
     loc = {}
     for arg_name in special_params:
-        source = source.replace(
-            f"def {func.__name__}({arg_name},", f"def {func.__name__}("
-        )
+        for sep in ",", ")":
+            source = source.replace(
+                f"def {func.__name__}({arg_name}{sep}",
+                f"def {func.__name__}({')' if sep == ')' else ''}",
+            )
 
     extras = func.__extras if hasattr(func, "__extras") else {}
     exec(  # pylint:disable=exec-used
@@ -281,7 +283,8 @@ def _c_inline(fun, return_type=None, constants=None, **args):
         if stripped.startswith("//"):
             continue
         if stripped.startswith('"""'):
-            in_docstring = True
+            if not (stripped.endswith('"""') and len(stripped) >= 6):
+                in_docstring = True
             continue
         if stripped.startswith("def "):
             continue

pysdm-2.109/PySDM/physics/condensation_coordinate/__init__.py

@@ -0,0 +1,6 @@
+"""
+definitions of particle-size coordinates for the condensation solver
+"""
+
+from .water_mass import WaterMass
+from .water_mass_logarithm import WaterMassLogarithm

pysdm-2.109/PySDM/physics/condensation_coordinate/water_mass.py

@@ -0,0 +1,25 @@
+"""
+particle water mass as condensation coordinate (i.e. no transformation)
+"""
+
+
+class WaterMass:
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def dx_dt(m, dm_dt):  # pylint: disable=unused-argument
+        return dm_dt
+
+    @staticmethod
+    def mass(x):
+        return x
+
+    @staticmethod
+    def x(mass):
+        return mass
+
+    @staticmethod
+    def x_max(const):
+        """1 kg droplet!"""
+        return const.ONE

pysdm-2.109/PySDM/physics/condensation_coordinate/water_mass_logarithm.py

@@ -0,0 +1,31 @@
+"""
+logarithm of particle mass as coordinate (ensures non-negative values)
+"""
+
+import numpy as np
+
+
+class WaterMassLogarithm:
+    def __init__(self, _):
+        pass
+
+    @staticmethod
+    def dx_dt(m, dm_dt):
+        """
+        x = ln(m/m0)
+        dx_dt = 1/m(x) dm_dt
+        """
+        return dm_dt / m
+
+    @staticmethod
+    def mass(x):
+        return np.exp(x)
+
+    @staticmethod
+    def x(mass):
+        return np.log(mass)
+
+    @staticmethod
+    def x_max(const):
+        """corresponds to 1 kg droplet!"""
+        return const.ZERO

{pysdm-2.108 → pysdm-2.109}/PySDM/physics/constants.py

@@ -34,6 +34,7 @@ PI_4_3 = PI * 4 / 3
 LN_2 = np.log(2)
 ZERO_MASS = 0 * si.kg
 ZERO_VOLUME = 0 * si.m**3
+ZERO = 0
 ONE = 1
 TWO = 2
 THREE = 3

{pysdm-2.108 → pysdm-2.109}/PySDM/physics/particle_shape_and_density/liquid_spheres.py

@@ -29,3 +29,13 @@ class LiquidSpheres:
     @staticmethod
     def reynolds_number(_, radius, velocity_wrt_air, dynamic_viscosity, density):
         return 2 * radius * velocity_wrt_air * density / dynamic_viscosity
+
+    @staticmethod
+    def dm_dt(const, r, r_dr_dt):
+        """
+        dm_dt = d(4/3 pi r^3 rho_w) / dt
+              = 4 pi r^2 rho_w dr/dt
+              = 4 pi rho_w r(mass) * r_dr_dt
+              = 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

{pysdm-2.108 → pysdm-2.109}/PySDM/physics/particle_shape_and_density/mixed_phase_spheres.py

@@ -33,3 +33,10 @@ class MixedPhaseSpheres:
             np.maximum(const.ZERO_VOLUME, const.PI_4_3 * radius**3) * const.rho_w
             + np.minimum(const.ZERO_VOLUME, const.PI_4_3 * radius**3) * const.rho_i
         )
+
+    @staticmethod
+    def dm_dt(const, r, r_dr_dt):
+        """
+        note: no ice phase support here yet! TODO #1389
+        """
+        return 4 * const.PI * const.rho_w * r * r_dr_dt

{pysdm-2.108 → pysdm-2.109}/examples/PySDM_examples/Arabas_and_Shima_2017/settings.py

@@ -14,7 +14,7 @@ class Settings:
         N_STP: float,
         r_dry: float,
         mass_of_dry_air: float,
-        coord: str = "VolumeLogarithm",
+        coord: str = "WaterMassLogarithm",
     ):
         self.formulae = Formulae(
             saturation_vapour_pressure="AugustRocheMagnus",

{pysdm-2.108 → pysdm-2.109}/examples/PySDM_examples/Yang_et_al_2018/settings.py

@@ -43,7 +43,7 @@ class Settings:
         )
 
         self.backend = CPU
-        self.coord = "VolumeLogarithm"
+        self.coord = "WaterMassLogarithm"
         self.adaptive = True
         self.rtol_x = condensation.DEFAULTS.rtol_x
         self.rtol_thd = condensation.DEFAULTS.rtol_thd

{pysdm-2.108 → pysdm-2.109}/pysdm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pysdm
-Version: 2.108
+Version: 2.109
 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.108 → pysdm-2.109}/pysdm.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-.appveyor.yml
 .codecov.yml
 .gitignore
 .gitmodules
@@ -231,8 +230,8 @@ PySDM/physics/air_dynamic_viscosity/zografos_et_al_1987.py
 PySDM/physics/bulk_phase_partitioning/__init__.py
 PySDM/physics/bulk_phase_partitioning/kaul_et_al_2015.py
 PySDM/physics/condensation_coordinate/__init__.py
-PySDM/physics/condensation_coordinate/volume.py
-PySDM/physics/condensation_coordinate/volume_logarithm.py
+PySDM/physics/condensation_coordinate/water_mass.py
+PySDM/physics/condensation_coordinate/water_mass_logarithm.py
 PySDM/physics/diffusion_kinetics/__init__.py
 PySDM/physics/diffusion_kinetics/fuchs_sutugin.py
 PySDM/physics/diffusion_kinetics/grabowski_et_al_2011.py

{pysdm-2.108 → pysdm-2.109}/tests/smoke_tests/kinematic_2d/arabas_et_al_2015/test_freezing.py

@@ -23,7 +23,7 @@ def test_freezing(singular):
         Formulae(
             particle_shape_and_density="MixedPhaseSpheres",
             seed=44,
-            condensation_coordinate="VolumeLogarithm",
+            condensation_coordinate="WaterMassLogarithm",
             fastmath=True,
             freezing_temperature_spectrum="Niemand_et_al_2012",
             heterogeneous_ice_nucleation_rate="ABIFM",

{pysdm-2.108 → pysdm-2.109}/tests/smoke_tests/parcel_b/arabas_and_shima_2017/test_conservation.py

@@ -19,7 +19,7 @@ def liquid_water_mixing_ratio(simulation: Simulation):
 @pytest.mark.parametrize("settings_idx", range(len(w_avgs)))
 @pytest.mark.parametrize("mass_of_dry_air", (1, 10000))
 @pytest.mark.parametrize("scheme", ("SciPy", "CPU", "GPU"))
-@pytest.mark.parametrize("coord", ("VolumeLogarithm", "Volume"))
+@pytest.mark.parametrize("coord", ("WaterMassLogarithm", "WaterMass"))
 def test_water_mass_conservation(settings_idx, mass_of_dry_air, scheme, coord):
     # Arrange
     assert scheme in ("SciPy", "CPU", "GPU")
@@ -59,7 +59,7 @@ def test_water_mass_conservation(settings_idx, mass_of_dry_air, scheme, coord):
 
 @pytest.mark.parametrize("settings_idx", range(len(w_avgs)))
 @pytest.mark.parametrize("mass_of_dry_air", [1, 10000])
-@pytest.mark.parametrize("coord", ("VolumeLogarithm", "Volume"))
+@pytest.mark.parametrize("coord", ("WaterMassLogarithm", "WaterMass"))
 def test_energy_conservation(settings_idx, mass_of_dry_air, coord):
     # Arrange
     settings = Settings(

{pysdm-2.108 → pysdm-2.109}/tests/smoke_tests/parcel_b/arabas_and_shima_2017/test_displacement.py

@@ -3,12 +3,18 @@ import numpy as np
 import pytest
 from PySDM_examples.Arabas_and_Shima_2017.settings import Settings, w_avgs
 from PySDM_examples.Arabas_and_Shima_2017.simulation import Simulation
+from PySDM.physics import si
 
 
 @pytest.mark.parametrize("w_idx", range(len(w_avgs)))
 def test_displacement(w_idx):
     # Arrange
-    settings = Settings(w_avg=w_avgs[w_idx], N_STP=44, r_dry=1, mass_of_dry_air=1)
+    settings = Settings(
+        w_avg=w_avgs[w_idx],
+        N_STP=44 / si.cm**3,
+        r_dry=0.1 * si.um,
+        mass_of_dry_air=1 * si.kg,
+    )
     settings.n_output = 50
     simulation = Simulation(settings)
 

{pysdm-2.108 → pysdm-2.109}/tests/smoke_tests/parcel_d/rozanski_and_sonntag_1982/test_figs_4_5_6.py

@@ -21,7 +21,11 @@ def variables_fixture():
     )
 
 
-@pytest.mark.xfail(platform.system() == "Windows", strict=True, reason="TODO #1207")
+@pytest.mark.xfail(
+    platform.system() == "Darwin" and platform.machine() == "x86_64",
+    strict=True,
+    reason="TODO #1207",
+)
 class TestFigs456:
     @staticmethod
     def test_fig_5_vapour_asymptote(variables):

{pysdm-2.108 → pysdm-2.109}/tests/unit_tests/dynamics/condensation/test_parcel_sanity_checks.py

@@ -32,8 +32,12 @@ class TestParcelSanityChecks:
         (
             CPU,
             pytest.param(
-                GPU, marks=pytest.mark.xfail(strict=True)
-            ),  # TODO #1117 (works with CUDA!)
+                GPU,
+                marks=pytest.mark.xfail(
+                    strict=True,
+                    reason="TODO #1117 (works with CUDA!)",
+                ),
+            ),
         ),
     )
     def test_noisy_supersaturation_profiles(backend_class, plot=False):

{pysdm-2.108 → pysdm-2.109}/tests/unit_tests/test_formulae.py

@@ -1,14 +1,20 @@
 # pylint: disable=missing-module-docstring,missing-class-docstring,missing-function-docstring
+from collections import namedtuple
+
 import numpy as np
 import pytest
 
 from PySDM import formulae, Formulae
 from PySDM.physics import si
 
+DUMMY_CONSTANTS = namedtuple(typename="constants", field_names=("PI", "ZERO"))(
+    PI=3.14, ZERO=0
+)
+
 
 class TestFormulae:
     @staticmethod
-    def test_c_inline():
+    def test_c_inline_hello_world():
         # arrange
         def fun(_, xxx):
             return min(
@@ -18,12 +24,45 @@ class TestFormulae:
 
         # act
         c_code = formulae._c_inline(
-            fun, constants={"pi": 3.14}, xxx=0
+            fun, constants=DUMMY_CONSTANTS, xxx=0
         )  # pylint: disable=protected-access
 
         # assert
         assert ", )" not in c_code
 
+    @staticmethod
+    def test_c_inline_single_line_docstring():
+        # arrange
+        def zero(const):
+            """docstring"""
+            return const.ZERO
+
+        # act
+        c_code = formulae._c_inline(
+            zero, constants=DUMMY_CONSTANTS
+        )  # pylint: disable=protected-access
+
+        # assert
+        assert c_code == "(real_type)((real_type)(0))"
+
+    @staticmethod
+    def test_c_inline_multi_line_docstring():
+        # arrange
+        def zero(const):
+            """
+            line 1
+            line 2
+            """
+            return const.ZERO
+
+        # act
+        c_code = formulae._c_inline(
+            zero, constants=DUMMY_CONSTANTS
+        )  # pylint: disable=protected-access
+
+        # assert
+        assert c_code == "(real_type)((real_type)(0))"
+
     @staticmethod
     @pytest.mark.parametrize(
         "formulae_init_args",

pysdm-2.108/.appveyor.yml

@@ -1,42 +0,0 @@
-branches:
-  only:
-    - main
-environment:
-  matrix:
-  - platform: x86
-#  - platform: x64
-  
-build: false
-
-skip_tags: true
-
-install:
-  - echo Installed Pythons
-  - dir c:\Python*
-
-  - ps: |
-      if ($env:platform -Match "x86") 
-      {
-        $env:PYTHON="C:\Python38\python"
-        Set-Content -Path "setup.py" -Value (get-content -Path "setup.py" | Select-String -Pattern 'PyPartMC' -NotMatch)
-      }
-      elseif ($env:platform -Match "x64") 
-      {
-        $env:PYTHON="C:\Python38-x64\python"
-      }
-
-  - ps: |
-      iex "$env:PYTHON -m pip install --no-warn-script-location pytest pip==21.3.1"
-      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
-  
-  - ps: |
-      iex "$env:PYTHON -m pip install --prefer-binary --no-warn-script-location -e .[tests]"
-      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
-
-test_script:
-  - ps: |
-      iex "$env:PYTHON -m pytest --durations=10 -We -p no:unraisableexception tests/unit_tests"
-      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
-
-#on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

pysdm-2.108/PySDM/physics/condensation_coordinate/__init__.py

@@ -1,6 +0,0 @@
-"""
-definitions of particle-size coordinates for the condensation solver
-"""
-
-from .volume import Volume
-from .volume_logarithm import VolumeLogarithm