Skip to content

Return the right value for cells above top in nlmod.layers.get_layer_of_z #524

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
rubencalje merged 2 commits into from
Dec 4, 2025
Merged

Return the right value for cells above top in nlmod.layers.get_layer_of_z #524

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
0b70e08
Fix issue 523
rubencalje Dec 3, 2025
6264512
Add extra tests
rubencalje Dec 3, 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
8 changes: 3 additions & 5 deletions nlmod/dims/layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,13 +1564,11 @@ def get_layer_of_z(ds, z, above_model=-999, below_model=-999):
for i in range(1, len(ds.layer)):
layer = xr.where((layer == below_model) & (ds["botm"][i] < z), i, layer)

# set layer to nodata where z is above top
# set layer to above_model where z is above top
if "layer" not in ds["top"].dims:
layer = xr.where((layer == below_model) & (ds["top"] > z), above_model, layer)
layer = xr.where(z > ds["top"], above_model, layer)
else:
layer = xr.where(
(layer == below_model) & (ds["top"].isel(layer=0) > z), above_model, layer
)
layer = xr.where(z > ds["top"].isel(layer=0), above_model, layer)

# set nodata attribute
layer.attrs["above_model"] = above_model
Expand Down
16 changes: 14 additions & 2 deletions tests/test_009_layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,18 @@ def test_get_layer_of_z():
assert (top.isel(layer=layer) > z).all()


def test_get_layer_of_z_above_model():
ds = nlmod.get_ds([0, 1000, 0, 500], top=0, botm=[-10, -20])
layer = nlmod.layers.get_layer_of_z(ds, 10, below_model=-999, above_model=999)
assert (layer == layer.attrs["above_model"]).all()


def test_get_layer_of_z_below_model():
ds = nlmod.get_ds([0, 1000, 0, 500], top=0, botm=[-10, -20])
layer = nlmod.layers.get_layer_of_z(ds, -30, below_model=-999, above_model=999)
assert (layer == layer.attrs["below_model"]).all()


def test_aggregate_by_weighted_mean_to_ds():
regis = get_regis_horstermeer()
regis2 = regis.copy(deep=True)
Expand Down Expand Up @@ -358,8 +370,8 @@ def test_get_modellayers_indexer():
# structured grid
idx = nlmod.layers.get_modellayers_indexer(ds, df)
# check result
assert idx["layer"].values[0] == ds['layer'].values[1]
assert idx["layer"].values[1] == ds['layer'].values[ds.sizes["layer"] - 1]
assert idx["layer"].values[0] == ds["layer"].values[1]
assert idx["layer"].values[1] == ds["layer"].values[ds.sizes["layer"] - 1]
# test getting bottom elevations using indexer
_ = ds["botm"].sel(**idx)

Expand Down
Loading