Skip to content

physics: switch the default for saturation vapour pressures from Flatau et al. '92 to Murphy Koop '05 #1689

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

physics: switch the default for saturation vapour pressures from Flatau et al. '92 to Murphy Koop '05 #1689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ff9cf3
physics: switch the default for saturation vapour pressures from Flat…
slayoo Jul 31, 2025
cfd8674
import tanh in cpp2python
slayoo Aug 1, 2025
a25b87b
Merge remote-tracking branch 'upstream/main' into HEAD
slayoo Aug 5, 2025
1c6cb74
test renorms
slayoo Aug 5, 2025
530c07a
Merge branch 'main' into slayoo-patch-23
slayoo Aug 6, 2025
c785907
Merge branch 'main' into slayoo-patch-23
slayoo Sep 16, 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
2 changes: 1 addition & 1 deletion PySDM/backends/impl_thrust_rtc/test_helpers/cpp2python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def make(self):
power, sqrt,
arctanh as atanh,
arcsinh as asinh,
sinh,
sinh, tanh,
maximum, minimum,
where, # TODO #1295
)
Expand Down
2 changes: 1 addition & 1 deletion PySDM/formulae.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def __init__( # pylint: disable=too-many-locals
seed: int = None,
fastmath: bool = True,
diffusion_coordinate: str = "WaterMassLogarithm",
saturation_vapour_pressure: str = "FlatauWalkoCotton",
saturation_vapour_pressure: str = "MurphyKoop2005",
latent_heat_vapourisation: str = "Kirchhoff",
latent_heat_sublimation: str = "MurphyKoop2005",
hygroscopicity: str = "KappaKoehlerLeadingTerms",
Expand Down
5 changes: 3 additions & 2 deletions tests/unit_tests/dynamics/condensation/test_diagnostics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import numpy as np

from PySDM import Builder
from PySDM import Builder, Formulae
from PySDM.backends import CPU
from PySDM.dynamics.condensation import Condensation
from PySDM.impl.mesh import Mesh
Expand Down Expand Up @@ -79,7 +79,8 @@ def __init__( # pylint: disable=too-many-locals
rho=rho,
eta=eta,
)
builder = Builder(n_sd=n_sd, backend=backend(), environment=env)
formulae = Formulae(saturation_vapour_pressure="FlatauWalkoCotton")
builder = Builder(n_sd=n_sd, backend=backend(formulae), environment=env)

builder.add_dynamic(Condensation(max_iters=max_iters))
self.particulator = builder.build(
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/dynamics/test_vapour_deposition_on_ice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@ def test_growth_rates_against_spichtinger_and_gierens_2009_fig_5(
assert (np.diff(mass_rate) > 0).all()

assert 1.8e-15 * si.kg / si.s < dm_dt[230 * si.K][0] < 4.0e-15 * si.kg / si.s
assert 7.0e-17 * si.kg / si.s < dm_dt[200 * si.K][0] < 1.0e-16 * si.kg / si.s
assert 6.0e-17 * si.kg / si.s < dm_dt[200 * si.K][0] < 1.0e-16 * si.kg / si.s
assert 1.3e-12 * si.kg / si.s < dm_dt[230 * si.K][-1] < 1.5e-12 * si.kg / si.s
assert 6.0e-14 * si.kg / si.s < dm_dt[200 * si.K][-1] < 1.2e-13 * si.kg / si.s
assert 5.0e-14 * si.kg / si.s < dm_dt[200 * si.K][-1] < 1.2e-13 * si.kg / si.s

@staticmethod
@pytest.mark.parametrize("diffusion_coordinate", DIFFUSION_COORDINATES)
Expand Down
Loading