From e9e5a7d57d3a9165e689e9837026a5b046062c6e Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Mon, 20 Oct 2025 18:04:24 +0200 Subject: [PATCH 1/2] liquid-water-content: avoid misleading var name --- PySDM/products/size_spectral/cloud_water_content.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PySDM/products/size_spectral/cloud_water_content.py b/PySDM/products/size_spectral/cloud_water_content.py index 4026fd69eb..2658f6d5f5 100644 --- a/PySDM/products/size_spectral/cloud_water_content.py +++ b/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"]) From ac6f42366a630925e3f6ed4341d51a6aaad645f7 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Sat, 15 Nov 2025 13:15:55 +0100 Subject: [PATCH 2/2] the same renaming in two other instances --- PySDM/products/aqueous_chemistry/aqueous_mole_fraction.py | 4 ++-- PySDM/products/size_spectral/water_mixing_ratio.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PySDM/products/aqueous_chemistry/aqueous_mole_fraction.py b/PySDM/products/aqueous_chemistry/aqueous_mole_fraction.py index 40e391b27a..0cb2d8dc66 100644 --- a/PySDM/products/aqueous_chemistry/aqueous_mole_fraction.py +++ b/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"]) diff --git a/PySDM/products/size_spectral/water_mixing_ratio.py b/PySDM/products/size_spectral/water_mixing_ratio.py index e2fc3f30b9..f095a1dced 100644 --- a/PySDM/products/size_spectral/water_mixing_ratio.py +++ b/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"])