foxes 0.8.2__py3-none-any.whl → 1.1.0.2__py3-none-any.whl

foxes/models/wake_models/wind/bastankhah14.py

@@ -140,9 +140,9 @@ class Bastankhah2014(GaussianWakeModel):
             downwind_index=downwind_index,
             upcast=True,
         )
-        
+
         # select targets:
-        st_sel = (x > 0) & (ct > 0)
+        st_sel = (x > 1e-8) & (ct > 1e-8)
         if np.any(st_sel):
             # apply selection:
             x = x[st_sel]
@@ -157,8 +157,9 @@ class Bastankhah2014(GaussianWakeModel):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel]
+                upcast=False,
+                selection=st_sel,
+            )
 
             # get k:
             k = self.wake_k(
@@ -167,8 +168,9 @@ class Bastankhah2014(GaussianWakeModel):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel]
+                upcast=False,
+                selection=st_sel,
+            )
 
             # calculate sigma:
             # beta = 0.5 * (1 + np.sqrt(1.0 - ct)) / np.sqrt(1.0 - ct)

foxes/models/wake_models/wind/bastankhah16.py

@@ -146,13 +146,13 @@ class Bastankhah2016Model(Model):
             The k parameter values, shape: (n_states, n_targets)
 
         """
-
         # store parameters:
         out = {self.PARS: self.pars}
         out[self.CHECK] = (
-            mdata[FC.STATE][0],
+            mdata.states_i0(counter=True),
+            mdata.n_states,
             downwind_index,
-            x.shape,
+            hash(x.tobytes()),
         )
 
         # get D:
@@ -180,7 +180,7 @@ class Bastankhah2016Model(Model):
         )
 
         # select targets:
-        st_sel = (x > 0) & (ct > 0.0)
+        st_sel = (x > 1e-8) & (ct > 1e-8)
         if np.any(st_sel):
             # get ws:
             ws = super().get_data(
@@ -191,7 +191,8 @@ class Bastankhah2016Model(Model):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
+                upcast=False,
+                selection=st_sel,
             )
 
             # get TI:
@@ -203,7 +204,8 @@ class Bastankhah2016Model(Model):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
+                upcast=False,
+                selection=st_sel,
             )
 
             # get alpha:
@@ -215,7 +217,8 @@ class Bastankhah2016Model(Model):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
+                upcast=False,
+                selection=st_sel,
             )
 
             # get beta:
@@ -227,19 +230,16 @@ class Bastankhah2016Model(Model):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
+                upcast=False,
+                selection=st_sel,
             )
 
             # apply filter:
             x = x[st_sel]
             D = D[st_sel]
             ct = ct[st_sel]
-            ws = ws[st_sel]
-            ti = ti[st_sel]
             k = k[st_sel]
             gamma = gamma[st_sel]
-            alpha = alpha[st_sel]
-            beta = beta[st_sel]
 
             # calc theta_c0, Eq. (6.12):
             cosg = np.cos(gamma)
@@ -329,7 +329,7 @@ class Bastankhah2016Model(Model):
 
         # update mdata:
         out[self.ST_SEL] = st_sel
-        mdata[self.MDATA_KEY] = out
+        mdata.add(self.MDATA_KEY, out, None)
 
     def has_data(self, mdata, downwind_index, x):
         """
@@ -352,9 +352,10 @@ class Bastankhah2016Model(Model):
 
         """
         check = (
-            mdata[FC.STATE][0],
+            mdata.states_i0(counter=True),
+            mdata.n_states,
             downwind_index,
-            x.shape,
+            hash(x.tobytes()),
         )
         return self.MDATA_KEY in mdata and mdata[self.MDATA_KEY][self.CHECK] == check
 
@@ -551,7 +552,7 @@ class Bastankhah2016(DistSlicedWakeModel):
                 upcast=True,
                 downwind_index=downwind_index,
             )
-            gamma *= np.pi / 180
+            gamma = gamma * np.pi / 180
 
             # get k:
             k = self.wake_k(

foxes/models/wake_models/wind/jensen.py

@@ -88,7 +88,7 @@ class JensenWake(TopHatWakeModel):
             fdata=fdata,
             tdata=tdata,
             downwind_index=downwind_index,
-            upcast=False,
+            upcast=True,
         )
 
         k = self.wake_k(
@@ -156,8 +156,9 @@ class JensenWake(TopHatWakeModel):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel]
+                upcast=False,
+                selection=st_sel,
+            )
             / 2
         )
 

foxes/models/wake_models/wind/turbopark.py

@@ -160,7 +160,7 @@ class TurbOParkWake(GaussianWakeModel):
         )
 
         # select targets:
-        st_sel = (x > 1e-5) & (ct > 0.0)
+        st_sel = (x > 1e-8) & (ct > 1e-8)
         if np.any(st_sel):
             # apply selection:
             x = x[st_sel]
@@ -175,8 +175,9 @@ class TurbOParkWake(GaussianWakeModel):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel]
+                upcast=False,
+                selection=st_sel,
+            )
 
             # get TI:
             ati = self.get_data(
@@ -187,7 +188,8 @@ class TurbOParkWake(GaussianWakeModel):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
+                upcast=False,
+                selection=st_sel,
             )
 
             # get k:
@@ -197,11 +199,10 @@ class TurbOParkWake(GaussianWakeModel):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
                 amb_ti=ati,
-            )[st_sel]
-
-            ati = ati[st_sel]
+                upcast=False,
+                selection=st_sel,
+            )
 
             # calculate sigma:
             # beta = np.sqrt(0.5 * (1 + np.sqrt(1.0 - ct)) / np.sqrt(1.0 - ct))
@@ -443,7 +444,7 @@ class TurbOParkWakeIX(GaussianWakeModel):
         )
 
         # select targets:
-        st_sel = (x > 1e-5) & (ct > 0.0)
+        st_sel = (x > 1e-8) & (ct > 1e-8)
         if np.any(st_sel):
             # apply selection:
             # x = x[st_sel]
@@ -458,8 +459,9 @@ class TurbOParkWakeIX(GaussianWakeModel):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel]
+                upcast=False,
+                selection=st_sel,
+            )
 
             # get k:
             k = self.wake_k(
@@ -468,8 +470,9 @@ class TurbOParkWakeIX(GaussianWakeModel):
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel]
+                upcast=False,
+                selection=st_sel,
+            )
 
             # calculate sigma:
             # beta = np.sqrt(0.5 * (1 + np.sqrt(1.0 - ct)) / np.sqrt(1.0 - ct))

foxes/models/wake_superpositions/ti_linear.py

@@ -63,7 +63,7 @@ class TILinear(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str

foxes/models/wake_superpositions/ti_max.py

@@ -63,7 +63,7 @@ class TIMax(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str

foxes/models/wake_superpositions/ti_pow.py

@@ -70,7 +70,7 @@ class TIPow(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str

foxes/models/wake_superpositions/ti_quadratic.py

@@ -63,7 +63,7 @@ class TIQuadratic(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str

foxes/models/wake_superpositions/ws_linear.py

@@ -7,7 +7,7 @@ import foxes.constants as FC
 
 class WSLinear(WakeSuperposition):
     """
-    Linear supersposition of wind deficit results
+    Linear superposition of wind deficit results
 
     Attributes
     ----------
@@ -94,7 +94,7 @@ class WSLinear(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str
@@ -121,14 +121,15 @@ class WSLinear(WakeSuperposition):
         if np.any(st_sel):
             scale = self.get_data(
                 FV.AMB_REWS if self.scale_amb else FV.REWS,
-                FC.STATE_TARGET,
+                FC.STATE_TARGET_TPOINT,
                 lookup="w",
                 algo=algo,
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel, None]
+                upcast=False,
+                selection=st_sel,
+            )
 
             wake_delta[st_sel] += scale * wake_model_result
 
@@ -182,7 +183,7 @@ class WSLinear(WakeSuperposition):
 
 class WSLinearLocal(WakeSuperposition):
     """
-    Local linear supersposition of wind deficit results
+    Local linear superposition of wind deficit results
 
     Attributes
     ----------
@@ -261,7 +262,7 @@ class WSLinearLocal(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str

foxes/models/wake_superpositions/ws_max.py

@@ -7,7 +7,7 @@ import foxes.constants as FC
 
 class WSMax(WakeSuperposition):
     """
-    Max supersposition of wind deficit results
+    Max superposition of wind deficit results
 
     Attributes
     ----------
@@ -94,7 +94,7 @@ class WSMax(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str
@@ -121,14 +121,15 @@ class WSMax(WakeSuperposition):
         if np.any(st_sel):
             scale = self.get_data(
                 FV.AMB_REWS if self.scale_amb else FV.REWS,
-                FC.STATE_TARGET,
+                FC.STATE_TARGET_TPOINT,
                 lookup="w",
                 algo=algo,
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel, None]
+                upcast=False,
+                selection=st_sel,
+            )
 
             wake_model_result = np.abs(scale * wake_model_result)
             odelta = wake_delta[st_sel]
@@ -185,7 +186,7 @@ class WSMax(WakeSuperposition):
 
 class WSMaxLocal(WakeSuperposition):
     """
-    Local max supersposition of wind deficit results
+    Local max superposition of wind deficit results
 
     Attributes
     ----------
@@ -264,7 +265,7 @@ class WSMaxLocal(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str

foxes/models/wake_superpositions/ws_pow.py

@@ -7,7 +7,7 @@ import foxes.constants as FC
 
 class WSPow(WakeSuperposition):
     """
-    Power supersposition of wind deficit results
+    Power superposition of wind deficit results
 
     Attributes
     ----------
@@ -99,7 +99,7 @@ class WSPow(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str
@@ -126,14 +126,15 @@ class WSPow(WakeSuperposition):
         if np.any(st_sel):
             scale = self.get_data(
                 FV.AMB_REWS if self.scale_amb else FV.REWS,
-                FC.STATE_TARGET,
+                FC.STATE_TARGET_TPOINT,
                 lookup="w",
                 algo=algo,
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel, None]
+                upcast=False,
+                selection=st_sel,
+            )
 
             wake_delta[st_sel] += np.abs(scale * wake_model_result) ** self.pow
 
@@ -187,7 +188,7 @@ class WSPow(WakeSuperposition):
 
 class WSPowLocal(WakeSuperposition):
     """
-    Local power supersposition of wind deficit results
+    Local power superposition of wind deficit results
 
     Attributes
     ----------
@@ -272,7 +273,7 @@ class WSPowLocal(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str

foxes/models/wake_superpositions/ws_product.py

@@ -7,7 +7,7 @@ import foxes.constants as FC
 
 class WSProduct(WakeSuperposition):
     """
-    Product supersposition of wind deficit results
+    Product superposition of wind deficit results
 
     This is based on the idea that the dimensionless
     wind deficit should be rescaled with the wake
@@ -95,7 +95,7 @@ class WSProduct(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str
@@ -119,10 +119,10 @@ class WSProduct(WakeSuperposition):
                 f"Superposition '{self.name}': Expecting wind speed variable, got {variable}"
             )
 
-        if np.any(st_sel):
-            if np.max(np.abs(wake_delta)) < 1e-14:
-                wake_delta[:] = 1
+        if np.max(np.abs(wake_delta)) < 1e-14:
+            wake_delta[:] = 1
 
+        if np.any(st_sel):
             wake_delta[st_sel] *= 1 + wake_model_result
 
         return wake_delta

foxes/models/wake_superpositions/ws_quadratic.py

@@ -7,7 +7,7 @@ import foxes.constants as FC
 
 class WSQuadratic(WakeSuperposition):
     """
-    Quadratic supersposition of wind deficit results
+    Quadratic superposition of wind deficit results
 
     Attributes
     ----------
@@ -94,7 +94,7 @@ class WSQuadratic(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str
@@ -121,14 +121,15 @@ class WSQuadratic(WakeSuperposition):
         if np.any(st_sel):
             scale = self.get_data(
                 FV.AMB_REWS if self.scale_amb else FV.REWS,
-                FC.STATE_TARGET,
+                FC.STATE_TARGET_TPOINT,
                 lookup="w",
                 algo=algo,
                 fdata=fdata,
                 tdata=tdata,
                 downwind_index=downwind_index,
-                upcast=True,
-            )[st_sel, None]
+                upcast=False,
+                selection=st_sel,
+            )
 
             wake_delta[st_sel] += (scale * wake_model_result) ** 2
 
@@ -182,7 +183,7 @@ class WSQuadratic(WakeSuperposition):
 
 class WSQuadraticLocal(WakeSuperposition):
     """
-    Local quadratic supersposition of wind deficit results
+    Local quadratic superposition of wind deficit results
 
     Attributes
     ----------
@@ -261,7 +262,7 @@ class WSQuadraticLocal(WakeSuperposition):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         st_sel: numpy.ndarray of bool
             The selection of targets, shape: (n_states, n_targets)
         variable: str

foxes/output/__init__.py

@@ -16,5 +16,8 @@ from .slice_data import SliceData
 from .rotor_point_plots import RotorPointPlot
 from .state_turbine_table import StateTurbineTable
 
-from .flow_plots_2d import FlowPlots2D, SeqFlowAnimationPlugin
+from .flow_plots_2d import FlowPlots2D
+from .seq_plugins import SeqFlowAnimationPlugin, SeqWakeDebugPlugin
+
 from . import grids
+from . import seq_plugins

foxes/output/farm_layout.py

@@ -138,7 +138,7 @@ class FarmLayoutOutput(Output):
         ----------
         color_by: str, optional
             Set scatter color by variable results.
-            Use "mean_REWS" etc for means, also
+            Use "mean_REWS", etc, for means, also
             min, max, sum. All wrt states
         fontsize: int, optional
             Size of the turbine numbers
@@ -288,8 +288,6 @@ class FarmLayoutOutput(Output):
         """
         Writes the layout plot to file.
 
-        The kwargs are forwarded to self.get_figure
-
         Parameters
         ----------
         file_path: str
@@ -297,6 +295,8 @@ class FarmLayoutOutput(Output):
             for default
         fontsize: int
             Size of the turbine numbers
+        kwargs: dict, optional
+            Additional arguments for get_figure()
 
         """
 
@@ -325,7 +325,7 @@ class FarmLayoutOutput(Output):
         fname = file_path if file_path is not None else self.farm.name + ".xyh"
         np.savetxt(fname, data, header="x y h")
 
-    def write_csv(self, file_path=None):
+    def write_csv(self, file_path=None, type_col=None, algo=None):
         """
         Writes csv layout file.
 
@@ -334,6 +334,10 @@ class FarmLayoutOutput(Output):
         file_path: str
             The file into which to plot, or None
             for default
+        type_col: str, optional
+            Name of the turbine type column
+        algo: foxes.core.Algorithm, optional
+            The algorithm, needed for turbine types
 
         """
 
@@ -341,17 +345,17 @@ class FarmLayoutOutput(Output):
 
         fname = file_path if file_path is not None else self.farm.name + ".csv"
 
-        lyt = pd.DataFrame(
-            index=range(len(data)), columns=["id", "name", "x", "y", "h", "D"]
-        )
+        lyt = pd.DataFrame(index=range(len(data)), columns=["name", "x", "y", "h", "D"])
         lyt.index.name = "index"
-        lyt["id"] = [t.info["id"] for t in self.farm.turbines]
-        lyt["name"] = [t.info["name"] for t in self.farm.turbines]
-        lyt["x"] = data[:, 0]
-        lyt["y"] = data[:, 1]
-        lyt["h"] = data[:, 2]
+        lyt["name"] = [t.name for t in self.farm.turbines]
+        lyt["x"] = np.round(data[:, 0], 4)
+        lyt["y"] = np.round(data[:, 1], 4)
+        lyt["h"] = np.round(data[:, 2], 4)
         lyt["D"] = [t.D for t in self.farm.turbines]
 
+        if type_col is not None:
+            lyt[type_col] = [m.name for m in algo.farm_controller.turbine_types]
+
         lyt.to_csv(fname)
 
     def write_json(self, file_path=None):

foxes/output/farm_results_eval.py

@@ -381,7 +381,7 @@ class FarmResultsEval(Output):
         algo: foxes.core.Algorithm, optional
             The algorithm, for P_nominal lookup
         annual: bool, optional
-            Flag for returing annual results, by default False
+            Flag for returning annual results, by default False
         ambient: bool, optional
             Flag for ambient power, by default False
         hours: int, optional

foxes/output/flow_plots_2d/__init__.py

@@ -1,3 +1,2 @@
 from .flow_plots import FlowPlots2D
-from .seq_flow_ani_plugin import SeqFlowAnimationPlugin
 from .get_fig import get_fig