Skip to content

liquid-water-content: avoid misleading var name #1730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 15, 2025
Merged

liquid-water-content: avoid misleading var name #1730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9e5a7d
liquid-water-content: avoid misleading var name
slayoo Oct 20, 2025
ac6f423
the same renaming in two other instances
slayoo Nov 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions PySDM/products/aqueous_chemistry/aqueous_mole_fraction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
8 changes: 4 additions & 4 deletions PySDM/products/size_spectral/cloud_water_content.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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"])
Expand Down
4 changes: 2 additions & 2 deletions PySDM/products/size_spectral/water_mixing_ratio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"])
Expand Down
Loading