Skip to content

Small change to cache #337

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
OnnoEbbens merged 1 commit into from
Apr 19, 2024
Merged

Small change to cache #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions nlmod/cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,7 @@ def ds_contains(ds, coords_2d=False, coords_3d=False, coords_time=False, datavar
if coords_2d or coords_3d:
coords.append("x")
coords.append("y")
datavars.append("area")
attrs.append("extent")

if "gridtype" in ds.attrs:
Expand All @@ -649,16 +650,16 @@ def ds_contains(ds, coords_2d=False, coords_3d=False, coords_time=False, datavar
attrs.append("time_units")

# User-friendly error messages
if "northsea" in datavars and "northsea" not in ds.datavars:
if "northsea" in datavars and "northsea" not in ds.data_vars:
raise ValueError("Northsea not in dataset. Run nlmod.read.rws.add_northsea() first.")

if "time" in coords and "time" not in ds.coords:
raise ValueError("time not in dataset. Run nlmod.time.set_ds_time() first.")

# User-unfriendly error messages
for datavar in datavars:
if datavar not in ds.datavars:
raise ValueError(f"{datavar} not in dataset.datavars")
if datavar not in ds.data_vars:
raise ValueError(f"{datavar} not in dataset.data_vars")

for coord in coords:
if coord not in ds.coords:
Expand Down