Skip to content

Commit

Permalink
fixed conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
veenstrajelmer committed Nov 16, 2023
2 parents 715aca7 + f72b77b commit deaec8c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hydrolib/core/dflowfm/net/reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ def read_mesh2d(self, mesh2d: Mesh2d) -> None:
ds = nc.Dataset(self._ncfile_path) # type: ignore[import]

mapping = self._explorer.mesh2d_var_name_mapping
#TODO: is this necessary or checked elsewhere already?

# TODO: is this necessary or checked elsewhere already?
mesh2d_required = ["mesh2d_node_x", "mesh2d_node_y", "mesh2d_edge_nodes"]
if not set(mesh2d_required).issubset(mapping.keys()):
raise KeyError("not all required mesh2d attributes present in network")

# set mesh2d on meshkernel instance
node_x = self._read_nc_attribute(ds[mapping["mesh2d_node_x"]])
node_y = self._read_nc_attribute(ds[mapping["mesh2d_node_y"]])
Expand Down

0 comments on commit deaec8c

Please sign in to comment.