Skip to content

Commit c961f9c

Browse files
committed
Consistency: input (v_wind) and output (power_output) of same type
Convert rho_hub to np.array if v_wind is np.array and rho_hub is pd.Series.
1 parent 4a02269 commit c961f9c

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

windpowerlib/power_output.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ def cp_curve(v_wind, rho_hub, d_rotor, cp_values):
6262
# cp time series
6363
cp_time_series = np.interp(v_wind, cp_values.index, cp_values.cp,
6464
left=0, right=0)
65+
# Convert rho_hub to np.array if v_wind is np.array
66+
if (isinstance(v_wind, np.ndarray) and isinstance(rho_hub, pd.Series)):
67+
rho_hub = np.array(rho_hub)
6568
power_output = (1 / 8 * rho_hub * d_rotor ** 2 * np.pi
6669
* np.power(v_wind, 3) * cp_time_series)
6770
# Power_output as pd.Series if v_wind is pd.Series
@@ -215,6 +218,9 @@ def p_curve_density_corr(v_wind, rho_hub, p_values):
215218
at Reiner Lemoine Institute, 2014, p. 13
216219
217220
"""
221+
# Convert rho_hub to np.array if v_wind is np.array
222+
if (isinstance(v_wind, np.ndarray) and isinstance(rho_hub, pd.Series)):
223+
rho_hub = np.array(rho_hub)
218224
power_output = [(np.interp(v_wind[i],
219225
p_values.index * (1.225 / rho_hub[i])**(
220226
np.interp(p_values.index,

0 commit comments

Comments
 (0)