foxes 0.7.0.6__py3-none-any.whl → 0.7.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of foxes might be problematic. Click here for more details.
- foxes/VERSION +1 -1
- foxes/algorithms/downwind/downwind.py +6 -4
- foxes/core/wake_frame.py +4 -4
- foxes/models/__init__.py +1 -1
- foxes/models/model_book.py +385 -248
- foxes/models/wake_models/wind/bastankhah14.py +1 -1
- foxes/models/wake_models/wind/turbopark.py +67 -17
- foxes/models/wake_superpositions/__init__.py +4 -4
- foxes/models/wake_superpositions/ws_linear.py +156 -0
- foxes/models/wake_superpositions/ws_max.py +159 -0
- foxes/models/wake_superpositions/ws_pow.py +162 -0
- foxes/models/wake_superpositions/ws_quadratic.py +156 -0
- foxes/utils/__init__.py +1 -0
- foxes/utils/factory.py +349 -0
- {foxes-0.7.0.6.dist-info → foxes-0.7.2.dist-info}/METADATA +1 -1
- {foxes-0.7.0.6.dist-info → foxes-0.7.2.dist-info}/RECORD +23 -22
- /foxes/models/{axial_induction_models → axial_induction}/__init__.py +0 -0
- /foxes/models/{axial_induction_models → axial_induction}/betz.py +0 -0
- /foxes/models/{axial_induction_models → axial_induction}/madsen.py +0 -0
- {foxes-0.7.0.6.dist-info → foxes-0.7.2.dist-info}/LICENSE +0 -0
- {foxes-0.7.0.6.dist-info → foxes-0.7.2.dist-info}/WHEEL +0 -0
- {foxes-0.7.0.6.dist-info → foxes-0.7.2.dist-info}/top_level.txt +0 -0
- {foxes-0.7.0.6.dist-info → foxes-0.7.2.dist-info}/zip-safe +0 -0
foxes/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.7.
|
|
1
|
+
0.7.2
|
|
@@ -217,17 +217,19 @@ class Downwind(Algorithm):
|
|
|
217
217
|
print(deco)
|
|
218
218
|
print(f" wakes:")
|
|
219
219
|
for i, w in enumerate(self.wake_models.values()):
|
|
220
|
-
print(f" {i}) {w}")
|
|
220
|
+
print(f" {i}) {w.name}: {w}")
|
|
221
221
|
print(deco)
|
|
222
222
|
print(f" partial wakes:")
|
|
223
223
|
for i, (w, p) in enumerate(self.partial_wakes.items()):
|
|
224
|
-
print(f" {i}) {w}: {p}")
|
|
224
|
+
print(f" {i}) {w}: {p.name}, {p}")
|
|
225
225
|
print(deco)
|
|
226
226
|
print(f" turbine models:")
|
|
227
227
|
for i, m in enumerate(self.farm_controller.pre_rotor_models.models):
|
|
228
|
-
print(f" {i}) {m} [pre-rotor]")
|
|
228
|
+
print(f" {i}) {m.name}: {m} [pre-rotor]")
|
|
229
229
|
for i, m in enumerate(self.farm_controller.post_rotor_models.models):
|
|
230
|
-
print(
|
|
230
|
+
print(
|
|
231
|
+
f" {i+len(self.farm_controller.pre_rotor_models.models)}) {m.name}: {m}"
|
|
232
|
+
)
|
|
231
233
|
print(deco)
|
|
232
234
|
print()
|
|
233
235
|
|
foxes/core/wake_frame.py
CHANGED
|
@@ -6,7 +6,7 @@ from foxes.utils import all_subclasses
|
|
|
6
6
|
import foxes.constants as FC
|
|
7
7
|
import foxes.variables as FV
|
|
8
8
|
|
|
9
|
-
from .data import
|
|
9
|
+
from .data import MData, FData, TData
|
|
10
10
|
from .model import Model
|
|
11
11
|
|
|
12
12
|
|
|
@@ -37,9 +37,9 @@ class WakeFrame(Model):
|
|
|
37
37
|
----------
|
|
38
38
|
algo: foxes.core.Algorithm
|
|
39
39
|
The calculation algorithm
|
|
40
|
-
mdata: foxes.core.
|
|
40
|
+
mdata: foxes.core.MData
|
|
41
41
|
The model data
|
|
42
|
-
fdata: foxes.core.
|
|
42
|
+
fdata: foxes.core.FData
|
|
43
43
|
The farm data
|
|
44
44
|
|
|
45
45
|
Returns
|
|
@@ -252,7 +252,7 @@ class WakeFrame(Model):
|
|
|
252
252
|
pts = self.get_centreline_points(algo, mdata, fdata, downwind_index, xpts)
|
|
253
253
|
|
|
254
254
|
# run ambient calculation:
|
|
255
|
-
tdata =
|
|
255
|
+
tdata = TData.from_points(
|
|
256
256
|
pts,
|
|
257
257
|
data={
|
|
258
258
|
v: np.full((n_states, n_steps, 1), np.nan, dtype=FC.DTYPE) for v in vrs
|
foxes/models/__init__.py
CHANGED