simple adaptivity in deposition growth; add ABIFM and multi-realisation curves to A&A example Fig 2; code cleaups (#1658)

Author: slayoo

PySDM/backends/impl_numba/methods/condensation_methods.py

@@ -21,7 +21,7 @@
 _Attributes = namedtuple(
     typename="_Attributes",
     field_names=(
-        "water_mass",
+        "signed_water_mass",
         "v_cr",
         "multiplicity",
         "vdry",
@@ -60,7 +60,7 @@ def condensation(**kwargs):
             n_cell=kwargs["n_cell"],
             cell_start_arg=kwargs["cell_start_arg"].data,
             attributes=_Attributes(
-                water_mass=kwargs["water_mass"].data,
+                signed_water_mass=kwargs["signed_water_mass"].data,
                 v_cr=kwargs["v_cr"].data,
                 multiplicity=kwargs["multiplicity"].data,
                 vdry=kwargs["vdry"].data,
@@ -273,7 +273,7 @@ def step_impl(  # pylint: disable=too-many-arguments,too-many-locals
         ):
             timestep /= n_substeps
             ml_old = calculate_ml_old(
-                attributes.water_mass, attributes.multiplicity, cell_idx
+                attributes.signed_water_mass, attributes.multiplicity, cell_idx
             )
             count_activating, count_deactivating, count_ripening = 0, 0, 0
             RH_max = 0
@@ -358,11 +358,11 @@ def step_impl(  # pylint: disable=too-many-arguments,too-many-locals
     @staticmethod
     def make_calculate_ml_old(jit_flags):
         @numba.njit(**jit_flags)
-        def calculate_ml_old(water_mass, multiplicity, cell_idx):
+        def calculate_ml_old(signed_water_mass, multiplicity, cell_idx):
             result = 0
             for drop in cell_idx:
-                if water_mass[drop] > 0:
-                    result += multiplicity[drop] * water_mass[drop]
+                if signed_water_mass[drop] > 0:
+                    result += multiplicity[drop] * signed_water_mass[drop]
             return result
 
         return calculate_ml_old
@@ -429,12 +429,14 @@ def calculate_ml_new(  # pylint: disable=too-many-branches,too-many-arguments,to
             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:
+                if attributes.signed_water_mass[drop] <= 0:
                     continue
                 v_drop = formulae.particle_shape_and_density__mass_to_volume(
-                    attributes.water_mass[drop]
+                    attributes.signed_water_mass[drop]
+                )
+                x_old = formulae.diffusion_coordinate__x(
+                    attributes.signed_water_mass[drop]
                 )
-                x_old = formulae.diffusion_coordinate__x(attributes.water_mass[drop])
                 r_old = formulae.trivia__radius(v_drop)
                 x_insane = formulae.diffusion_coordinate__x(
                     formulae.particle_shape_and_density__volume_to_mass(
@@ -559,13 +561,16 @@ def calculate_ml_new(  # pylint: disable=too-many-branches,too-many-arguments,to
                 )
                 result += attributes.multiplicity[drop] * mass_new
                 if not fake:
-                    if mass_new > mass_cr and mass_new > attributes.water_mass[drop]:
+                    if (
+                        mass_new > mass_cr
+                        and mass_new > attributes.signed_water_mass[drop]
+                    ):
                         n_activated_and_growing += attributes.multiplicity[drop]
-                    if mass_new > mass_cr > attributes.water_mass[drop]:
+                    if mass_new > mass_cr > attributes.signed_water_mass[drop]:
                         n_activating += attributes.multiplicity[drop]
-                    if mass_new < mass_cr < attributes.water_mass[drop]:
+                    if mass_new < mass_cr < attributes.signed_water_mass[drop]:
                         n_deactivating += attributes.multiplicity[drop]
-                    attributes.water_mass[drop] = mass_new
+                    attributes.signed_water_mass[drop] = mass_new
             n_ripening = n_activated_and_growing if n_deactivating > 0 else 0
             return result, success, n_activating, n_deactivating, n_ripening