Skip to content

Commit da5f2e8

Browse files
committed
Fix tests
1 parent 184034c commit da5f2e8

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

tests/test_modelchain.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ def setup_class(self):
2121
"""Setup default values"""
2222
self.test_turbine = {'hub_height': 100,
2323
'turbine_type': 'E-126/4200',
24-
'power_curve': True}
24+
'power_curve': pd.DataFrame(
25+
data={'value': [0.0, 4200 * 1000],
26+
'wind_speed': [0.0, 25.0]})}
2527

2628
temperature_2m = np.array([[267], [268]])
2729
temperature_10m = np.array([[267], [266]])

tests/test_turbine_cluster_modelchain.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ def setup_class(self):
4040
self.test_turbine_2 = {'hub_height': 90,
4141
'rotor_diameter': 60,
4242
'turbine_type': 'V90/2000',
43-
'nominal_power': 2000000.0
44-
}
43+
'nominal_power': 2000000.0}
4544
self.test_farm = {'wind_turbine_fleet': [
4645
{'wind_turbine':
4746
wt.WindTurbine(**self.test_turbine),
@@ -191,17 +190,18 @@ def test_error_raising(self):
191190

192191
# Raise ValueError when aggregated wind farm power curve needs to be
193192
# calculated but turbine does not have a power curve
194-
test_turbine = {
193+
test_turbine_data = {
195194
'hub_height': 100,
196195
'rotor_diameter': 98,
197-
'turbine_type': 'V90/2000',
198-
'power_curve': True}
196+
'turbine_type': 'V90/2000'}
197+
test_turbine = wt.WindTurbine(**test_turbine_data)
198+
test_turbine.power_curve = True
199199
test_farm = {'wind_turbine_fleet':
200200
[{'wind_turbine':
201201
wt.WindTurbine(**self.test_turbine),
202202
'number_of_turbines': 3},
203203
{'wind_turbine':
204-
wt.WindTurbine(**test_turbine),
204+
test_turbine,
205205
'number_of_turbines': 3}]}
206206
test_tc_mc = tc_mc.TurbineClusterModelChain(
207207
power_plant=wf.WindFarm(**test_farm))

windpowerlib/modelchain.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ class ModelChain(object):
9191
>>> enerconE126 = {
9292
... 'hub_height': 135,
9393
... 'rotor_diameter': 127,
94-
... 'turbine_type': 'E-126/4200',
95-
... 'power_curve': True}
94+
... 'turbine_type': 'E-126/4200'}
9695
>>> e126 = wind_turbine.WindTurbine(**enerconE126)
9796
>>> modelchain_data = {'density_model': 'ideal_gas'}
9897
>>> e126_mc = modelchain.ModelChain(e126, **modelchain_data)

0 commit comments

Comments
 (0)