Merge branch 'features/wind_farms_and_clusters' into dev

Author: SabineHaas

windpowerlib/__init__.py

@@ -5,7 +5,7 @@
 from windpowerlib import density
 from windpowerlib import modelchain
 from windpowerlib import power_output
-from windpowerlib import power_curve
+from windpowerlib import power_curves
 from windpowerlib import temperature
 from windpowerlib import tools
 from windpowerlib import wind_speed

windpowerlib/power_curve.py windpowerlib/power_curves.pywindpowerlib/power_curve.py renamed to windpowerlib/power_curves.py

@@ -7,7 +7,7 @@
 __copyright__ = "Copyright oemof developer group"
 __license__ = "GPLv3"
 
-from windpowerlib import modelchain, tools, wind_farm, power_curve, \
+from windpowerlib import modelchain, tools, wind_farm, power_curves, \
     wind_turbine_cluster
 import pandas as pd
 
@@ -33,11 +33,11 @@ class TurbineClusterModelChain(object):
         Default: True.
     block_width : Float, optional
         Width of the moving block.
-        Default in :py:func:`~.power_curve.smooth_power_curve`: 0.5.
+        Default in :py:func:`~.power_curves.smooth_power_curve`: 0.5.
     standard_deviation_method : String, optional
         Method for calculating the standard deviation for the gaussian
         distribution. Options: 'turbulence_intensity', 'Norgaard', 'Staffell'.
-        Default in :py:func:`~.power_curve.smooth_power_curve`:
+        Default in :py:func:`~.power_curves.smooth_power_curve`:
         'turbulence_intensity'.
     density_correction_order : String
         Defines when the density correction takes place if `density_correction`
@@ -67,11 +67,11 @@ class TurbineClusterModelChain(object):
         Default: True.
     block_width : Float, optional
         Width of the moving block.
-        Default in :py:func:`~.power_curve.smooth_power_curve`: 0.5.
+        Default in :py:func:`~.power_curves.smooth_power_curve`: 0.5.
     standard_deviation_method : String, optional
         Method for calculating the standard deviation for the gaussian
         distribution. Options: 'turbulence_intensity', 'Norgaard', 'Staffell'.
-        Default in :py:func:`~.power_curve.smooth_power_curve`:
+        Default in :py:func:`~.power_curves.smooth_power_curve`:
         'turbulence_intensity'.
     power_output : pandas.Series
         Electrical power output of the wind turbine in W.
@@ -178,7 +178,7 @@ def wind_farm_power_curve(self, wind_farm, **kwargs):
                 pass # TODO: add density correction
             if (self.smoothing and
                     self.smoothing_order == 'turbine_power_curves'):
-                power_curve = power_curve.smooth_power_curve(
+                power_curve = power_curves.smooth_power_curve(
                     power_curve['wind_speed'], power_curve['power'], **kwargs)
             # Add power curves of all turbines of same type to data frame after
             # renaming columns
@@ -204,13 +204,13 @@ def wind_farm_power_curve(self, wind_farm, **kwargs):
             pass # TODO: add density correction
         if (self.smoothing and
                 self.smoothing_order == 'wind_farm_power_curves'):
-            summarized_power_curve_df = power_curve.smooth_power_curve(
+            summarized_power_curve_df = power_curves.smooth_power_curve(
                 summarized_power_curve_df['wind_speed'],
                 summarized_power_curve_df['power'], **kwargs)
         if (self.wake_losses_method == 'constant_efficiency' or
                 self.wake_losses_method == 'wind_efficiency_curve'):
             summarized_power_curve_df = (
-                power_curve.wake_losses_to_power_curve(
+                power_curves.wake_losses_to_power_curve(
                     summarized_power_curve_df['wind_speed'].values,
                     summarized_power_curve_df['power'].values,
                     wake_losses_method=self.wake_losses_method,
@@ -260,7 +260,7 @@ def turbine_cluster_power_curve(self, **kwargs):
         # function run_model()
         if (self.smoothing and
                 self.smoothing_order == 'cluster_power_curve'):
-            summarized_power_curve_df = power_curve.smooth_power_curve(
+            summarized_power_curve_df = power_curves.smooth_power_curve(
                 summarized_power_curve_df['wind_speed'],
                 summarized_power_curve_df['power'], **kwargs)
         return summarized_power_curve_df