Skip to content

Commit b13cea8

Browse files
committed
fix for external and transfer flows in h5
1 parent ea1fab4 commit b13cea8

2 files changed

Lines changed: 36 additions & 24 deletions

File tree

pydsm/output/dsm2h5.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ def read_table_as_df(h5, tpath):
190190
:rtype: [type]
191191
"""
192192
x = h5.get(tpath)
193+
if x is None:
194+
return None
193195
if x.dtype.names:
194196
result = pd.DataFrame(
195197
[

pydsm/output/hydroh5.py

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -208,36 +208,46 @@ def create_catalog(self):
208208
)
209209
# %%
210210
dfq = self.get_qext()
211-
cat_qext_flow = dsm2h5.create_catalog_entry(
212-
self.filename,
213-
dfq,
214-
"flow",
215-
"ft^3/s",
216-
updown=False,
217-
prefix="QEXT_",
218-
id_column="name",
211+
cat_qext_flow = (
212+
dsm2h5.create_catalog_entry(
213+
self.filename,
214+
dfq,
215+
"flow",
216+
"ft^3/s",
217+
updown=False,
218+
prefix="QEXT_",
219+
id_column="name",
220+
)
221+
if dfq is not None and not dfq.empty
222+
else None
219223
)
220224
dft = self.get_transfer_names()
221-
cat_transfer_flow = dsm2h5.create_catalog_entry(
222-
self.filename,
223-
dft,
224-
"flow",
225-
"ft^3/s",
226-
updown=False,
227-
id_column=0,
228-
prefix="TRANSFER_",
225+
cat_transfer_flow = (
226+
dsm2h5.create_catalog_entry(
227+
self.filename,
228+
dft,
229+
"flow",
230+
"ft^3/s",
231+
updown=False,
232+
id_column=0,
233+
prefix="TRANSFER_",
234+
)
235+
if dft is not None and not dft.empty
236+
else None
229237
)
230238

231239
catalog = pd.concat(
232240
[
233-
cat_flow,
234-
cat_area,
235-
cat_avg_area,
236-
cat_stage,
237-
cat_res_height,
238-
cat_res_node_flow,
239-
cat_qext_flow,
240-
cat_transfer_flow,
241+
c for c in [
242+
cat_flow,
243+
cat_area,
244+
cat_avg_area,
245+
cat_stage,
246+
cat_res_height,
247+
cat_res_node_flow,
248+
cat_qext_flow,
249+
cat_transfer_flow,
250+
] if c is not None
241251
]
242252
)
243253
return catalog

0 commit comments

Comments
 (0)