Merge 963769f into 78ce14a

wind-python · Sep 3, 2019 · 9f3ed88 · 9f3ed88
2 parents 78ce14a + 963769f
commit 9f3ed88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/doc/modules.rst b/doc/modules.rst
@@ -93,7 +93,7 @@ as the aggregated power curve of a :py:class:`~.wind_farm.WindFarm` object.
 Wind turbine cluster calculations
 =================================
 
-Functions and methods to calculate the mean hub height, installed power as well
+Functions and methods to calculate the mean hub height, nominal power as well
 as the aggregated power curve of a :py:class:`~.wind_turbine_cluster.WindTurbineCluster` object.
 This is realized in a new module as the functions differ from the functions in
 the :py:class:`~.wind_farm.WindFarm` class.
@@ -103,7 +103,6 @@ the :py:class:`~.wind_farm.WindFarm` class.
 
    wind_turbine_cluster.WindTurbineCluster.nominal_power
    wind_turbine_cluster.WindTurbineCluster.mean_hub_height
-   wind_turbine_cluster.WindTurbineCluster.get_installed_power
    wind_turbine_cluster.WindTurbineCluster.assign_power_curve
 
 .. _poweroutput_module_label:

diff --git a/windpowerlib/wind_turbine_cluster.py b/windpowerlib/wind_turbine_cluster.py
@@ -83,7 +83,8 @@ def nominal_power(self):
 
         """
         if not self._nominal_power:
-            self.nominal_power = self.get_installed_power()
+            self.nominal_power = sum(wind_farm.nominal_power
+                                     for wind_farm in self.wind_farms)
         return self._nominal_power
 
     @nominal_power.setter
@@ -131,21 +132,6 @@ def mean_hub_height(self):
             wind_farm in self.wind_farms) / self.nominal_power)
         return self
 
-    def get_installed_power(self):
-        r"""
-        Calculates the :py:attr:`~nominal_power` of a wind turbine cluster.
-
-        Returns
-        -------
-        float
-            Nominal power of the wind farm in W. See :py:attr:`~nominal_power`
-            for further information.
-
-        """
-        for wind_farm in self.wind_farms:
-            wind_farm.nominal_power = wind_farm.nominal_power
-        return sum(wind_farm.nominal_power for wind_farm in self.wind_farms)
-
     def assign_power_curve(self, wake_losses_model='wind_farm_efficiency',
                            smoothing=False, block_width=0.5,
                            standard_deviation_method='turbulence_intensity',