Rename function to be more generic

wind-python · Jan 14, 2019 · 5f291d9 · 5f291d9
1 parent e125d59
commit 5f291d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/windpowerlib/modelchain.py b/windpowerlib/modelchain.py
@@ -316,9 +316,9 @@ def wind_speed_hub(self, weather_df):
                 "or 'log_interpolation_extrapolation'.")
         return wind_speed_hub
 
-    def turbine_power_output(self, wind_speed_hub, density_hub):
+    def calculate_power_output(self, wind_speed_hub, density_hub):
         r"""
-        Calculates the power output of the wind turbine.
+        Calculates the power output of the wind turbine. # todo power plant output????
 
         The method specified by the parameter `power_output_model` is used.
 
@@ -419,6 +419,6 @@ def run_model(self, weather_df):
         density_hub = (None if (self.power_output_model == 'power_curve' and
                                 self.density_correction is False)
                        else self.density_hub(weather_df))
-        self.power_output = self.turbine_power_output(wind_speed_hub,
-                                                      density_hub)
+        self.power_output = self.calculate_power_output(wind_speed_hub,
+                                                        density_hub)
         return self
diff --git a/windpowerlib/turbine_cluster_modelchain.py b/windpowerlib/turbine_cluster_modelchain.py
@@ -273,6 +273,6 @@ def run_model(self, weather_df):
             wind_speed_hub = wake_losses.reduce_wind_speed(
                 wind_speed_hub,
                 wind_efficiency_curve_name=self.wake_losses_model)
-        self.power_output = self.turbine_power_output(wind_speed_hub,
-                                                      density_hub)
+        self.power_output = self.calculate_power_output(wind_speed_hub,
+                                                        density_hub)
         return self