Merge branch 'dev' into make_windpowerlib_work_offline

Author: SabineHaas

doc/model_description.rst

@@ -8,7 +8,7 @@ Wind power plants
 The windpowerlib provides three classes for modelling wind power as wind turbines (:py:class:`~.wind_turbine.WindTurbine`),
 wind farms (:py:class:`~.wind_farm.WindFarm`) and wind turbine clusters (:py:class:`~.wind_turbine_cluster.WindTurbineCluster`).
 
-Descisptions can also be found in the sections
+Descriptions can also be found in the sections
 :ref:`wind_turbine_label`, :ref:`wind_farm_label` and :ref:`wind_turbine_cluster_label`.
 
 

doc/whatsnew/v0-1-2.txt

@@ -4,6 +4,7 @@ v0.1.2 ()
 Other changes
 #############
 * Make windpowerlib work offline: turbine data from oedb is stored in a hdf5 file for offline usage
+* Make :py:func:`~windpowerlib.wind_turbine.get_turbine_types` also accessible via `get_turbine_types()` --> from windpowerlib import get_turbine_types
 
 
 Contributors

example/data/example_power_coefficient_curves.csv

@@ -1,3 +1,3 @@
 ,turbine_id,p_nom,0,0.5,1,1.5,2,2.5,3,3.5,4,4.5,5,5.5,6,6.5,7,7.5,8,8.5,9,9.5,10,10.5,11,11.5,12,12.5,13,13.5,14,14.5,15,15.5,16,16.5,17,17.5,18,18.5,19,19.5,20,20.5,21,21.5,22,22.5,23,23.5,24,24.5,25,25.5,26
-0,DUMMY 1,300000,0,,0,,0,,0,0,0.13,,0.38,,0.46,,0.48,,0.47,,0.44,,0.4,,0.36,,0.31,,0.17,,0.23,,0.2,,0.18,,0.14,,0.11,,0.1,,0.09,,0.07,,0.05,,0.04,,0.04,,0.03,,0
+0,DUMMY 1,300000,0,,0,,0,,0,0,0.13,,0.38,,0.46,,0.48,,0.47,,0.44,,0.4,,0.36,,0.31,,0.26,,0.23,,0.2,,0.18,,0.14,,0.11,,0.1,,0.09,,0.07,,0.05,,0.04,,0.04,,0.03,,0
 1,DUMMY 2,600000,0,,0,,0,,0.16,0.29,0.35,0.38,0.4,0.41,0.42,0.43,0.43,0.44,0.44,0.44,0.44,0.43,0.42,0.39,0.36,0.32,0.29,0.26,0.23,0.2,0.18,0.16,0.15,0.14,0.12,0.11,0.1,0.09,0.09,0.08,0.07,0.07,0.06,0.06,0.05,0.05,0.05,0.04,0.04,0.04,0.04,0.03,0.03,0,0

example/modelchain_example.py

@@ -240,26 +240,21 @@ def plot_or_print(my_turbine, e126, dummy_turbine):
         print(my_turbine.power_output)
         print(dummy_turbine.power_output)
 
-    # plot or print power (coefficient) curve
+    # plot or print power curve
     if plt:
-        if e126.power_coefficient_curve is not None:
-            e126.power_coefficient_curve.plot(
-                x='wind_speed', y='power coefficient', style='*',
-                title='Enercon E126 power coefficient curve')
-            plt.show()
         if e126.power_curve is not None:
             e126.power_curve.plot(x='wind_speed', y='value', style='*',
                                   title='Enercon E126 power curve')
             plt.show()
-        if my_turbine.power_coefficient_curve is not None:
-            my_turbine.power_coefficient_curve.plot(
-                x='wind_speed', y='power coefficient', style='*',
-                title='myTurbine power coefficient curve')
-            plt.show()
         if my_turbine.power_curve is not None:
             my_turbine.power_curve.plot(x='wind_speed', y='value', style='*',
                                         title='myTurbine power curve')
             plt.show()
+        if dummy_turbine.power_coefficient_curve is not None:
+            dummy_turbine.power_coefficient_curve.plot(
+                x='wind_speed', y='value', style='*',
+                title='dummyTurbine power coefficient curve')
+            plt.show()
     else:
         if e126.power_coefficient_curve is not None:
             print(e126.power_coefficient_curve)

tests/test_wind_turbine.py

@@ -34,7 +34,8 @@ def test_error_raising(self):
     def test_get_turbine_data_from_file(self):
         # Raise FileNotFoundError due to missing
         with pytest.raises(FileNotFoundError):
-            get_turbine_data_from_file(turbine_type='...', file_='not_existent')
+            get_turbine_data_from_file(turbine_type='...',
+                                       file_='not_existent')
 
     def test_get_turbine_types(self):
         get_turbine_types(print_out=False)

windpowerlib/__init__.py

@@ -6,4 +6,5 @@
 from windpowerlib.wind_farm import WindFarm
 from windpowerlib.wind_turbine_cluster import WindTurbineCluster
 from windpowerlib.modelchain import ModelChain
-from windpowerlib.turbine_cluster_modelchain import TurbineClusterModelChain
+from windpowerlib.turbine_cluster_modelchain import TurbineClusterModelChain
+from windpowerlib.wind_turbine import get_turbine_types

windpowerlib/wind_turbine.py

@@ -267,7 +267,7 @@ def isfloat(x):
 
 def get_turbine_data_from_oedb(turbine_type, fetch_curve, overwrite=False):
     r"""
-    Gets turbine data from the OpenEnergy Database (oedb).
+    Fetches data for one wind turbine type from the OpenEnergy Database (oedb).
 
     If turbine data exists in local repository it is loaded from this file. The
     file is created when turbine data was loaded from oedb in
@@ -294,9 +294,9 @@ def get_turbine_data_from_oedb(turbine_type, fetch_curve, overwrite=False):
     -------
     Tuple (pandas.DataFrame, float)
         Power curve or power coefficient curve (pandas.DataFrame) and nominal
-        power (float). Power (coefficient) curve DataFrame contains power
-        coefficient curve values (dimensionless) or power curve values in W
-        with the corresponding wind speeds in m/s.
+        power (float) of one wind turbine type. Power (coefficient) curve
+        DataFrame contains power coefficient curve values (dimensionless) or
+        power curve values in W with the corresponding wind speeds in m/s.
 
     """
     # hdf5 filename
@@ -358,8 +358,8 @@ def load_turbine_data_from_oedb():
             schema, table), )
     if not result.status_code == 200:
         raise ConnectionError("Database connection not successful. "
-                              "Error: {}".format(result.status_code))
-    # extract data
+                              "Response: [{}]".format(result.status_code))
+    # extract data to data frame
     turbine_data = pd.DataFrame(result.json())
     # store data as hdf5
     filename = os.path.join(os.path.dirname(__file__), 'data',