From 7214048ca8f0ecd07684fb4171f0243425c6b650 Mon Sep 17 00:00:00 2001
From: mmpe <mmpe@dtu.dk>
Date: Mon, 30 Nov 2020 12:53:56 +0100
Subject: [PATCH] close plots after test
---
py_wake/tests/test_sites/test_site.py | 9 +++++++++
py_wake/tests/test_sites/test_wasp_grid_site.py | 9 +++++++++
py_wake/tests/test_sites/test_xrsite.py | 9 +++++++++
py_wake/wind_farm_models/engineering_models.py | 1 +
4 files changed, 28 insertions(+)
diff --git a/py_wake/tests/test_sites/test_site.py b/py_wake/tests/test_sites/test_site.py
index 7ce1a9c43..77e358c6f 100644
--- a/py_wake/tests/test_sites/test_site.py
+++ b/py_wake/tests/test_sites/test_site.py
@@ -16,6 +16,15 @@ k = [2.392578, 2.447266, 2.412109, 2.591797, 2.755859, 2.595703,
ti = .1
+@pytest.fixture(autouse=True)
+def close_plots():
+ yield
+ try:
+ plt.close()
+ except Exception:
+ pass
+
+
@pytest.fixture
def site():
return UniformWeibullSite(f, A, k, ti, shear=PowerShear(50, alpha=np.zeros_like(f) + .3))
diff --git a/py_wake/tests/test_sites/test_wasp_grid_site.py b/py_wake/tests/test_sites/test_wasp_grid_site.py
index 4930e4cc9..1c2a75d5f 100644
--- a/py_wake/tests/test_sites/test_wasp_grid_site.py
+++ b/py_wake/tests/test_sites/test_wasp_grid_site.py
@@ -16,6 +16,15 @@ from py_wake.tests.check_speed import timeit
import matplotlib.pyplot as plt
+@pytest.fixture(autouse=True)
+def close_plots():
+ yield
+ try:
+ plt.close()
+ except Exception:
+ pass
+
+
@pytest.fixture
def site():
return ParqueFicticioSite()
diff --git a/py_wake/tests/test_sites/test_xrsite.py b/py_wake/tests/test_sites/test_xrsite.py
index 83e76a57a..7075e8677 100644
--- a/py_wake/tests/test_sites/test_xrsite.py
+++ b/py_wake/tests/test_sites/test_xrsite.py
@@ -27,6 +27,15 @@ k = [2.392578, 2.447266, 2.412109, 2.591797, 2.755859, 2.595703,
ti = .1
+@pytest.fixture(autouse=True)
+def close_plots():
+ yield
+ try:
+ plt.close()
+ except Exception:
+ pass
+
+
@pytest.fixture
def uniform_site():
ti = 0.1
diff --git a/py_wake/wind_farm_models/engineering_models.py b/py_wake/wind_farm_models/engineering_models.py
index df008bfff..b84b727ee 100644
--- a/py_wake/wind_farm_models/engineering_models.py
+++ b/py_wake/wind_farm_models/engineering_models.py
@@ -272,6 +272,7 @@ class EngineeringWindFarmModel(WindFarmModel):
add_turb_ijk = self.turbulenceModel.calc_added_turbulence(dw_ijlk=dw_ijlk, **args)[:, :, 0]
l_ = [l, 0][lw_j.WS_ilk.shape[1] == 1]
+ assert lw_j.WS_ilk.shape[1] == dh_ijl.shape[2] == hcw_ijlk.shape[2]
if isinstance(self.superpositionModel, WeightedSum):
cw_ijk = np.hypot(dh_ijl[..., na], hcw_ijlk)[:, :, l_]
hcw_ijk, dh_ijk = hcw_ijlk[:, :, l_], dh_ijl[:, :, l_, na]
--
GitLab