PySDM-examples 2.101__tar.gz → 2.102__tar.gz

{pysdm_examples-2.101 → pysdm_examples-2.102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PySDM-examples
-Version: 2.101
+Version: 2.102
 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.101 → pysdm_examples-2.102}/PySDM_examples/Alpert_and_Knopf_2016/simulation.py

@@ -220,6 +220,7 @@ def simulation(
         environment=Box(dt=time_step, dv=volume),
     )
     builder.add_dynamic(Freezing(singular=False))
+    builder.request_attribute("volume")
 
     if hasattr(spectrum, "s_geom") and spectrum.s_geom == 1:
         _isa, _conc = np.full(n_sd, spectrum.m_mode), np.full(
@@ -230,7 +231,7 @@ def simulation(
     attributes = {
         "multiplicity": discretise_multiplicities(_conc * volume),
         "immersed surface area": _isa,
-        "volume": np.full(n_sd, droplet_volume),
+        "signed water mass": np.full(n_sd, droplet_volume * formulae.constants.rho_w),
     }
     np.testing.assert_almost_equal(attributes["multiplicity"], multiplicity)
     products = (

{pysdm_examples-2.101 → pysdm_examples-2.102}/PySDM_examples/Arabas_et_al_2023/make_particulator.py

@@ -27,8 +27,6 @@ def make_particulator(
     volume,
     thaw=False
 ):
-    attributes = {"volume": np.ones(n_sd) * droplet_volume}
-
     formulae_ctor_args = {
         "seed": seed,
         "constants": constants,
@@ -39,6 +37,10 @@ def make_particulator(
     formulae = Formulae(**formulae_ctor_args)
     backend = CPU(formulae, override_jit_flags={"parallel": False})
 
+    attributes = {
+        "signed water mass": np.ones(n_sd) * droplet_volume * formulae.constants.rho_w
+    }
+
     sampling = SpectroGlacialSampling(
         freezing_temperature_spectrum=formulae.freezing_temperature_spectrum,
         insoluble_surface_spectrum=ABIFM_spec,
@@ -65,6 +67,7 @@ def make_particulator(
     env["rhod"] = 1.0
 
     builder.add_dynamic(Freezing(singular=singular, thaw=thaw))
+    builder.request_attribute("volume")
 
     return builder.build(
         attributes=attributes,

{pysdm_examples-2.101 → pysdm_examples-2.102}/PySDM_examples/Niedermeier_et_al_2014/simulation.py

@@ -51,15 +51,15 @@ class Simulation(BasicSimulation):
             "multiplicity": ccn_conc_float * air_volume,
             "dry volume": dry_volume,
             "kappa times dry volume": settings.kappa * dry_volume,
-            "volume": None,
             "immersed surface area": immersed_surface_area,
         }
-        attributes["volume"] = settings.formulae.trivia.volume(
+        attributes["signed water mass"] = settings.formulae.trivia.volume(
             radius=equilibrate_wet_radii(
                 r_dry=ccn_diameter / 2,
                 environment=builder.particulator.environment,
                 kappa_times_dry_volume=attributes["kappa times dry volume"],
             )
+            * settings.formulae.constants.rho_w
         )
 
         for attribute, data in attributes.items():

{pysdm_examples-2.101 → pysdm_examples-2.102}/PySDM_examples/Szumowski_et_al_1998/simulation.py

@@ -154,6 +154,8 @@ class Simulation:
         )
 
         if self.settings.processes["freezing"]:
+            attributes["signed water mass"] = attributes.pop("water mass")
+
             if self.settings.freezing_inp_spec is None:
                 immersed_surface_area = formulae.trivia.sphere_surface(
                     diameter=2 * formulae.trivia.radius(volume=attributes["dry volume"])

{pysdm_examples-2.101 → pysdm_examples-2.102}/PySDM_examples/seeding/settings.py

@@ -59,7 +59,7 @@ class Settings:
         v_dry = self.formulae.trivia.volume(radius=r_dry)
         self.seeded_particle_multiplicity = n_in_dv
         self.seeded_particle_extensive_attributes = {
-            "water mass": [0.0001 * si.ng] * n_sd_seeding,
+            "signed water mass": [0.0001 * si.ng] * n_sd_seeding,
             "dry volume": v_dry,
             "kappa times dry volume": 0.8 * v_dry,
         }

{pysdm_examples-2.101 → pysdm_examples-2.102}/PySDM_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PySDM-examples
-Version: 2.101
+Version: 2.102
 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