Skip to content

Commit d89d6ff

Browse files
committed
Use name of wind_farm in error raising only if not None
1 parent d5a7bab commit d89d6ff

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

windpowerlib/wind_farm.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ def assign_power_curve(self, wake_losses_model='power_efficiency_curve',
218218
"each wind turbine needs a power curve " +
219219
"but `power_curve` of wind turbine " +
220220
"{} is {}.".format(
221-
item['wind_turbine'].name,
221+
item['wind_turbine'].name if
222+
item['wind_turbine'].name else '',
222223
item['wind_turbine'].power_curve))
223224
# Initialize data frame for power curve values
224225
df = pd.DataFrame()
@@ -246,8 +247,8 @@ def assign_power_curve(self, wake_losses_model='power_efficiency_curve',
246247
"`efficiency` is needed if " +
247248
"`wake_losses_model´ is '{0}', but ".format(
248249
wake_losses_model) +
249-
"`efficiency` of {0} is {1}.".format(
250-
self.name, self.efficiency))
250+
"`efficiency` of wind farm {0} is {1}.".format(
251+
self.name if self.name else '', self.efficiency))
251252
# Get original power curve
252253
power_curve = pd.DataFrame(
253254
turbine_type_dict['wind_turbine'].power_curve)

0 commit comments

Comments
 (0)