PySDM-examples 2.100__py3-none-any.whl → 2.102__py3-none-any.whl

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/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/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/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/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.100.dist-info → PySDM_examples-2.102.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PySDM-examples
-Version: 2.100
+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.100.dist-info → PySDM_examples-2.102.dist-info}/RECORD

@@ -8,7 +8,7 @@ PySDM_examples/Abdul_Razzak_Ghan_2000/data_from_ARG2000_paper.py,sha256=MRyurAnX
 PySDM_examples/Abdul_Razzak_Ghan_2000/data_from_CloudMicrophysics_ARG.py,sha256=6vuCL55D2KnUutnqZvdv1Wnpgt0rz4BTFELKzOQP1uo,11547
 PySDM_examples/Abdul_Razzak_Ghan_2000/run_ARG_parcel.py,sha256=_n_sc0o-iAUr7_ZQmIqY4YNCViGtd82LE_r1AU3phvU,5460
 PySDM_examples/Alpert_and_Knopf_2016/__init__.py,sha256=L9OFD5gAfjzjowsdFdESfUX93r04L3t-3OI-MHGyuLw,519
-PySDM_examples/Alpert_and_Knopf_2016/simulation.py,sha256=YkO3L1JOyz_5ygWBunnY97lkj68IgVgJEJ2m67UkmoE,10034
+PySDM_examples/Alpert_and_Knopf_2016/simulation.py,sha256=2Pu4WikpaooKSFqG88GYTWS_uFYuAjpkg3zMCtZNwdQ,10112
 PySDM_examples/Alpert_and_Knopf_2016/table.py,sha256=z3d4Pms0nwe4Jb10FilOtNcE4cpUx3zGtDSeStH1l6o,228
 PySDM_examples/Alpert_and_Knopf_2016/table_1.py,sha256=edJfFNqOYwZvOL4nKM5Ir5kFppDqbfz4hPUESqCnNaI,3792
 PySDM_examples/Alpert_and_Knopf_2016/table_2.py,sha256=oxeB_UNLWzrSHKoWOot-kAe5X_i9n18SKDOh7fF9KkQ,1857
@@ -25,7 +25,7 @@ PySDM_examples/Arabas_et_al_2023/__init__.py,sha256=G2H7d8lSyHGQKsPw5FiT6We_DeQj
 PySDM_examples/Arabas_et_al_2023/commons.py,sha256=MZ1fVte_6rZ-BJKQoppZUQqCpve8cau_y0kG5dBb-xs,575
 PySDM_examples/Arabas_et_al_2023/curved_text.py,sha256=DoUvIuHkZ8xrgyXwdwEjUZLMeFseyOG7HfPS78CRNnY,5338
 PySDM_examples/Arabas_et_al_2023/frozen_fraction.py,sha256=8ok3PbeXMwn87hCQt5tsNcHMCbYZHdW7dnCL-Fcx3LQ,783
-PySDM_examples/Arabas_et_al_2023/make_particulator.py,sha256=e_rg8PbIHHW5N_metonQAsgrXGBhjcF0Jkonek8ovA4,2119
+PySDM_examples/Arabas_et_al_2023/make_particulator.py,sha256=yq1szRl3p_v-46y6DAAaWMA-rKfm2BuUx7z5MJnqIKk,2211
 PySDM_examples/Arabas_et_al_2023/plots.py,sha256=YaF3LTOPX2k6d5ZG_FKPOgZPcSjM7oVMdnSFzK6-DQM,5035
 PySDM_examples/Arabas_et_al_2023/run_simulation.py,sha256=Yq4EjdvOr1nYrvK8b1LZtqtbvf0bg6Mm2CWg5zsDqi4,1281
 PySDM_examples/Bartman_2020_MasterThesis/__init__.py,sha256=la2o79L6WLPueZ3EI5ThGtNRuSkXvKQwJJmvrNhhHa8,136
@@ -79,7 +79,7 @@ PySDM_examples/Morrison_and_Grabowski_2007/cumulus.py,sha256=kyypwfFdYqY_QyoPr88
 PySDM_examples/Morrison_and_Grabowski_2007/strato_cumulus.py,sha256=NsYP-AOHcY-HDvhg1dWAHWVFZzlaxpDoQJNbrSphdUg,1139
 PySDM_examples/Niedermeier_et_al_2014/__init__.py,sha256=onCrRnKNGSVExQkYDjxtrLF94CnsjEwqF4TZ5lUbySs,199
 PySDM_examples/Niedermeier_et_al_2014/settings.py,sha256=wO9NwcgOhzIDmmyVDHVYuGSlbnJUq7FjRL1kfCekS8M,1556
-PySDM_examples/Niedermeier_et_al_2014/simulation.py,sha256=F1DKol-ujtJ5PaNKyKATquuTgHwces2it4jXDu-4dho,3408
+PySDM_examples/Niedermeier_et_al_2014/simulation.py,sha256=0gkQ_5wUaBdQWdxY-KU-fj2-Ih0SL19Lw5xCSCkFaoI,3439
 PySDM_examples/Pierchala_et_al_2022/__init__.py,sha256=GEv_wVIl6qmbdDcneB_q-51crD1C9jN-C4ILFq1BYf0,242
 PySDM_examples/Pierchala_et_al_2022/commons.py,sha256=GPFC4NbhyTFT_XEcsS6xLMzDIPwOZ0eislYteeSkqqc,1021
 PySDM_examples/Pyrcel/__init__.py,sha256=Ix8ZNYHhQe_rqLJaFBo_v1pRHpQkXT1-N5ql8L6bTSg,283
@@ -119,7 +119,7 @@ PySDM_examples/Szumowski_et_al_1998/gui_viewer.py,sha256=JZFAfD9FXHS5msVYAzccoF5
 PySDM_examples/Szumowski_et_al_1998/make_default_product_collection.py,sha256=m8qiUHsCaGSBo_b8MqhHtO4a-MBuhG42XHBn42Vy6Cw,4682
 PySDM_examples/Szumowski_et_al_1998/mpdata_2d.py,sha256=Y3Qimm2hSDvtJxdc9mBoPCftMFSDTaOE7dSDd2lt_DU,4441
 PySDM_examples/Szumowski_et_al_1998/plots.py,sha256=fzeluxlLF9VbSMmcu2wvd9WPl3ApIuA0jouwOh6rJHA,7001
-PySDM_examples/Szumowski_et_al_1998/simulation.py,sha256=ADPFimJ4bEVZ1Ocjesb7oFEVsecEA3QvNd7tjUnYUWs,10287
+PySDM_examples/Szumowski_et_al_1998/simulation.py,sha256=H0tDBLSh8xhCq3aYtFlgBcnun-PX3sg8_R_ZfMPE7VI,10363
 PySDM_examples/Szumowski_et_al_1998/sounding.py,sha256=vk3KHRPrBbZpz6QCqj2RtWyEpl_N7jSMR-zoDWM_ZVQ,1440
 PySDM_examples/Szumowski_et_al_1998/storage.py,sha256=NaGoujCRLubSEbhLA0QZDaSkATpJuF09HCnGdWQzcxQ,2579
 PySDM_examples/Van_Hook_1968/__init__.py,sha256=rTmp4AjFBnNJP61rn7Scui5G_AwQruqjz50tF04EmsY,170
@@ -140,7 +140,7 @@ PySDM_examples/deJong_Mackay_et_al_2023/simulation1D.py,sha256=xDA7I3EBoeAw_sHfp
 PySDM_examples/deJong_Mackay_et_al_2023/simulation_0D.py,sha256=TRDny1dwoEXClkRm90yI94JVY44-9xj4UBFsRQAtA9Q,4607
 PySDM_examples/deJong_Mackay_et_al_2023/simulation_ss.py,sha256=fYE5LRPbt5qIYC3NaXhC-qsq9GDETBxmXf2Ih3ezFyw,5864
 PySDM_examples/seeding/__init__.py,sha256=RfACRu9O8zoWLR0HV6aUdikNlphpuAhY2QznMZUu72w,220
-PySDM_examples/seeding/settings.py,sha256=_dD_0YrWsXkqWpTuSHXDTUE9xktSd9196h6bpsLDNC4,2217
+PySDM_examples/seeding/settings.py,sha256=ktJWLzWWeN7Q44WGjVaIVuF1nS2UE2zrUuwSAMu_NR8,2224
 PySDM_examples/seeding/simulation.py,sha256=kx-kUj0yJMc6zizQsu_K_E4_0-UQqPv1XSkx6AyF9tc,4088
 PySDM_examples/utils/__init__.py,sha256=kf3zKLHnQkH5inbjfzaapfDy5ACDeU8efmbJtRVJaHo,217
 PySDM_examples/utils/basic_simulation.py,sha256=4EdgD0p8EKNNcqYYVSlGm1MG2ac7_6heQdwS-kp-Tmw,698
@@ -150,7 +150,7 @@ PySDM_examples/utils/read_vtk_1d.py,sha256=7_3sagEbX_FxqFuGkFWdwQapd1-9echFghU8T
 PySDM_examples/utils/widgets/__init__.py,sha256=U67WZ2YDcXSocMraI7pzcMxCfcxzXNqehDzoG6ogsh4,519
 PySDM_examples/utils/widgets/freezer.py,sha256=tFlZWShXUzA2X0cxgeE44N1g9kD33q3KQWZBqkgBP0A,407
 PySDM_examples/utils/widgets/progbar_updater.py,sha256=3uhG32QkAiSM3dTV7DoROJl7fAUNA6ZsJEIKSg3tdmk,267
-PySDM_examples-2.100.dist-info/METADATA,sha256=WNerCvBSR9wWouLdANSqkds05fblhpg2mlav7IWWjno,12290
-PySDM_examples-2.100.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PySDM_examples-2.100.dist-info/top_level.txt,sha256=axw2inuuYKPWkQhzBYtkZJTPDlo5LrpGLOA0iSAf9v0,15
-PySDM_examples-2.100.dist-info/RECORD,,
+PySDM_examples-2.102.dist-info/METADATA,sha256=GOisAKETFu8CjME9LY2P6kWFFYFu1TxcDD2eURsk9GU,12290
+PySDM_examples-2.102.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PySDM_examples-2.102.dist-info/top_level.txt,sha256=axw2inuuYKPWkQhzBYtkZJTPDlo5LrpGLOA0iSAf9v0,15
+PySDM_examples-2.102.dist-info/RECORD,,