Sort power (coefficient) curves by wind speed and columns by ['wind_speed', 'value']

Author: SabineHaas

windpowerlib/wind_farm.py

@@ -361,14 +361,14 @@ def assign_power_curve(self, wake_losses_model='wind_farm_efficiency',
                 if power_curve.iloc[0]['wind_speed'] != 0.0:
                     power_curve = pd.concat(
                         [pd.DataFrame(data={
-                            'value': [0.0], 'wind_speed': [0.0]}),
+                            'wind_speed': [0.0], 'value': [0.0]}),
                             power_curve])
                 if power_curve.iloc[-1]['value'] != 0.0:
                     power_curve = pd.concat(
                         [power_curve, pd.DataFrame(data={
-                            'value': [0.0], 'wind_speed': [
-                                power_curve['wind_speed'].loc[
-                                    power_curve.index[-1]] + 0.5]})])
+                            'wind_speed': [power_curve['wind_speed'].loc[
+                                               power_curve.index[-1]] + 0.5],
+                            'value': [0.0]})])
             # Add power curves of all turbine types to data frame
             # (multiplied by turbine amount)
             df = pd.concat(

windpowerlib/wind_turbine.py

@@ -172,6 +172,16 @@ def __init__(self, hub_height, nominal_power=None, path='oedb',
                    " Check if the turbine type {0} is in your database file"
                    " or if you passed a valid curve.")
             warnings.warn(msg.format(turbine_type), WindpowerlibUserWarning)
+        else:
+            # sort power (coefficient) curve by wind speed and bring columns in
+            # order: 1) 'wind_speed' 2) 'value'
+            if isinstance(self.power_curve, pd.DataFrame):
+                self.power_curve.sort_values(by='wind_speed')
+                self.power_curve = self.power_curve[['wind_speed', 'value']]
+            if isinstance(self.power_coefficient_curve, pd.DataFrame):
+                self.power_coefficient_curve.sort_values(by='wind_speed')
+                self.power_coefficient_curve = self.power_coefficient_curve[[
+                    'wind_speed', 'value']]
 
     def __repr__(self):
         info = []