Merge branch 'dev' into turbine_library_for_0.2.0

Author: SabineHaas

doc/model_description.rst

@@ -54,10 +54,10 @@ mean wind efficiency curve.
    :alt: Wind efficiency curves
    :align: center
 
-The second option of considering wake losses is applying them to power curves by reducing the power values
+The second option to consider wake losses is to apply them to power curves by reducing the power values
 by a constant or on a wind speed depending wind farm efficiency (see :py:func:`~.wake_losses_to_power_curve`).
-Applying the wind farm efficiency (curve) to power curves instead of to feed-in time series has the advantage that the
-power curves can further be aggregated to achieve turbine cluster power curves (see :py:class:`~.wind_turbine_cluster.WindTurbineCluster`).
+Applying the wind farm efficiency (curve) to power curves instead of feed-in time series has the advantage that the
+power curves can further be aggregated to obtain turbine cluster power curves (see :py:class:`~.wind_turbine_cluster.WindTurbineCluster`).
 
 Smoothing of power curves
 =========================

doc/whatsnew/v0-1-2.txt

@@ -1,27 +1,41 @@
-v0.1.2 ()
+v0.1.2 (June 24, 2019)
 ++++++++++++++++++++++++++++++
 
 New features
 ############
-* new attribute nominal_power in WindFarm and WindTurbineCluster classes (PR #53)
+* new attribute `nominal_power` in :class:`~windpowerlib.wind_farm.WindFarm` and :class:`~windpowerlib.wind_turbine_cluster.WindTurbineCluster` classes (PR #53)
+* use properties and setters for `nominal_power` and `installed_power` in :class:`~windpowerlib.wind_farm.WindFarm` and  :class:`~windpowerlib.wind_turbine_cluster.WindTurbineCluster` classes
+* made windpowerlib work offline: added csv files containing turbine data from `OpenEnergy Database (oedb) <https://openenergy-platform.org/dataedit/>`_ to the repository for offline usage (PR #52)
+
 
 Bug fixes
 #########
-* fix issue with pandas Multiindex labels and codes attributes (PR #51)
+* fixed issue with pandas Multiindex labels and codes attributes (PR #51)
 
 Other changes
 #############
-* Made windpowerlib work offline: turbine data from oedb is stored in csv files for offline usage (PR #52)
-* Made :py:func:`~windpowerlib.wind_turbine.get_turbine_types` also accessible via `get_turbine_types()` --> from windpowerlib import get_turbine_types
-* Added kwargs in init of wind turbine, wind farm, wind turbine cluster
-* We are working with deprecation warnings to draw our user's attention to important changes (PR #53).
+* made :py:func:`~windpowerlib.wind_turbine.get_turbine_types` also accessible via `get_turbine_types()` --> from windpowerlib import get_turbine_types
+* added kwargs in init of :class:`~windpowerlib.wind_turbine.WindTurbine`, :class:`~windpowerlib.wind_farm.WindFarm` and  :class:`~windpowerlib.wind_turbine_cluster.WindTurbineCluster`
+* we are working with deprecation warnings to draw our user's attention to important changes (PR #53)
 
 Deprecations
 ############
-* installed_power is deprecated, use nominal_power instead.
+**wind_farm and wind_turbine_cluster:**
+
+* Parameter coordinates is deprecated. In the future the parameter can only be set after instantiation of WindFarm object.
+* installed_power is deprecated, use nominal_power instead
+
+**wind_turbine:**
+
+* Parameters name, data_source and fetch_curve are deprecated. The parameter name will be renamed to turbine_type. Data source and fetching will be defined by the parameters power_coefficient_curve, power_curve and nominal_power in the future.
+* Parameter coordinates is deprecated. In the future the parameter can only be set after instantiation of WindTurbine object.
+
+**power_curves:**
+
 * wake_losses_model is deprecated, will be defined by the type of wind_farm_efficiency
 
 Contributors
 ############
 * Sabine Haas
 * Birgit Schachler
+* Uwe Krien

doc/whatsnew/v0-2-0.txt

@@ -29,6 +29,9 @@ Other changes
 * Restructured csv reading for offline usage of windpowerlib. The nominal power of wind turbines is now saved to a separate file.
 
 
+Deprecations
+############
+
 Contributors
 ############
 * Sabine Haas

example/modelchain_example.ipynb

@@ -7,7 +7,7 @@ def read(fname):
 
 
 setup(name='windpowerlib',
-      version='0.1.2dev',
+      version='0.2.0dev',
       description='Creating time series of wind power plants.',
       url='http://github.com/wind-python/windpowerlib',
       author='oemof developer group',
@@ -18,7 +18,7 @@ def read(fname):
           'windpowerlib': [os.path.join('data', '*.csv')]},
       long_description=read('README.rst'),
       zip_safe=False,
-      install_requires=['pandas >= 0.19.1',
-                        'requests'],
+      install_requires=['pandas >= 0.19.1, < 0.25',
+                        'requests < 3.0'],
       extras_require={
-          'dev': ['sphinx_rtd_theme', 'pytest']})
+          'dev': ['pytest', 'jupyter', 'sphinx_rtd_theme', 'nbformat']})

setup.py

@@ -1,6 +1,6 @@
 __copyright__ = "Copyright oemof developer group"
 __license__ = "GPLv3"
-__version__ = '0.1.2dev'
+__version__ = '0.2.0dev'
 
 from windpowerlib.wind_turbine import WindTurbine
 from windpowerlib.wind_farm import WindFarm

windpowerlib/__init__.py

@@ -1,4 +1,4 @@
-,0.0,0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,4.2,4.5,5.0,5.2,5.5,6.0,6.2,6.5,7.0,7.5,8.0,8.1,8.5,8.8,9.0,9.5,10.0,10.2,10.5,11.0,11.1,11.5,12.0,12.5,13.0,13.5,14.0,14.5,15.0,15.5,16.0,16.5,17.0,17.5,18.0,18.5,19.0,19.5,20.0,20.5,21.0,21.5,22.0,22.5,23.0,23.5,24.0,24.5,25.0,26.0
+turbine_type,0.0,0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,4.2,4.5,5.0,5.2,5.5,6.0,6.2,6.5,7.0,7.5,8.0,8.1,8.5,8.8,9.0,9.5,10.0,10.2,10.5,11.0,11.1,11.5,12.0,12.5,13.0,13.5,14.0,14.5,15.0,15.5,16.0,16.5,17.0,17.5,18.0,18.5,19.0,19.5,20.0,20.5,21.0,21.5,22.0,22.5,23.0,23.5,24.0,24.5,25.0,26.0
 E-141/4200,,,0.0,,0.29,,0.4,,0.42,,,0.44,,,0.45,,,0.45,,0.44,,,,0.41,,0.36,,,0.31,,,0.25,,0.2,,0.16,,0.13,,0.11,,0.09,,0.08,,0.06,,0.05,,0.05,,0.04,,0.04,,0.03,,0.03,
 E-126/4200,,,0.0,,0.0,,0.28,,0.37,,,0.41,,,0.44,,,0.45,,0.45,,,,0.43,,0.4,,,0.35,,,0.3,,0.24,,0.2,,0.16,,0.13,,0.11,,0.09,,0.08,,0.07,,0.06,,0.05,,0.04,,0.04,,0.03,
 E-101/3500,,,0.0,,0.08,,0.28,,0.37,,,0.41,,,0.44,,,0.46,,0.47,,,,0.47,,0.46,,,0.43,,,0.38,,0.32,,0.26,,0.21,,0.17,,0.15,,0.12,,0.1,,0.09,,0.08,,0.07,,0.06,,0.05,,0.05,

windpowerlib/data/oedb_power_coefficient_curves.csv

@@ -1,4 +1,4 @@
-,0.0,0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,4.2,4.5,5.0,5.2,5.5,6.0,6.2,6.5,7.0,7.5,8.0,8.1,8.5,8.8,9.0,9.5,10.0,10.2,10.5,11.0,11.1,11.5,12.0,12.5,13.0,13.5,14.0,14.5,15.0,15.5,16.0,16.5,17.0,17.5,18.0,18.5,19.0,19.5,20.0,20.5,21.0,21.5,22.0,22.5,23.0,23.5,24.0,24.5,25.0,25.5,26.0,26.5,27.0,27.5,28.0,28.5,29.0,29.5,30.0,31.0,32.0
+turbine_type,0.0,0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,4.2,4.5,5.0,5.2,5.5,6.0,6.2,6.5,7.0,7.5,8.0,8.1,8.5,8.8,9.0,9.5,10.0,10.2,10.5,11.0,11.1,11.5,12.0,12.5,13.0,13.5,14.0,14.5,15.0,15.5,16.0,16.5,17.0,17.5,18.0,18.5,19.0,19.5,20.0,20.5,21.0,21.5,22.0,22.5,23.0,23.5,24.0,24.5,25.0,25.5,26.0,26.5,27.0,27.5,28.0,28.5,29.0,29.5,30.0,31.0,32.0
 E-141/4200,,,0.0,,22.0,,104.0,,260.0,,,523.0,,,920.0,,,1471.0,,2151.0,,,,2867.0,,3481.0,,,3903.0,,,4119.0,,4196.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,,,,,,,,,,,
 E-126/4200,,,0.0,,0.0,,58.0,,185.0,,,400.0,,,745.0,,,1200.0,,1790.0,,,,2450.0,,3120.0,,,3660.0,,,4000.0,,4150.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,4200.0,,,,,,,,,,,,
 E-101/3500,,,0.0,,3.0,,37.0,,116.0,,,253.0,,,469.0,,,775.0,,1175.0,,,,1680.0,,2280.0,,,2810.0,,,3200.0,,3400.0,,3465.0,,3500.0,,3500.0,,3500.0,,3500.0,,3500.0,,3500.0,,3500.0,,3500.0,,3500.0,,3500.0,,3500.0,,,,,,,,,,,,

windpowerlib/data/oedb_power_curves.csv

@@ -11,7 +11,7 @@
 from windpowerlib import tools, power_curves
 import numpy as np
 import pandas as pd
-import logging
+import warnings
 
 
 class WindFarm(object):