From c33c95a3212e99641a024f7a1c6903bcf957edb1 Mon Sep 17 00:00:00 2001
From: Riccardo Riva <ricriv@dtu.dk>
Date: Thu, 27 Mar 2025 08:55:46 +0000
Subject: [PATCH] Wrap turbulence model
---
py_wake/wind_farm_models/engineering_models.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/py_wake/wind_farm_models/engineering_models.py b/py_wake/wind_farm_models/engineering_models.py
index 956dbee8d..06a92c7a9 100644
--- a/py_wake/wind_farm_models/engineering_models.py
+++ b/py_wake/wind_farm_models/engineering_models.py
@@ -162,6 +162,10 @@ class EngineeringWindFarmModel(WindFarmModel):
deficit, blockage = self._add_blockage(deficit, dw_ijlk, **kwargs)
return deficit, uc, sigma_sqr, blockage
+ def _calc_added_turbulence(self, **kwargs):
+ """Calculate added turbulence intensity."""
+ return self.turbulenceModel.calc_added_turbulence(**kwargs)
+
def _calc_wt_interaction_args(self, kwargs):
"""Used for parallel execution"""
return self.calc_wt_interaction(**kwargs)
@@ -332,7 +336,7 @@ class EngineeringWindFarmModel(WindFarmModel):
# Calculate added Turbulence
# ===============================================================================================================
if self.turbulenceModel:
- add_turb_ijlk = self.turbulenceModel.calc_added_turbulence(**model_kwargs)
+ add_turb_ijlk = self._calc_added_turbulence(**model_kwargs)
# ===============================================================================================================
# Sum up deficits
@@ -729,9 +733,8 @@ class PropagateUpDownIterative(EngineeringWindFarmModel):
blockage_nk.append(blockage[0])
deficit_nk.append(deficit[0])
+ # Calculate added turbulence intensity.
if self.turbulenceModel:
-
- # Calculate added turbulence
add_turb_nk.append(self.turbulenceModel(**model_kwargs)[0])
WS_eff_jlk, ct_jlk = np.array(WS_eff_mk), np.array(ct_jlk)
--
GitLab