rename omega -> position_in_cell (#979)

Co-authored-by: Sylwester Arabas <[email protected]>

Author: piotrbartman

PySDM/backends/impl_numba/methods/displacement_methods.py

@@ -13,9 +13,10 @@
 def calculate_displacement_body_common(
     dim, droplet, scheme, _l, _r, displacement, courant, position_in_cell, n_substeps
 ):
-    omega = position_in_cell[dim, droplet]
     displacement[dim, droplet] = scheme(
-        omega, courant[_l] / n_substeps, courant[_r] / n_substeps
+        position_in_cell[dim, droplet],
+        courant[_l] / n_substeps,
+        courant[_r] / n_substeps,
     )
 
 

PySDM/backends/impl_thrust_rtc/methods/displacement_methods.py

@@ -46,12 +46,11 @@ def __init__(self):
                 _r += _r_2 * courant_shape_0 * courant_shape_1;
             }}
 
-            auto omega = position_in_cell[i + n_sd * dim];
-            auto c_r = courant[_r] / n_substeps;
-            auto c_l = courant[_l] / n_substeps;
             displacement[i + n_sd * dim] = {
                 self.formulae.particle_advection.displacement.c_inline(
-                    c_l="c_l", c_r="c_r", omega="omega"
+                    position_in_cell="position_in_cell[i + n_sd * dim]",
+                    c_l="courant[_l] / n_substeps",
+                    c_r="courant[_r] / n_substeps"
                 )
             };
             """.replace(

PySDM/physics/particle_advection/explicit_in_space.py

@@ -8,5 +8,5 @@ def __init__(self, _):
         pass
 
     @staticmethod
-    def displacement(_, omega, c_l, c_r):
-        return c_l * (1 - omega) + c_r * omega
+    def displacement(_, position_in_cell, c_l, c_r):
+        return c_l * (1 - position_in_cell) + c_r * position_in_cell

PySDM/physics/particle_advection/implicit_in_space.py

@@ -8,5 +8,5 @@ def __init__(self, _):
         pass
 
     @staticmethod
-    def displacement(_, omega, c_l, c_r):
-        return (omega * c_r + c_l * (1 - omega)) / (1 - c_r + c_l)
+    def displacement(_, position_in_cell, c_l, c_r):
+        return (c_l * (1 - position_in_cell) + c_r * position_in_cell) / (1 - c_r + c_l)