Skip to content

Commit

Permalink
expanded coverage for get_vertical_dimensions
Browse files Browse the repository at this point in the history
  • Loading branch information
veenstrajelmer committed Feb 5, 2025
1 parent 9697d20 commit 0fad695
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dfm_tools/xugrid_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def get_vertical_dimensions(uds): #TODO: maybe add layer_dimension and interface
grid_info = uds.grid.to_dataset()[gridname]
if hasattr(grid_info,'layer_dimension'):
return grid_info.layer_dimension, grid_info.interface_dimension
else:
else: # 2D model or networkfile
return None, None


Expand Down
11 changes: 9 additions & 2 deletions tests/test_xugrid_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,20 +176,27 @@ def test_get_vertical_dimensions():
assert dimn_layer is None
assert dimn_interface is None

# mapfile z
# mapfile
file_nc = dfmt.data.fm_grevelingen_map(return_filepath=True)
uds = xu.open_dataset(file_nc.replace('0*','0002')) #partition 0002 of grevelingen contains both triangles as squares
dimn_layer, dimn_interface = get_vertical_dimensions(uds)
assert dimn_layer == "nmesh2d_layer"
assert dimn_interface == "nmesh2d_interface"

# mapfile sigma
# mapfile
file_nc = dfmt.data.fm_curvedbend_map(return_filepath=True)
uds = xu.open_dataset(file_nc)
dimn_layer, dimn_interface = get_vertical_dimensions(uds)
assert dimn_layer == "mesh2d_nLayers"
assert dimn_interface == "mesh2d_nInterfaces"

# networkfile (2D)
file_nc = dfmt.data.fm_grevelingen_net(return_filepath=True)
uds = xu.open_dataset(file_nc)
dimn_layer, dimn_interface = get_vertical_dimensions(uds)
assert dimn_layer is None
assert dimn_interface is None

# incorrect type
with pytest.raises(TypeError) as e:
get_vertical_dimensions(1)
Expand Down

0 comments on commit 0fad695

Please sign in to comment.