diff --git a/py_wake/wind_farm_models/engineering_models.py b/py_wake/wind_farm_models/engineering_models.py index b84b727ee35e9c2fefadf1e850dbeac9ed3d410d..4f5baffed4ef2a19eda14ef5797c1d57d89e8529 100644 --- a/py_wake/wind_farm_models/engineering_models.py +++ b/py_wake/wind_farm_models/engineering_models.py @@ -272,10 +272,9 @@ 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] + cw_ijk = np.hypot(dh_ijl[..., na], hcw_ijlk)[:, :, 0] + hcw_ijk, dh_ijk = hcw_ijlk[:, :, 0], dh_ijl[:, :, 0, na] WS_eff_jlk[:, l] = self.superpositionModel.calc_effective_WS( lw_j.WS_ilk[:, l_], deficit_ijk, uc_ijk, sigma_sqr_ijk, cw_ijk, hcw_ijk, dh_ijk) else: diff --git a/setup.py b/setup.py index fc3c842db7a466f7348318a38f4c8863203bcd3b..f7f5e9717b959c2c9bdebec4754e6131006a7e62 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ setup(name='py_wake', 'sphinx', # generating documentation 'sphinx_rtd_theme', # docs theme 'ipywidgets', # notebook widgets + 'line_profiler', # to check speed ], zip_safe=True)