Seeding examples for 1D environment of S&H 2012 as well as 2D environment of M&G2007

PySDM/backends/impl_numba/methods/seeding_methods.py

@@ -19,6 +19,14 @@ def body(  # pylint: disable=too-many-arguments
             seeded_particle_multiplicity,
             seeded_particle_extensive_attributes,
             number_of_super_particles_to_inject: int,
+            seeded_particle_cell_id,
+            seeded_particle_cell_origin,
+            seeded_particle_pos_cell,
+            seeded_particle_volume,
+            cell_id,
+            cell_origin,
+            pos_cell,
+            volume,
         ):
             number_of_super_particles_already_injected = 0
             # TODO #1387 start enumerating from the end of valid particle set
@@ -39,6 +47,14 @@ def body(  # pylint: disable=too-many-arguments
                         extensive_attributes[a, i] = (
                             seeded_particle_extensive_attributes[a, s]
                         )
+
+                    if cell_id is not None:
+                        cell_id[i] = seeded_particle_cell_id[s]
+                        volume[i] = seeded_particle_volume[s]
+                        for dim in range(len(cell_origin)):
+                            cell_origin[dim][i] = seeded_particle_cell_origin[dim][s]
+                            pos_cell[dim][i] = seeded_particle_pos_cell[dim][s]
+
             assert (
                 number_of_super_particles_to_inject
                 == number_of_super_particles_already_injected
@@ -56,6 +72,14 @@ def seeding(
         seeded_particle_multiplicity,
         seeded_particle_extensive_attributes,
         number_of_super_particles_to_inject: int,
+        seeded_particle_cell_id,
+        seeded_particle_cell_origin,
+        seeded_particle_pos_cell,
+        seeded_particle_volume,
+        cell_id,
+        cell_origin,
+        pos_cell,
+        volume,
     ):
         self._seeding(
             idx=idx.data,
@@ -65,4 +89,12 @@ def seeding(
             seeded_particle_multiplicity=seeded_particle_multiplicity.data,
             seeded_particle_extensive_attributes=seeded_particle_extensive_attributes.data,
             number_of_super_particles_to_inject=number_of_super_particles_to_inject,
+            seeded_particle_cell_id=seeded_particle_cell_id,
+            seeded_particle_cell_origin=seeded_particle_cell_origin,
+            seeded_particle_pos_cell=seeded_particle_pos_cell,
+            seeded_particle_volume=seeded_particle_volume,
+            cell_id=cell_id,
+            cell_origin=cell_origin,
+            pos_cell=pos_cell,
+            volume=volume,
         )

PySDM/dynamics/seeding.py

@@ -18,13 +18,21 @@ def __init__(
         super_droplet_injection_rate: callable,
         seeded_particle_extensive_attributes: dict,
         seeded_particle_multiplicity: Sized,
+        seeded_particle_cell_id=None,
+        seeded_particle_cell_origin=None,
+        seeded_particle_pos_cell=None,
+        seeded_particle_volume=None,
     ):
         for attr in seeded_particle_extensive_attributes.values():
             assert len(seeded_particle_multiplicity) == len(attr)
         self.particulator = None
         self.super_droplet_injection_rate = super_droplet_injection_rate
         self.seeded_particle_extensive_attributes = seeded_particle_extensive_attributes
         self.seeded_particle_multiplicity = seeded_particle_multiplicity
+        self.seeded_particle_cell_id = seeded_particle_cell_id
+        self.seeded_particle_cell_origin = seeded_particle_cell_origin
+        self.seeded_particle_pos_cell = seeded_particle_pos_cell
+        self.seeded_particle_volume = seeded_particle_volume
         self.rnd = None
         self.u01 = None
         self.index = None
@@ -67,6 +75,30 @@ def post_register_setup_when_attributes_are_known(self):
             )
         )
 
+        if self.particulator.environment.mesh.n_dims > 0:
+            self.seeded_particle_cell_id = (
+                self.particulator.IndexedStorage.from_ndarray(
+                    self.index,
+                    np.asarray(self.seeded_particle_cell_id),
+                )
+            )
+            self.seeded_particle_cell_origin = (
+                self.particulator.IndexedStorage.from_ndarray(
+                    self.index,
+                    np.asarray(self.seeded_particle_cell_origin),
+                )
+            )
+            self.seeded_particle_pos_cell = (
+                self.particulator.IndexedStorage.from_ndarray(
+                    self.index,
+                    np.asarray(self.seeded_particle_pos_cell),
+                )
+            )
+            self.seeded_particle_volume = self.particulator.IndexedStorage.from_ndarray(
+                self.index,
+                np.asarray(self.seeded_particle_volume),
+            )
+
     def __call__(self):
         if self.particulator.n_steps == 0:
             self.post_register_setup_when_attributes_are_known()
@@ -91,4 +123,8 @@ def __call__(self):
                 number_of_super_particles_to_inject=number_of_super_particles_to_inject,
                 seeded_particle_multiplicity=self.seeded_particle_multiplicity,
                 seeded_particle_extensive_attributes=self.seeded_particle_extensive_attributes,
+                seeded_particle_cell_id=self.seeded_particle_cell_id,
+                seeded_particle_cell_origin=self.seeded_particle_cell_origin,
+                seeded_particle_pos_cell=self.seeded_particle_pos_cell,
+                seeded_particle_volume=self.seeded_particle_volume,
             )

PySDM/particulator.py

@@ -72,6 +72,9 @@ def Random(self):
     def n_sd(self) -> int:
         return self.__n_sd
 
+    def n_sd_setter(self, value):
+        self.__n_sd += value
+
     @property
     def dt(self) -> float:
         if self.environment is not None:
@@ -451,6 +454,10 @@ def seeding(
         seeded_particle_multiplicity,
         seeded_particle_extensive_attributes,
         number_of_super_particles_to_inject,
+        seeded_particle_cell_id=None,
+        seeded_particle_cell_origin=None,
+        seeded_particle_pos_cell=None,
+        seeded_particle_volume=None,
     ):
         n_null = self.n_sd - self.attributes.super_droplet_count
         if n_null == 0:
@@ -469,15 +476,44 @@ def seeding(
                 Instead increase multiplicity of injected particles."
             )
 
-        self.backend.seeding(
-            idx=self.attributes._ParticleAttributes__idx,
-            multiplicity=self.attributes["multiplicity"],
-            extensive_attributes=self.attributes.get_extensive_attribute_storage(),
-            seeded_particle_index=seeded_particle_index,
-            seeded_particle_multiplicity=seeded_particle_multiplicity,
-            seeded_particle_extensive_attributes=seeded_particle_extensive_attributes,
-            number_of_super_particles_to_inject=number_of_super_particles_to_inject,
-        )
+        if self.environment.mesh.n_dims == 0:
+            self.backend.seeding(
+                idx=self.attributes._ParticleAttributes__idx,
+                multiplicity=self.attributes["multiplicity"],
+                extensive_attributes=self.attributes.get_extensive_attribute_storage(),
+                seeded_particle_index=seeded_particle_index,
+                seeded_particle_multiplicity=seeded_particle_multiplicity,
+                seeded_particle_extensive_attributes=seeded_particle_extensive_attributes,
+                number_of_super_particles_to_inject=number_of_super_particles_to_inject,
+                seeded_particle_cell_id=seeded_particle_cell_id,
+                seeded_particle_cell_origin=seeded_particle_cell_origin,
+                seeded_particle_pos_cell=seeded_particle_pos_cell,
+                seeded_particle_volume=seeded_particle_volume,
+                cell_id=None,
+                cell_origin=None,
+                pos_cell=None,
+                volume=None,
+            )
+
+        else:
+            self.backend.seeding(
+                idx=self.attributes._ParticleAttributes__idx,
+                multiplicity=self.attributes["multiplicity"],
+                extensive_attributes=self.attributes.get_extensive_attribute_storage(),
+                seeded_particle_index=seeded_particle_index,
+                seeded_particle_multiplicity=seeded_particle_multiplicity,
+                seeded_particle_extensive_attributes=seeded_particle_extensive_attributes,
+                number_of_super_particles_to_inject=number_of_super_particles_to_inject,
+                seeded_particle_cell_id=seeded_particle_cell_id.data,
+                seeded_particle_cell_origin=seeded_particle_cell_origin.data,
+                seeded_particle_pos_cell=seeded_particle_pos_cell.data,
+                seeded_particle_volume=seeded_particle_volume.data,
+                cell_id=self.attributes["cell id"].data,
+                cell_origin=self.attributes["cell origin"].data,
+                pos_cell=self.attributes["position in cell"].data,
+                volume=self.attributes["volume"].data,
+            )
+
         self.attributes.reset_idx()
         self.attributes.sanitize()
 

docs/bibliography.json

@@ -90,7 +90,8 @@
       "examples/docs/pysdm_examples_landing.md",
       "examples/PySDM_examples/utils/kinematic_2d/__init__.py",
       "examples/PySDM_examples/Morrison_and_Grabowski_2007/__init__.py",
-      "examples/PySDM_examples/Morrison_and_Grabowski_2007/fig_1.ipynb"
+      "examples/PySDM_examples/Morrison_and_Grabowski_2007/fig_1.ipynb",
+      "examples/PySDM_examples/seeding/MG2007_seeding.ipynb"
     ],
     "label": "Morrison & Grabowski 2007 (J. Atmos. Sci. 64)",
     "title": "Comparison of Bulk and Bin Warm-Rain Microphysics Models Using a Kinematic Framework"
@@ -258,7 +259,9 @@
       "examples/PySDM_examples/Arabas_et_al_2015/gui.ipynb",
       "PySDM/dynamics/displacement.py",
       "PySDM/physics/particle_advection/implicit_in_space.py",
-      "examples/PySDM_examples/utils/kinematic_2d/__init__.py"
+      "examples/PySDM_examples/seeding/MG2007_seeding.ipynb"
+      "examples/PySDM_examples/utils/kinematic_2d/__init__.py",
+      "examples/PySDM_examples/seeding/MG2007_seeding.ipynb"    
     ],
     "label": "Arabas et al. 2015 (Geosci. Model Dev. 2015)",
     "title": "libcloudph++ 1.0: a single-moment bulk, double-moment bulk, and particle-based warm-rain microphysics library in C++"
@@ -511,7 +514,8 @@
       "examples/docs/pysdm_examples_landing.md",
       "examples/PySDM_examples/deJong_Mackay_et_al_2023/figs_10_11_12_13.ipynb",
       "examples/PySDM_examples/Shipway_and_Hill_2012/fig_1.ipynb",
-      "examples/PySDM_examples/Shipway_and_Hill_2012/__init__.py"
+      "examples/PySDM_examples/Shipway_and_Hill_2012/__init__.py",
+      "examples/PySDM_examples/seeding/SH2012_seeding.ipynb"
     ],
     "label": "Shipway & Hill 2012 (Q. J. R. Meteorol. Soc. 138)",
     "title": "Diagnosis of systematic differences between multiple parametrizations of warm rain microphysics using a kinematic framework"
@@ -607,7 +611,9 @@
   },
   "https://doi.org/10.1016/S0169-8095(97)00082-3": {
     "usages": [
-      "examples/PySDM_examples/utils/kinematic_2d/__init__.py"
+      "examples/PySDM_examples/Szumowski_et_al_1998/__init__.py",
+      "examples/PySDM_examples/utils/kinematic_2d/__init__.py",
+      "examples/PySDM_examples/seeding/MG2007_seeding.ipynb"    
     ],
     "label": "Szumowski et al. 1998 (Atmos. Res. 45)",
     "title": "Simple two-dimensional kinematic framework designed to test warm rain microphysical models"