Rename time series to feedin_power_plant

Author: SabineHaas

tests/test_modelchain.py

@@ -190,7 +190,7 @@ def test_run_model(self):
 
         # Test with default parameters of modelchain (power curve)
         power_output_exp = pd.Series(data=[1731887.39768, 3820152.27489],
-                                     name='feedin')
+                                     name='feedin_power_plant')
         test_mc = mc.ModelChain(wt.WindTurbine(**test_turbine))
         test_mc.run_model(weather_df)
         assert_series_equal(test_mc.power_output, power_output_exp)
@@ -200,15 +200,15 @@ def test_run_model(self):
                            'power_output_model': 'power_curve',
                            'density_correction': True}
         power_output_exp = pd.Series(data=[1433937.37959, 3285183.55084],
-                                     name='feedin')
+                                     name='feedin_power_plant')
         test_mc = mc.ModelChain(wt.WindTurbine(**test_turbine),
                                 **test_modelchain)
         test_mc.run_model(weather_df)
         assert_series_equal(test_mc.power_output, power_output_exp)
 
         # Test with power coefficient curve and hellman
         power_output_exp = pd.Series(data=[559060.36156, 1251143.98621],
-                                     name='feedin')
+                                     name='feedin_power_plant')
         test_turbine['fetch_curve'] = 'power_coefficient_curve'
         test_modelchain = {'wind_speed_model': 'hellman',
                            'power_output_model': 'power_coefficient_curve',

tests/test_power_output.py

@@ -23,7 +23,7 @@ def test_power_coefficient_curve(self):
         # Test wind_speed as pd.Series with density and power_coefficient_curve
         # as pd.Series and np.array
         power_output_exp = pd.Series(data=[0.0, 244615.399, 0.0],
-                                     name='feedin')
+                                     name='feedin_power_plant')
         assert_series_equal(power_coefficient_curve(**parameters),
                             power_output_exp)
         parameters['density'] = np.array(parameters['density'])
@@ -68,7 +68,7 @@ def test_power_curve(self):
         # Test wind_speed as pd.Series and power_curve as pd.Series and
         # np.array
         power_output_exp = pd.Series(data=[0.0, 450.0, 0.0],
-                                     name='feedin')
+                                     name='feedin_power_plant')
         assert_series_equal(power_curve(**parameters), power_output_exp)
         parameters['power_curve_values'] = np.array(
             parameters['power_curve_values'])
@@ -109,7 +109,7 @@ def test_power_curve(self):
         # Test wind_speed as pd.Series with density and power_curve as
         # np. array and pd.Series
         power_output_exp = pd.Series(data=[0.0, 461.00290572, 0.0],
-                                     name='feedin')
+                                     name='feedin_power_plant')
         parameters['wind_speed'] = pd.Series(data=parameters['wind_speed'])
         assert_series_equal(power_curve(**parameters), power_output_exp)
         parameters['density'] = pd.Series(data=parameters['density'])
@@ -139,7 +139,7 @@ def test_power_curve_density_correction(self):
         # Test wind_speed as pd.Series with density and power_curve as
         # pd.Series and np.array
         power_output_exp = pd.Series(data=[0.0, 461.00290572, 0.0],
-                                     name='feedin')
+                                     name='feedin_power_plant')
         assert_series_equal(power_curve_density_correction(**parameters),
                             power_output_exp)
         parameters['density'] = np.array(parameters['density'])

windpowerlib/power_output.py

@@ -127,7 +127,7 @@ def power_curve(wind_speed, power_curve_wind_speeds, power_curve_values,
         # Power_output as pd.Series if wind_speed is pd.Series (else: np.array)
         if isinstance(wind_speed, pd.Series):
             power_output = pd.Series(data=power_output, index=wind_speed.index,
-                                     name='feedin')
+                                     name='feedin_power_plant')
         else:
             power_output = np.array(power_output)
     elif density_correction is True:
@@ -220,7 +220,7 @@ def power_curve_density_correction(wind_speed, power_curve_wind_speeds,
     # Power_output as pd.Series if wind_speed is pd.Series (else: np.array)
     if isinstance(wind_speed, pd.Series):
         power_output = pd.Series(data=power_output, index=wind_speed.index,
-                                 name='feedin')
+                                 name='feedin_power_plant')
     else:
         power_output = np.array(power_output)
     return power_output