Skip to content

Commit 63f502a

Browse files
authored
Fix Notebooks (#4)
* fix cdip * D3D TRTS eg fix * fix pylint error * pylint * fix too many branches
1 parent 71dcd1f commit 63f502a

File tree

4 files changed

+584
-600
lines changed

4 files changed

+584
-600
lines changed

examples/ADCP_Delft3D_TRTS_example.ipynb

Lines changed: 447 additions & 434 deletions
Large diffs are not rendered by default.

examples/cdip_example.ipynb

Lines changed: 129 additions & 160 deletions
Large diffs are not rendered by default.

mhkit/loads/extreme/extremes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ def short_term_extreme(
241241
short_term_extreme_dist = fit_maxima(maxima)
242242
else:
243243
print("Passed `method` not found.")
244+
short_term_extreme_dist = None
244245
return short_term_extreme_dist
245246

246247

mhkit/power/quality.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ def harmonics(
107107
hertz = np.arange(0, 3060, 5)
108108
elif grid_freq == 50:
109109
hertz = np.arange(0, 2570, 5)
110+
else:
111+
raise ValueError(f"grid_freq must be either 50 or 60. Got {grid_freq}")
110112

111113
harmonic_amplitudes = harmonic_amplitudes.reindex(
112114
{"frequency": hertz}, method="nearest"
@@ -322,7 +324,11 @@ def interharmonics(
322324
+ f"xr.DataArray, or xr.Dataset. Got {type(harmonic_amplitudes)}"
323325
)
324326

325-
if grid_freq not in [50, 60]:
327+
if grid_freq == 60:
328+
hertz = np.arange(0, 3060, 60)
329+
elif grid_freq == 50:
330+
hertz = np.arange(0, 2550, 50)
331+
else:
326332
raise ValueError(f"grid_freq must be either 50 or 60. Got {grid_freq}")
327333

328334
if not isinstance(to_pandas, bool):
@@ -340,11 +346,6 @@ def interharmonics(
340346
+ f"of harmonic_amplitudes. Got {frequency_dimension}"
341347
)
342348

343-
if grid_freq == 60:
344-
hertz = np.arange(0, 3060, 60)
345-
elif grid_freq == 50:
346-
hertz = np.arange(0, 2550, 50)
347-
348349
# Sort input data index
349350
if frequency_dimension == "":
350351
frequency_dimension = list(harmonic_amplitudes.dims)[0]

0 commit comments

Comments
 (0)