Skip to content

np.assert_allclose instead of isclose.all #91

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
pdziekan merged 2 commits into from
Aug 25, 2026
Merged

np.assert_allclose instead of isclose.all #91

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
dcd3e46
np.assert_allclose instead of isclose.all
pdziekan Aug 24, 2026
b2727a9
relax test_spectrum_diff - it was below machine precision?
pdziekan Aug 25, 2026
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 long_test/test_timestep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def test_timestep_diff(data, dt, eps=2.e-4):
f_test = netcdf.netcdf_file(filename, "r")
f_ref = netcdf.netcdf_file(os.path.join("long_test/refdata", filename), "r")
for var in ["t", "z", "th_d", "T", "p", "r_v", "rhod"]:
assert np.isclose(f_test.variables[var][:], f_ref.variables[var][:], atol=0, rtol=eps).all(), "differs e.g. " + str(var) + "; max(ref diff) = " + str(np.where(f_ref.variables[var][:] != 0., abs((f_test.variables[var][:]-f_ref.variables[var][:])/f_ref.variables[var][:]), 0.).max())
np.testing.assert_allclose(f_test.variables[var][:], f_ref.variables[var][:], atol=0, rtol=eps, err_msg="differs e.g. " + str(var) + "; max(ref diff) = " + str(np.where(f_ref.variables[var][:] != 0., abs((f_test.variables[var][:]-f_ref.variables[var][:])/f_ref.variables[var][:]), 0.).max()))


def test_timestep_plot(data):
Expand Down
2 changes: 1 addition & 1 deletion unit_test/test_pressure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def test_pressure_diff(data, pprof, eps=3.e-4):
f_ref = netcdf.netcdf_file(os.path.join("unit_test/refdata",
"profopttest_" + pprof + str(data["dt"]) + ".nc"), "r")
for var in ["t", "z", "th_d", "T", "p", "r_v", "rhod"]:
assert np.isclose(f_ref.variables[var][:], data[pprof].variables[var][:], atol=0, rtol=eps).all(), "differs e.g. " + str(var) + "; max(ref diff) = " + str(np.where(f_ref.variables[var][:] != 0., abs((data[pprof].variables[var][:]-f_ref.variables[var][:])/f_ref.variables[var][:]), 0.).max())
np.testing.assert_allclose(f_ref.variables[var][:], data[pprof].variables[var][:], atol=0, rtol=eps, err_msg="differs e.g. " + str(var) + "; max(ref diff) = " + str(np.where(f_ref.variables[var][:] != 0., abs((data[pprof].variables[var][:]-f_ref.variables[var][:])/f_ref.variables[var][:]), 0.).max()))

assert np.isclose(f_ref.RH_max, data[pprof].RH_max, atol=0, rtol=eps)

Expand Down
15 changes: 8 additions & 7 deletions unit_test_debug/test_spectrum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ def test_bin_checker(data, name_spect, eps_d=1.e-14):
dr = np.empty(r_nc.shape[0] - 1)
dr[:] = (r_nc[1:] - r_nc[0:-1])

assert np.isclose(dr, dr_nc[:-1], atol=0, rtol=eps_d).all()
np.testing.assert_allclose(dr, dr_nc[:-1], atol=0, rtol=eps_d)


@pytest.mark.parametrize("var", ["wradii_r_wet", "wradii_dr_wet", "linwradii_r_wet", "linwradii_dr_wet",
"dradii_r_dry", "dradii_dr_dry", "lindradii_r_dry", "lindradii_dr_dry"])
def test_spectrum_diff(data, var, eps_d = 1e-15):
def test_spectrum_diff(data, var, eps_d = 1e-14):
"""
Compare the results with the referential simulation
(stored in refdata folder)
Expand All @@ -61,11 +61,11 @@ def test_spectrum_diff(data, var, eps_d = 1e-15):
f_ref = netcdf.netcdf_file("unit_test/refdata/test_spectrum.nc", "r")

# ... the bin edges and bin sizes ...
assert np.isclose(f_ref.variables[var][:], data.variables[var][:],atol=0, rtol=eps_d).all()
np.testing.assert_allclose(f_ref.variables[var][:], data.variables[var][:], atol=0, rtol=eps_d)

# ... and 0th, 1st, 3rd moment of wet and dry radius size distribution
@pytest.mark.parametrize("mom, eps", [("wradii_m0", 1e-15), ("dradii_m0", 1e-15),
("lindradii_m0", 1e-15), ("linwradii_m0", 1e-15),
@pytest.mark.parametrize("mom, eps", [("wradii_m0", 1e-15), ("dradii_m0", 1e-14),
("lindradii_m0", 1e-14), ("linwradii_m0", 1e-15),
("wradii_m1", 7e-4), ("dradii_m1", 5e-15),
Comment on lines +67 to 69
("lindradii_m1", 4e-15), ("linwradii_m1", 5e-6),
("wradii_m3", 1.6e-3),("dradii_m3", 2e-14),
Expand All @@ -78,9 +78,10 @@ def test_mom_checker(data, mom, eps):
refdata = np.reshape(refdata, np.product(refdata.shape))
cmpdata = np.reshape(cmpdata, np.product(cmpdata.shape))

assert np.isclose(cmpdata, refdata, atol=0, rtol=eps).all(),\
"differs e.g. " + str(mom) + "; max(ref diff) = " +\
np.testing.assert_allclose(cmpdata, refdata, atol=0, rtol=eps, err_msg=(
"differs e.g. " + str(mom) + "; max(ref diff) = " +
str(np.where(refdata != 0.,abs((cmpdata - refdata) / refdata), abs(cmpdata - refdata)).max())
))


def test_spectrum_plot(data):
Expand Down
Loading