Skip to content

Commit 99c58d5

Browse files
committed
Merge branch 'dev' into features/fix_and_add_automatic_tests
2 parents 296e58e + b493bd6 commit 99c58d5

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
# General information about the project.
7171
project = u'windpowerlib'
72-
copyright = u'2016-2021, oemof developer group'
72+
copyright = u'2016-2023, oemof developer group'
7373
author = u'oemof developer group'
7474

7575
import windpowerlib

example/modelchain_example.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@
518518
" x='wind_speed', y='value', style='*',\n",
519519
" title='Enercon E126 power coefficient curve')\n",
520520
" plt.xlabel('Wind speed in m/s')\n",
521-
" plt.ylabel('Power in W')\n",
521+
" plt.ylabel('Power coefficient $\\mathrm{C}_\\mathrm{P}$')\n",
522522
" plt.show()\n",
523523
" if e126.power_curve is not None:\n",
524524
" e126.power_curve.plot(x='wind_speed', y='value', style='*',\n",

example/modelchain_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def plot_or_print(my_turbine, e126, my_turbine2):
274274
title="Enercon E126 power curve",
275275
)
276276
plt.xlabel("Wind speed in m/s")
277-
plt.ylabel("Power in W")
277+
plt.ylabel("Power coefficient $\mathrm{C}_\mathrm{P}$")
278278
plt.show()
279279
if my_turbine.power_curve is not False:
280280
my_turbine.power_curve.plot(

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ def read(fname):
1717
packages=["windpowerlib"],
1818
package_data={
1919
"windpowerlib": [
20-
os.path.join("data", "*.csv"),
20+
os.path.join("data", "**.csv"),
21+
os.path.join("data", "default_turbine_data", "*.csv"),
2122
os.path.join("oedb", "*.csv"),
2223
]
2324
},

windpowerlib/wind_turbine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class WindTurbine(object):
7878
corresponding power curve value in W. Default: None.
7979
nominal_power : None or float
8080
The nominal output of the wind turbine in W. Default: None.
81-
81+
8282
Notes
8383
------
8484
Your wind turbine object needs to have a power coefficient or power curve.

0 commit comments

Comments
 (0)