Merge remote-tracking branch 'upstream/main' into HEAD

Author: slayoo

PySDM/products/aqueous_chemistry/aqueous_mole_fraction.py

@@ -22,11 +22,11 @@ def _impl(self, **kwargs):
         attr = "moles_" + self.key
 
         self._download_moment_to_buffer(attr=attr, rank=0)
-        conc = self.buffer.copy()
+        number = self.buffer.copy()
 
         self._download_moment_to_buffer(attr=attr, rank=1)
         tmp = self.buffer.copy()
-        tmp[:] *= conc
+        tmp[:] *= number
         tmp[:] *= DUMMY_SPECIFIC_GRAVITY * self.formulae.constants.Md
 
         self._download_to_buffer(self.particulator.environment["rhod"])

PySDM/products/size_spectral/cloud_water_content.py

@@ -33,8 +33,8 @@ def _impl(self, **kwargs):
             self._download_moment_to_buffer(
                 attr="water mass", rank=0, filter_range=(0, np.inf)
             )
-            conc = self.buffer
-            cwc += mass * conc / self.particulator.mesh.dv
+            number = self.buffer
+            cwc += mass * number / self.particulator.mesh.dv
 
         if self.ice:
             self._download_moment_to_buffer(
@@ -51,8 +51,8 @@ def _impl(self, **kwargs):
                 filter_range=(-np.inf, 0),
                 filter_attr="signed water mass",
             )
-            conc = self.buffer
-            cwc += mass * conc / self.particulator.mesh.dv
+            number = self.buffer
+            cwc += mass * number / self.particulator.mesh.dv
 
         if self.specific:
             self._download_to_buffer(self.particulator.environment["rhod"])

PySDM/products/size_spectral/water_mixing_ratio.py

@@ -31,7 +31,7 @@ def _impl(self, **kwargs):  # TODO #217
             filter_range=self.signed_mass_range,
             filter_attr="signed water mass",
         )
-        conc = self.buffer.copy()
+        number = self.buffer.copy()
 
         self._download_moment_to_buffer(
             attr="water mass",
@@ -40,7 +40,7 @@ def _impl(self, **kwargs):  # TODO #217
             filter_attr="signed water mass",
         )
         result = self.buffer.copy()
-        result[:] *= conc
+        result[:] *= number
         result[:] /= self.particulator.mesh.dv
 
         self._download_to_buffer(self.particulator.environment["rhod"])