Skip to content

Commit

Permalink
Merge branch 'dev' into features/fix_and_add_automatic_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
birgits committed Jan 31, 2024
2 parents 296e58e + b493bd6 commit 99c58d5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

# General information about the project.
project = u'windpowerlib'
copyright = u'2016-2021, oemof developer group'
copyright = u'2016-2023, oemof developer group'
author = u'oemof developer group'

import windpowerlib
Expand Down
2 changes: 1 addition & 1 deletion example/modelchain_example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
" x='wind_speed', y='value', style='*',\n",
" title='Enercon E126 power coefficient curve')\n",
" plt.xlabel('Wind speed in m/s')\n",
" plt.ylabel('Power in W')\n",
" plt.ylabel('Power coefficient $\\mathrm{C}_\\mathrm{P}$')\n",
" plt.show()\n",
" if e126.power_curve is not None:\n",
" e126.power_curve.plot(x='wind_speed', y='value', style='*',\n",
Expand Down
2 changes: 1 addition & 1 deletion example/modelchain_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ def plot_or_print(my_turbine, e126, my_turbine2):
title="Enercon E126 power curve",
)
plt.xlabel("Wind speed in m/s")
plt.ylabel("Power in W")
plt.ylabel("Power coefficient $\mathrm{C}_\mathrm{P}$")
plt.show()
if my_turbine.power_curve is not False:
my_turbine.power_curve.plot(
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ def read(fname):
packages=["windpowerlib"],
package_data={
"windpowerlib": [
os.path.join("data", "*.csv"),
os.path.join("data", "**.csv"),
os.path.join("data", "default_turbine_data", "*.csv"),
os.path.join("oedb", "*.csv"),
]
},
Expand Down
2 changes: 1 addition & 1 deletion windpowerlib/wind_turbine.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class WindTurbine(object):
corresponding power curve value in W. Default: None.
nominal_power : None or float
The nominal output of the wind turbine in W. Default: None.
Notes
------
Your wind turbine object needs to have a power coefficient or power curve.
Expand Down

0 comments on commit 99c58d5

Please sign in to comment.