foxes 0.6.1__py3-none-any.whl → 0.7__py3-none-any.whl

foxes/models/turbine_types/PCt_file.py

@@ -101,6 +101,10 @@ class PCtFile(TurbineType):
         self.WSP = var_ws_P
         self.rpars = pd_file_read_pars
 
+    def __repr__(self):
+        a = f"D={self.D}, H={self.H}, P_nominal={self.P_nominal}, P_unit={self.P_unit}, rho={self.rho}"
+        return f"{type(self).__name__}({a})"
+
     def output_farm_vars(self, algo):
         """
         The variables which are being modified by the model.
@@ -169,6 +173,83 @@ class PCtFile(TurbineType):
 
         return super().load_data(algo, verbosity)
 
+    def modify_cutin(
+        self,
+        modify_ct,
+        modify_P,
+        steps=20,
+        iterations=100,
+        a=0.55,
+        b=0.55,
+    ):
+        """
+        Modify the data such that a discontinuity
+        at cutin wind speed is avoided
+
+        Parameters
+        ----------
+        variable: str
+            The target variable
+        modify_ct: bool
+            Flag for modification of the ct curve
+        modify_P: bool
+            Flag for modification of the power curve
+        steps: int
+            The number of wind speed steps between 0 and
+            the cutin wind speed
+        iterations: int
+            The number of iterations
+        a: float
+            Coefficient for iterative mixing
+        b: float
+            Coefficient for iterative mixing
+
+        """
+        if modify_ct or modify_P:
+
+            ws = self.data_ws
+            ct = self.data_ct
+            P = self.data_P
+
+            i = 0
+            try:
+                while (
+                    i < len(ws)
+                    and (not modify_ct or ct[i] < 1e-5)
+                    and (not modify_P or P[i] < 0.1)
+                ):
+                    i += 1
+            except IndexError:
+                raise IndexError(
+                    f"Turbine type '{self.name}': Failed not determine cutin wind speed. ws = {ws}, ct = {ct}, P = {P}"
+                )
+
+            if ws[i] > 0:
+                ws = ws[i:]
+                ct = ct[i:]
+                P = P[i:]
+
+                new_ws = np.linspace(0.0, ws[0], steps + 1, dtype=ws.dtype)
+                new_ct = np.zeros_like(new_ws)
+                new_P = np.zeros_like(new_ws)
+
+                if modify_ct:
+                    new_ct[-1] = ct[0]
+                    for it in range(iterations):
+                        new_ct[1:-1] = a * new_ct[:-2] + (1 - a) * new_ct[2:]
+
+                if modify_P:
+                    new_P[-1] = P[0]
+                    for it in range(iterations):
+                        new_P[1:-1] = b * new_P[:-2] + (1 - b) * new_P[2:]
+
+                self.data_ws = np.concatenate([new_ws[:-1], ws], axis=0)
+                self.data_ct = np.concatenate([new_ct[:-1], ct], axis=0)
+                self.data_P = np.concatenate([new_P[:-1], P], axis=0)
+
+        else:
+            super().modify_cutin(modify_ct, modify_P)
+
     def calculate(self, algo, mdata, fdata, st_sel):
         """ "
         The main model calculation.
@@ -180,9 +261,9 @@ class PCtFile(TurbineType):
         ----------
         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
         st_sel: numpy.ndarray of bool
             The state-turbine selection,
@@ -204,7 +285,7 @@ class PCtFile(TurbineType):
             # that in the partial load region the
             # correct value is reconstructed:
             rho = fdata[FV.RHO][st_sel]
-            rews2 *= (self.rho / rho) ** 0.5
+            # rews2 *= (self.rho / rho) ** 0.5
             rews3 *= (self.rho / rho) ** (1.0 / 3.0)
             del rho
 

foxes/models/turbine_types/PCt_from_two.py

@@ -121,6 +121,10 @@ class PCtFromTwo(TurbineType):
         self._data_ws_P = None
         self._data_ws_ct = None
 
+    def __repr__(self):
+        a = f"D={self.D}, H={self.H}, P_nominal={self.P_nominal}, P_unit={self.P_unit}, rho={self.rho}"
+        return f"{type(self).__name__}({a})"
+
     def output_farm_vars(self, algo):
         """
         The variables which are being modified by the model.
@@ -203,9 +207,9 @@ class PCtFromTwo(TurbineType):
         ----------
         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
         st_sel: numpy.ndarray of bool
             The state-turbine selection,
@@ -227,7 +231,7 @@ class PCtFromTwo(TurbineType):
             # that in the partial load region the
             # correct value is reconstructed:
             rho = fdata[FV.RHO][st_sel]
-            rews2 *= (self.rho / rho) ** 0.5
+            # rews2 *= (self.rho / rho) ** 0.5
             rews3 *= (self.rho / rho) ** (1.0 / 3.0)
             del rho
 

foxes/models/turbine_types/null_type.py

@@ -37,9 +37,9 @@ class NullType(TurbineType):
         ----------
         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
         st_sel: numpy.ndarray of bool
             The state-turbine selection,

foxes/models/turbine_types/wsrho2PCt_from_two.py

@@ -215,9 +215,9 @@ class WsRho2PCtFromTwo(TurbineType):
         ----------
         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
         st_sel: numpy.ndarray of bool
             The state-turbine selection,

foxes/models/turbine_types/wsti2PCt_from_two.py

@@ -123,6 +123,10 @@ class WsTI2PCtFromTwo(TurbineType):
         self._P = None
         self._ct = None
 
+    def __repr__(self):
+        a = f"D={self.D}, H={self.H}, P_nominal={self.P_nominal}, P_unit={self.P_unit}, rho={self.rho}"
+        return f"{type(self).__name__}({a})"
+
     def output_farm_vars(self, algo):
         """
         The variables which are being modified by the model.
@@ -223,9 +227,9 @@ class WsTI2PCtFromTwo(TurbineType):
         ----------
         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
         st_sel: numpy.ndarray of bool
             The state-turbine selection,

foxes/models/wake_frames/farm_order.py

@@ -59,9 +59,9 @@ class FarmOrder(WakeFrame):
         ----------
         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
@@ -75,36 +75,41 @@ class FarmOrder(WakeFrame):
 
         return order
 
-    def get_wake_coos(self, algo, mdata, fdata, pdata, states_source_turbine):
+    def get_wake_coos(
+        self,
+        algo,
+        mdata,
+        fdata,
+        tdata,
+        downwind_index,
+    ):
         """
-        Calculate wake coordinates.
+        Calculate wake coordinates of rotor points.
 
         Parameters
         ----------
         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
-        pdata: foxes.core.Data
-            The evaluation point data
-        states_source_turbine: numpy.ndarray
-            For each state, one turbine index for the
-            wake causing turbine. Shape: (n_states,)
+        tdata: foxes.core.TData
+            The target point data
+        downwind_index: int
+            The index of the wake causing turbine
+            in the downwnd order
 
         Returns
         -------
         wake_coos: numpy.ndarray
             The wake frame coordinates of the evaluation
-            points, shape: (n_states, n_points, 3)
+            points, shape: (n_states, n_targets, n_tpoints, 3)
 
         """
-        return self.base_frame.get_wake_coos(
-            algo, mdata, fdata, pdata, states_source_turbine
-        )
+        return self.base_frame.get_wake_coos(algo, mdata, fdata, tdata, downwind_index)
 
-    def get_centreline_points(self, algo, mdata, fdata, states_source_turbine, x):
+    def get_centreline_points(self, algo, mdata, fdata, downwind_index, x):
         """
         Gets the points along the centreline for given
         values of x.
@@ -113,13 +118,12 @@ class FarmOrder(WakeFrame):
         ----------
         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
-        states_source_turbine: numpy.ndarray
-            For each state, one turbine index for the
-            wake causing turbine. Shape: (n_states,)
+        downwind_index: int
+            The index in the downwind order
         x: numpy.ndarray
             The wake frame x coordinates, shape: (n_states, n_points)
 
@@ -130,5 +134,5 @@ class FarmOrder(WakeFrame):
 
         """
         return self.base_frame.get_centreline_points(
-            algo, mdata, fdata, states_source_turbine, x
+            algo, mdata, fdata, downwind_index, x
         )

foxes/models/wake_frames/rotor_wd.py

@@ -44,9 +44,9 @@ class RotorWD(WakeFrame):
         ----------
         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
@@ -57,45 +57,50 @@ class RotorWD(WakeFrame):
         """
         n = np.mean(wd2uv(fdata[self.var_wd], axis=1), axis=-1)
         xy = fdata[FV.TXYH][:, :, :2]
-
         order = np.argsort(np.einsum("std,sd->st", xy, n), axis=-1)
 
         return order
 
-    def get_wake_coos(self, algo, mdata, fdata, pdata, states_source_turbine):
+    def get_wake_coos(
+        self,
+        algo,
+        mdata,
+        fdata,
+        tdata,
+        downwind_index,
+    ):
         """
-        Calculate wake coordinates.
+        Calculate wake coordinates of rotor points.
 
         Parameters
         ----------
         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
-        pdata: foxes.core.Data
-            The evaluation point data
-        states_source_turbine: numpy.ndarray
-            For each state, one turbine index for the
-            wake causing turbine. Shape: (n_states,)
+        tdata: foxes.core.TData
+            The target point data
+        downwind_index: int
+            The index of the wake causing turbine
+            in the downwnd order
 
         Returns
         -------
         wake_coos: numpy.ndarray
             The wake frame coordinates of the evaluation
-            points, shape: (n_states, n_points, 3)
+            points, shape: (n_states, n_targets, n_tpoints, 3)
 
         """
-        points = pdata[FC.POINTS]
-        n_states = mdata.n_states
-        stsel = (np.arange(n_states), states_source_turbine)
+        n_states = tdata.n_states
+        targets = tdata[FC.TARGETS]
 
-        xyz = fdata[FV.TXYH][stsel]
-        delta = points - xyz[:, None, :]
+        xyz = fdata[FV.TXYH][:, downwind_index]
+        delta = targets - xyz[:, None, None, :]
         del xyz
 
-        wd = fdata[self.var_wd][stsel]
+        wd = fdata[self.var_wd][:, downwind_index]
 
         nax = np.zeros((n_states, 3, 3), dtype=FC.DTYPE)
         n = nax[:, 0, :2]
@@ -105,11 +110,11 @@ class RotorWD(WakeFrame):
         nax[:, 2, 2] = 1
         del wd
 
-        coos = np.einsum("spd,sad->spa", delta, nax)
+        coos = np.einsum("stpd,sad->stpa", delta, nax)
 
         return coos
 
-    def get_centreline_points(self, algo, mdata, fdata, states_source_turbine, x):
+    def get_centreline_points(self, algo, mdata, fdata, downwind_index, x):
         """
         Gets the points along the centreline for given
         values of x.
@@ -118,13 +123,12 @@ class RotorWD(WakeFrame):
         ----------
         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
-        states_source_turbine: numpy.ndarray
-            For each state, one turbine index for the
-            wake causing turbine. Shape: (n_states,)
+        downwind_index: int
+            The index in the downwind order
         x: numpy.ndarray
             The wake frame x coordinates, shape: (n_states, n_points)
 
@@ -134,11 +138,8 @@ class RotorWD(WakeFrame):
             The centreline points, shape: (n_states, n_points, 3)
 
         """
-        n_states = mdata.n_states
-        stsel = (np.arange(n_states), states_source_turbine)
-
-        wd = fdata[self.var_wd][stsel]
+        wd = fdata[self.var_wd][:, downwind_index]
         n = np.append(wd2uv(wd, axis=-1), np.zeros_like(wd)[:, None], axis=-1)
 
-        xyz = fdata[FV.TXYH][stsel]
+        xyz = fdata[FV.TXYH][:, downwind_index]
         return xyz[:, None, :] + x[:, :, None] * n[:, None, :]