foxes 0.7.0.5__tar.gz → 0.7.1__tar.gz

{foxes-0.7.0.5/foxes.egg-info → foxes-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 0.7.0.5
+Version: 0.7.1
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Fraunhofer IWES
 Author-email: jonas.schmidt@iwes.fraunhofer.de

foxes-0.7.1/foxes/VERSION

@@ -0,0 +1 @@
+0.7.1

{foxes-0.7.0.5 → foxes-0.7.1}/foxes/algorithms/downwind/downwind.py

@@ -217,17 +217,17 @@ class Downwind(Algorithm):
             print(deco)
             print(f"  wakes:")
             for i, w in enumerate(self.wake_models.values()):
-                print(f"    {i}) {w}")
+                print(f"    {i}) {w.name}: {w}")
             print(deco)
             print(f"  partial wakes:")
             for i, (w, p) in enumerate(self.partial_wakes.items()):
-                print(f"    {i}) {w}: {p}")
+                print(f"    {i}) {w}: {p.name}, {p}")
             print(deco)
             print(f"  turbine models:")
             for i, m in enumerate(self.farm_controller.pre_rotor_models.models):
-                print(f"    {i}) {m} [pre-rotor]")
+                print(f"    {i}) {m.name}: {m} [pre-rotor]")
             for i, m in enumerate(self.farm_controller.post_rotor_models.models):
-                print(f"    {i+len(self.farm_controller.pre_rotor_models.models)}) {m}")
+                print(f"    {i+len(self.farm_controller.pre_rotor_models.models)}) {m.name}: {m}")
             print(deco)
             print()
 

{foxes-0.7.0.5 → foxes-0.7.1}/foxes/core/wake_frame.py

@@ -6,7 +6,7 @@ from foxes.utils import all_subclasses
 import foxes.constants as FC
 import foxes.variables as FV
 
-from .data import Data
+from .data import MData, FData, TData
 from .model import Model
 
 
@@ -37,9 +37,9 @@ class WakeFrame(Model):
         ----------
         algo: foxes.core.Algorithm
             The calculation algorithm
-        mdata: foxes.core.Data
+        mdata: foxes.core.MData
             The model data
-        fdata: foxes.core.Data
+        fdata: foxes.core.FData
             The farm data
 
         Returns
@@ -252,7 +252,7 @@ class WakeFrame(Model):
         pts = self.get_centreline_points(algo, mdata, fdata, downwind_index, xpts)
 
         # run ambient calculation:
-        tdata = Data.from_points(
+        tdata = TData.from_points(
             pts,
             data={
                 v: np.full((n_states, n_steps, 1), np.nan, dtype=FC.DTYPE) for v in vrs