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

foxes/core/farm_controller.py

@@ -4,6 +4,7 @@ from .farm_data_model import FarmDataModelList, FarmDataModel
 from .turbine_model import TurbineModel
 from .turbine_type import TurbineType
 import foxes.constants as FC
+import foxes.variables as FV
 
 
 class FarmController(FarmDataModel):
@@ -45,7 +46,6 @@ class FarmController(FarmDataModel):
         self.turbine_model_names = None
         self.pre_rotor_models = None
         self.post_rotor_models = None
-
         self.pars = pars
 
     def sub_models(self):
@@ -85,6 +85,36 @@ class FarmController(FarmDataModel):
             "final": final_pars,
         }
 
+    def needs_rews2(self):
+        """
+        Returns flag for requiring REWS2 variable
+
+        Returns
+        -------
+        flag: bool
+            True if REWS2 is required
+
+        """
+        for tt in self.turbine_types:
+            if tt.needs_rews2():
+                return True
+        return False
+
+    def needs_rews3(self):
+        """
+        Returns flag for requiring REWS3 variable
+
+        Returns
+        -------
+        flag: bool
+            True if REWS3 is required
+
+        """
+        for tt in self.turbine_types:
+            if tt.needs_rews3():
+                return True
+        return False
+
     def _analyze_models(self, algo, pre_rotor, models):
         """
         Helper function for model analysis
@@ -128,11 +158,11 @@ class FarmController(FarmDataModel):
                         break
 
         if pre_rotor:
-            self.pre_rotor_models = FarmDataModelList(tmodels)
+            self.pre_rotor_models = FarmDataModelList(models=tmodels)
             self.pre_rotor_models.name = f"{self.name}_prer"
             mtype = "pre-rotor"
         else:
-            self.post_rotor_models = FarmDataModelList(tmodels)
+            self.post_rotor_models = FarmDataModelList(models=tmodels)
             self.post_rotor_models.name = f"{self.name}_postr"
             mtype = "post-rotor"
 
@@ -312,15 +342,13 @@ class FarmController(FarmDataModel):
             The output variable names
 
         """
-        return list(
-            dict.fromkeys(
-                self.pre_rotor_models.output_farm_vars(algo)
-                + self.post_rotor_models.output_farm_vars(algo)
-            )
-        )
+        ovars = set(self.pre_rotor_models.output_farm_vars(algo))
+        ovars.update(self.post_rotor_models.output_farm_vars(algo))
+
+        return list(ovars)
 
     def calculate(self, algo, mdata, fdata, pre_rotor, downwind_index=None):
-        """ "
+        """
         The main model calculation.
 
         This function is executed on a single chunk of data,

foxes/core/farm_data_model.py

@@ -52,6 +52,18 @@ class FarmDataModel(DataCalcModel):
         """
         return []
 
+    def output_coords(self):
+        """
+        Gets the coordinates of all output arrays
+
+        Returns
+        -------
+        dims: tuple of str
+            The coordinates of all output arrays
+
+        """
+        return (FC.STATE, FC.TURBINE)
+
     def ensure_variables(self, algo, mdata, fdata):
         """
         Add variables to fdata, initialized with NaN
@@ -75,7 +87,7 @@ class FarmDataModel(DataCalcModel):
 
     @abstractmethod
     def calculate(self, algo, mdata, fdata):
-        """ "
+        """
         The main model calculation.
 
         This function is executed on a single chunk of data,
@@ -171,6 +183,9 @@ class FarmDataModelList(FarmDataModel):
         super().__init__()
         self.models = models
 
+    def __repr__(self):
+        return f"{type(self).__name__}({[m.name for m in self.models]})"
+
     def append(self, model):
         """
         Add a model to the list

foxes/core/ground_model.py

@@ -70,7 +70,7 @@ class GroundModel(Model):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         wake_deltas: dict
             The wake deltas. Key: variable name,
             value: numpy.ndarray with shape
@@ -207,7 +207,7 @@ class GroundModel(Model):
             The target point data
         downwind_index: int
             The index of the wake causing turbine
-            in the downwnd order
+            in the downwind order
         wake_deltas: dict
             The wake deltas. Key: variable name,
             value: numpy.ndarray with shape