Skip to content

Commit b8e832a

Browse files
authored
Fix Failing test on develop (#306)
* ignore index type
1 parent 2fa3ec9 commit b8e832a

File tree

3 files changed

+30
-10
lines changed

3 files changed

+30
-10
lines changed

examples/adcp_example.ipynb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3645,7 +3645,7 @@
36453645
"f_rng = [0.2, 0.5]\n",
36463646
"# Dissipation rate\n",
36473647
"ds_avg[\"dissipation_rate_5m\"] = avg_tool.dissipation_rate_LT83(\n",
3648-
" ds_avg[\"auto_spectra_5m\"], U, freq_range=f_rng, noise=ds_avg['noise_5m']\n",
3648+
" ds_avg[\"auto_spectra_5m\"], U, freq_range=f_rng, noise=ds_avg[\"noise_5m\"]\n",
36493649
")"
36503650
]
36513651
},
@@ -3673,10 +3673,10 @@
36733673
" spec[r] = avg_tool.power_spectral_density(\n",
36743674
" ds[\"vel_b5\"].isel(range_b5=r), freq_units=\"Hz\"\n",
36753675
" )\n",
3676-
" \n",
3676+
"\n",
36773677
" # Calculate doppler noise from spectra from each depth bin\n",
36783678
" n[r] = avg_tool.doppler_noise_level(spec[r], pct_fN=0.9)\n",
3679-
" \n",
3679+
"\n",
36803680
" # Calc dissipation rate from each spectra\n",
36813681
" e[r] = avg_tool.dissipation_rate_LT83(\n",
36823682
" spec[r], ds_avg.velds.U_mag.isel(range=r), freq_range=f_rng, noise=n[r]\n",
@@ -3794,7 +3794,9 @@
37943794
}
37953795
],
37963796
"source": [
3797-
"ds_avg[\"turbulence_intensity\"] = avg_tool.turbulence_intensity(ds.velds.U_mag, noise=ds_avg[\"noise\"])\n",
3797+
"ds_avg[\"turbulence_intensity\"] = avg_tool.turbulence_intensity(\n",
3798+
" ds.velds.U_mag, noise=ds_avg[\"noise\"]\n",
3799+
")\n",
37983800
"\n",
37993801
"(ds_avg[\"TI\"] - ds_avg[\"turbulence_intensity\"]).plot(cmap=\"Greens\", ylim=(0, 11))\n",
38003802
"plt.title(\"TI Difference\")"

mhkit/loads/graphics.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,15 @@ def plot_bin_statistics(
180180
for i, variable in enumerate(input_variables):
181181
input_variables[i] = to_numeric_array(variable, variable_names[i])
182182

183-
bin_centers, bin_mean, bin_max, bin_min, bin_mean_std, bin_max_std, bin_min_std = (
184-
input_variables
185-
)
183+
(
184+
bin_centers,
185+
bin_mean,
186+
bin_max,
187+
bin_min,
188+
bin_mean_std,
189+
bin_max_std,
190+
bin_min_std,
191+
) = input_variables
186192

187193
x_label = kwargs.get("x_label", None)
188194
y_label = kwargs.get("y_label", None)

mhkit/tests/river/test_io_d3d.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@ def test_create_points_two_arrays_one_point(self):
107107
result = river.io.d3d.create_points(np.array([1, 2]), np.array([3]), 4)
108108
expected = pd.DataFrame({"x": [1, 2], "y": [3, 3], "waterdepth": [4, 4]})
109109
pd.testing.assert_frame_equal(
110-
result, expected, check_dtype=False, check_names=False
110+
result,
111+
expected,
112+
check_dtype=False,
113+
check_names=False,
114+
check_index_type=False,
111115
)
112116

113117
def test_create_points_user_made_two_arrays_one_point(self):
@@ -155,7 +159,11 @@ def test_create_points_mixed_data_types(self):
155159
)
156160

157161
pd.testing.assert_frame_equal(
158-
result, expected, check_dtype=False, check_names=False
162+
result,
163+
expected,
164+
check_dtype=False,
165+
check_names=False,
166+
check_index_type=False,
159167
)
160168

161169
def test_create_points_array_like_inputs(self):
@@ -168,7 +176,11 @@ def test_create_points_array_like_inputs(self):
168176
)
169177

170178
pd.testing.assert_frame_equal(
171-
result, expected, check_dtype=False, check_names=False
179+
result,
180+
expected,
181+
check_dtype=False,
182+
check_names=False,
183+
check_index_type=False,
172184
)
173185

174186
def test_variable_interpolation(self):

0 commit comments

Comments
 (0)