From abcec571baa5439ef3aca9c04e75baa955c4f6bd Mon Sep 17 00:00:00 2001
From: mmpe <mmpe@dtu.dk>
Date: Fri, 19 Mar 2021 11:13:14 +0100
Subject: [PATCH] Fix arbitrary order of power/ct in PowerCtXr
---
.../tests/test_windturbines/test_power_ct_wind_turbines.py | 4 ++--
py_wake/wind_turbines/power_ct_functions.py | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/py_wake/tests/test_windturbines/test_power_ct_wind_turbines.py b/py_wake/tests/test_windturbines/test_power_ct_wind_turbines.py
index ffef4fe20..f4f282a6e 100644
--- a/py_wake/tests/test_windturbines/test_power_ct_wind_turbines.py
+++ b/py_wake/tests/test_windturbines/test_power_ct_wind_turbines.py
@@ -191,8 +191,8 @@ def test_PowerCtXr():
u_p, p_c, ct_c = v80_upct.copy()
ds = xr.Dataset(
- data_vars={'power': (['ws', 'boost'], np.array([p_c, p_c * 2]).T),
- 'ct': (['ws', 'boost'], np.array([ct_c, ct_c]).T)},
+ data_vars={'ct': (['ws', 'boost'], np.array([ct_c, ct_c]).T),
+ 'power': (['ws', 'boost'], np.array([p_c, p_c * 2]).T)},
coords={'boost': [0, 1], 'ws': u_p, }).transpose('boost', 'ws')
curve = PowerCtXr(ds, 'w')
u = np.linspace(3, 25, 10)
diff --git a/py_wake/wind_turbines/power_ct_functions.py b/py_wake/wind_turbines/power_ct_functions.py
index b914b1d83..dc77f7ec1 100644
--- a/py_wake/wind_turbines/power_ct_functions.py
+++ b/py_wake/wind_turbines/power_ct_functions.py
@@ -426,6 +426,7 @@ class PowerCtXr(PowerCtNDTabular):
assert 'power' in ds
assert 'ct' in ds
assert 'ws' in ds.dims
+ ds = ds[['power', 'ct']]
power_arr, ct_arr = ds.to_array()
if list(power_arr.dims).index('ws') > 0:
--
GitLab