Skip to content

Delft3D updates #248

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
merged 2 commits into from
Jun 29, 2023
Merged

Delft3D updates #248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94032c2
added functionality for updated variable names
browniea Jun 29, 2023
b5dfa52
Merge branch 'd3d' of https://github.com/browniea/MHKiT-Python into d3d
ssolson Jun 29, 2023
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
41 changes: 29 additions & 12 deletions mhkit/river/io/d3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,20 +183,31 @@ def get_layer_data(data, variable, layer_index=-1, time_index=-1):
v= np.ma.getdata(var[time_index,:], False)

#waterdepth
cords_to_layers= {'FlowElem_xcc FlowElem_ycc':{'name':'laydim',
'coords':data.variables['LayCoord_cc'][:]},
'FlowLink_xu FlowLink_yu': {'name':'wdim',
'coords':data.variables['LayCoord_w'][:]}}
if "mesh2d" in variable:
cords_to_layers= {'mesh2d_face_x mesh2d_face_y': {'name':'mesh2d_nLayers',
'coords':data.variables['mesh2d_layer_sigma'][:]},
'mesh2d_edge_x mesh2d_edge_y': {'name':'mesh2d_nInterfaces',
'coords':data.variables['mesh2d_interface_sigma'][:]}}
bottom_depth=np.ma.getdata(data.variables['mesh2d_waterdepth'][time_index, :], False)
waterlevel= np.ma.getdata(data.variables['mesh2d_s1'][time_index, :], False)
coords = str(data.variables['waterdepth'].coordinates).split()

else:
cords_to_layers= {'FlowElem_xcc FlowElem_ycc':{'name':'laydim',
'coords':data.variables['LayCoord_cc'][:]},
'FlowLink_xu FlowLink_yu': {'name':'wdim',
'coords':data.variables['LayCoord_w'][:]}}
bottom_depth=np.ma.getdata(data.variables['waterdepth'][time_index, :], False)
waterlevel= np.ma.getdata(data.variables['s1'][time_index, :], False)
coords = str(data.variables['waterdepth'].coordinates).split()

layer_dim = str(data.variables[variable].coordinates)


cord_sys= cords_to_layers[layer_dim]['coords']
layer_percentages= np.ma.getdata(cord_sys, False) #accumulative
bottom_depth=np.ma.getdata(data.variables['waterdepth'][time_index, :], False)
waterlevel= np.ma.getdata(data.variables['s1'][time_index, :], False)

if layer_dim == 'FlowLink_xu FlowLink_yu':
#interpolate
coords = str(data.variables['waterdepth'].coordinates).split()
x_laydim=np.ma.getdata(data.variables[coords[0]][:], False)
y_laydim=np.ma.getdata(data.variables[coords[1]][:], False)
points_laydim = np.array([ [x, y] for x, y in zip(x_laydim, y_laydim)])
Expand Down Expand Up @@ -464,10 +475,16 @@ def get_all_data_points(data, variable, time_index=-1):
assert abs(time_index) <= max_time_index, (f'time_index must be less than'
+'the max time index {max_time_index}')

cords_to_layers= {'FlowElem_xcc FlowElem_ycc':{'name':'laydim',
'coords':data.variables['LayCoord_cc'][:]},
'FlowLink_xu FlowLink_yu': {'name':'wdim',
'coords':data.variables['LayCoord_w'][:]}}
if "mesh2d" in variable:
cords_to_layers= {'mesh2d_face_x mesh2d_face_y': {'name':'mesh2d_nLayers',
'coords':data.variables['mesh2d_layer_sigma'][:]},
'mesh2d_edge_x mesh2d_edge_y': {'name':'mesh2d_nInterfaces',
'coords':data.variables['mesh2d_interface_sigma'][:]}}
else:
cords_to_layers= {'FlowElem_xcc FlowElem_ycc':{'name':'laydim',
'coords':data.variables['LayCoord_cc'][:]},
'FlowLink_xu FlowLink_yu': {'name':'wdim',
'coords':data.variables['LayCoord_w'][:]}}

layer_dim = str(data.variables[variable].coordinates)

Expand Down