Skip to content

Commit

Permalink
Fix Failing test on develop (#306)
Browse files Browse the repository at this point in the history
* ignore index type
  • Loading branch information
ssolson authored Apr 17, 2024
1 parent 2fa3ec9 commit b8e832a
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 10 deletions.
10 changes: 6 additions & 4 deletions examples/adcp_example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -3645,7 +3645,7 @@
"f_rng = [0.2, 0.5]\n",
"# Dissipation rate\n",
"ds_avg[\"dissipation_rate_5m\"] = avg_tool.dissipation_rate_LT83(\n",
" ds_avg[\"auto_spectra_5m\"], U, freq_range=f_rng, noise=ds_avg['noise_5m']\n",
" ds_avg[\"auto_spectra_5m\"], U, freq_range=f_rng, noise=ds_avg[\"noise_5m\"]\n",
")"
]
},
Expand Down Expand Up @@ -3673,10 +3673,10 @@
" spec[r] = avg_tool.power_spectral_density(\n",
" ds[\"vel_b5\"].isel(range_b5=r), freq_units=\"Hz\"\n",
" )\n",
" \n",
"\n",
" # Calculate doppler noise from spectra from each depth bin\n",
" n[r] = avg_tool.doppler_noise_level(spec[r], pct_fN=0.9)\n",
" \n",
"\n",
" # Calc dissipation rate from each spectra\n",
" e[r] = avg_tool.dissipation_rate_LT83(\n",
" spec[r], ds_avg.velds.U_mag.isel(range=r), freq_range=f_rng, noise=n[r]\n",
Expand Down Expand Up @@ -3794,7 +3794,9 @@
}
],
"source": [
"ds_avg[\"turbulence_intensity\"] = avg_tool.turbulence_intensity(ds.velds.U_mag, noise=ds_avg[\"noise\"])\n",
"ds_avg[\"turbulence_intensity\"] = avg_tool.turbulence_intensity(\n",
" ds.velds.U_mag, noise=ds_avg[\"noise\"]\n",
")\n",
"\n",
"(ds_avg[\"TI\"] - ds_avg[\"turbulence_intensity\"]).plot(cmap=\"Greens\", ylim=(0, 11))\n",
"plt.title(\"TI Difference\")"
Expand Down
12 changes: 9 additions & 3 deletions mhkit/loads/graphics.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,15 @@ def plot_bin_statistics(
for i, variable in enumerate(input_variables):
input_variables[i] = to_numeric_array(variable, variable_names[i])

bin_centers, bin_mean, bin_max, bin_min, bin_mean_std, bin_max_std, bin_min_std = (
input_variables
)
(
bin_centers,
bin_mean,
bin_max,
bin_min,
bin_mean_std,
bin_max_std,
bin_min_std,
) = input_variables

x_label = kwargs.get("x_label", None)
y_label = kwargs.get("y_label", None)
Expand Down
18 changes: 15 additions & 3 deletions mhkit/tests/river/test_io_d3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,11 @@ def test_create_points_two_arrays_one_point(self):
result = river.io.d3d.create_points(np.array([1, 2]), np.array([3]), 4)
expected = pd.DataFrame({"x": [1, 2], "y": [3, 3], "waterdepth": [4, 4]})
pd.testing.assert_frame_equal(
result, expected, check_dtype=False, check_names=False
result,
expected,
check_dtype=False,
check_names=False,
check_index_type=False,
)

def test_create_points_user_made_two_arrays_one_point(self):
Expand Down Expand Up @@ -155,7 +159,11 @@ def test_create_points_mixed_data_types(self):
)

pd.testing.assert_frame_equal(
result, expected, check_dtype=False, check_names=False
result,
expected,
check_dtype=False,
check_names=False,
check_index_type=False,
)

def test_create_points_array_like_inputs(self):
Expand All @@ -168,7 +176,11 @@ def test_create_points_array_like_inputs(self):
)

pd.testing.assert_frame_equal(
result, expected, check_dtype=False, check_names=False
result,
expected,
check_dtype=False,
check_names=False,
check_index_type=False,
)

def test_variable_interpolation(self):
Expand Down

0 comments on commit b8e832a

Please sign in to comment.