foxes 1.2.4__tar.gz → 1.2.5__tar.gz

{foxes-1.2.4/foxes.egg-info → foxes-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 1.2.4
+Version: 1.2.5
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Jonas Schulte
 Maintainer: Jonas Schulte
@@ -94,6 +94,8 @@ Requires-Dist: ipykernel; extra == "doc"
 Requires-Dist: ipywidgets; extra == "doc"
 Requires-Dist: m2r2; extra == "doc"
 Requires-Dist: lxml_html_clean; extra == "doc"
+Requires-Dist: dask; extra == "doc"
+Requires-Dist: distributed; extra == "doc"
 Provides-Extra: dev
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{foxes-1.2.4 → foxes-1.2.5}/foxes/input/states/multi_height.py

@@ -200,14 +200,14 @@ class MultiHeightStates(States):
         if not isinstance(self.data_source, pd.DataFrame):
             self._data_source = get_input_path(self.data_source)
             if not self.data_source.is_file():
-                if verbosity:
+                if verbosity > 0:
                     print(
                         f"States '{self.name}': Reading static data '{self.data_source}' from context '{STATES}'"
                     )
                 self._data_source = algo.dbook.get_file_path(
                     STATES, self.data_source.name, check_raw=False
                 )
-                if verbosity:
+                if verbosity > 0:
                     print(f"Path: {self.data_source}")
             elif verbosity:
                 print(f"States '{self.name}': Reading file {self.data_source}")
@@ -627,14 +627,14 @@ class MultiHeightNCStates(MultiHeightStates):
         if not isinstance(self.data_source, Dataset):
             self._data_source = get_input_path(self.data_source)
             if not self.data_source.is_file():
-                if verbosity:
+                if verbosity > 0:
                     print(
                         f"States '{self.name}': Reading static data '{self.data_source}' from context '{STATES}'"
                     )
                 self._data_source = algo.dbook.get_file_path(
                     STATES, self.data_source.name, check_raw=False
                 )
-                if verbosity:
+                if verbosity > 0:
                     print(f"Path: {self.data_source}")
             elif verbosity:
                 print(f"States '{self.name}': Reading file {self.data_source}")

{foxes-1.2.4 → foxes-1.2.5}/foxes/input/states/states_table.py

@@ -217,14 +217,14 @@ class StatesTable(States):
         else:
             self._data_source = get_input_path(self.data_source)
             if not self.data_source.is_file():
-                if verbosity:
+                if verbosity > 0:
                     print(
                         f"States '{self.name}': Reading static data '{self.data_source}' from context '{STATES}'"
                     )
                 self._data_source = algo.dbook.get_file_path(
                     STATES, self.data_source.name, check_raw=False
                 )
-                if verbosity:
+                if verbosity > 0:
                     print(f"Path: {self.data_source}")
             elif verbosity:
                 print(f"States '{self.name}': Reading file {self.data_source}")
@@ -552,14 +552,14 @@ class TabStates(StatesTable):
             if self.__tab_data is None:
                 self.__tab_source = get_input_path(self.__tab_source)
                 if not self.__tab_source.is_file():
-                    if verbosity:
+                    if verbosity > 0:
                         print(
                             f"States '{self.name}': Reading static data '{self.__tab_source}' from context '{STATES}'"
                         )
                     self.__tab_source = algo.dbook.get_file_path(
                         STATES, self.__tab_source.name, check_raw=False
                     )
-                    if verbosity:
+                    if verbosity > 0:
                         print(f"Path: {self.__tab_source}")
                 elif verbosity:
                     print(f"States '{self.name}': Reading file {self.__tab_source}")

foxes-1.2.5/foxes/input/states/wrg_states.py

@@ -0,0 +1,189 @@
+import numpy as np
+
+from foxes.core.states import States
+from foxes.config import config, get_input_path
+from foxes.utils.wrg_utils import ReaderWRG
+from foxes.data import STATES
+import foxes.variables as FV
+import foxes.constants as FC
+
+
+class WRGStates(States):
+    """
+    Ambient states based on WRG data
+
+    Attributes
+    ----------
+    wrg_fname: str
+        Name of the WRG file
+    ws_bins: numpy.ndarray
+        The wind speed bins, including
+        lower and upper bounds, shape: (n_ws_bins+1,)
+    fixed_vars: dict
+        Fixed uniform variable values, instead of
+        reading from data
+    bounds_extra_space: float or str
+        The extra space, either float in m,
+        or str for units of D, e.g. '2.5D'
+
+    :group: input.states
+
+    """
+
+    def __init__(
+        self,
+        wrg_fname,
+        ws_bins,
+        fixed_vars={},
+        bounds_extra_space="1D",
+        **kwargs,
+    ):
+        """
+        Constructor
+
+        Parameters
+        ----------
+        wrg_fname: str
+            Name of the WRG file
+        ws_bins: list of float
+            The wind speed bins, including
+            lower and upper bounds
+        fixed_vars: dict
+            Fixed uniform variable values, instead of
+            reading from data
+        bounds_extra_space: float or str, optional
+            The extra space, either float in m,
+            or str for units of D, e.g. '2.5D'
+        kwargs: dict, optional
+            Parameters for the base class
+
+        """
+        super().__init__(**kwargs)
+        self.wrg_fname = wrg_fname
+        self.ws_bins = np.asarray(ws_bins)
+        self.fixed_vars = fixed_vars
+        self.bounds_extra_space = bounds_extra_space
+
+    def load_data(self, algo, verbosity=0):
+        """
+        Load and/or create all model data that is subject to chunking.
+
+        Such data should not be stored under self, for memory reasons. The
+        data returned here will automatically be chunked and then provided
+        as part of the mdata object during calculations.
+
+        Parameters
+        ----------
+        algo: foxes.core.Algorithm
+            The calculation algorithm
+        verbosity: int
+            The verbosity level, 0 = silent
+
+        Returns
+        -------
+        idata: dict
+            The dict has exactly two entries: `data_vars`,
+            a dict with entries `name_str -> (dim_tuple, data_ndarray)`;
+            and `coords`, a dict with entries `dim_name_str -> dim_array`
+
+        """
+        # read wrg file:
+        fpath = get_input_path(self.wrg_fname)
+        if not fpath.is_file():
+            if verbosity > 0:
+                print(
+                    f"States '{self.name}': Reading static data '{self.wrg_fname}' from context '{STATES}'"
+                )
+            fpath = algo.dbook.get_file_path(STATES, self.wrg_fname, check_raw=False)
+            if verbosity > 0:
+                print(f"Path: {fpath}")
+        elif verbosity:
+            print(f"States '{self.name}': Reading file {fpath}")
+        wrg = ReaderWRG(fpath)
+        self._p0 = np.array([wrg.x0, wrg.y0], dtype=config.dtype_double)
+        self._nx = wrg.nx
+        self._ny = wrg.ny
+        self._ns = wrg.n_sectors
+        self._res = wrg.resolution
+
+        # find bounds:
+        if self.bounds_extra_space is not None:
+            xy_min, xy_max = algo.farm.get_xy_bounds(
+                extra_space=self.bounds_extra_space, algo=algo
+            )
+            if verbosity > 0:
+                print(
+                    f"States '{self.name}': Restricting to bounds {xy_min} - {xy_max}"
+                )
+            xy_min -= self._p0
+            xy_max -= self._p0
+            ij_min = np.asarray(xy_min / self._res, dtype=config.dtype_int)
+            ij_max = np.asarray(xy_max / self._res, dtype=config.dtype_int) + 1
+            sx = slice(ij_min[0], ij_max[0])
+            sy = slice(ij_min[1], ij_max[1])
+        else:
+            sx = np.s_[:]
+            sy = np.s_[:]
+
+        # store data:
+        A = []
+        k = []
+        fs = []
+        for s in range(self._ns):
+            A.append(wrg.data[f"A_{s}"].to_numpy().reshape(self._ny, self._nx)[sy, sx])
+            k.append(wrg.data[f"k_{s}"].to_numpy().reshape(self._ny, self._nx)[sy, sx])
+            fs.append(
+                wrg.data[f"fs_{s}"].to_numpy().reshape(self._ny, self._nx)[sy, sx]
+            )
+        del wrg
+        A = np.stack(A, axis=0).T
+        k = np.stack(k, axis=0).T
+        fs = np.stack(fs, axis=0).T
+        self._data = np.stack([A, k, fs], axis=-1)  # (x, y, wd, AKfs)
+
+        # store ws and wd:
+        self.WSWD = self.var("WSWD")
+        self._wds = np.arange(0.0, 360.0, 360 / self._ns)
+        self._wsd = self.ws_bins[1:] - self.ws_bins[:-1]
+        self._wss = 0.5 * (self.ws_bins[:-1] + self.ws_bins[1:])
+        self._N = len(self._wss) * self._ns
+        wswd = np.zeros((len(self._wss), self._ns, 2), dtype=config.dtype_double)
+        wswd[..., 0] = self._wss[:, None]
+        wswd[..., 1] = self._wds[None, :]
+        wswd = wswd.reshape(self._N, 2)
+        idata = super().load_data(algo, verbosity)
+        idata.coords[self.WSWD] = [self.var(FV.WS), self.var(FV.WD)]
+        idata.data_vars[self.WSWD] = ((FC.STATE, self.WSWD), wswd)
+
+        return idata
+
+    def size(self):
+        """
+        The total number of states.
+
+        Returns
+        -------
+        int:
+            The total number of states
+
+        """
+        return self._N
+
+    def output_point_vars(self, algo):
+        """
+        The variables which are being modified by the model.
+
+        Parameters
+        ----------
+        algo: foxes.core.Algorithm
+            The calculation algorithm
+
+        Returns
+        -------
+        output_vars: list of str
+            The output variable names
+
+        """
+        ovars = set([FV.WS, FV.WD, FV.WEIGHT])
+        ovars.update(self.fixed_vars.values())
+        return list(ovars)

{foxes-1.2.4 → foxes-1.2.5}/foxes/models/wake_models/induction/vortex_sheet.py

@@ -183,12 +183,11 @@ class VortexSheet(TurbineInductionModel):
         sp_sel = (ct > 1e-8) & (x <= 0)
         ct_sel = ct[sp_sel]
         r_sph_sel = r_sph[sp_sel]
-        D_sel = D[sp_sel]
+        R_sel = D[sp_sel] / 2
+        xi = r_sph_sel / R_sel
 
         if np.any(sp_sel):
-            blockage = self.induction.ct2a(ct_sel) * (
-                (1 + 2 * r_sph_sel / D_sel) * (1 + (2 * r_sph_sel / D_sel) ** 2)
-            ) ** (-0.5)
+            blockage = self.induction.ct2a(ct_sel) * (1 + -xi / np.sqrt(1 + xi**2))
 
             self._superp.add_wake(
                 algo,
@@ -208,12 +207,10 @@ class VortexSheet(TurbineInductionModel):
             )  # mirror in rotor plane and inverse blockage, but not directly behind rotor
             ct_sel = ct[sp_sel]
             r_sph_sel = r_sph[sp_sel]
-            D_sel = D[sp_sel]
+            R_sel = D[sp_sel] / 2
+            xi = r_sph_sel / R_sel
             if np.any(sp_sel):
-                blockage = self.induction.ct2a(ct_sel) * (
-                    (1 + 2 * r_sph_sel / D_sel) * (1 + (2 * r_sph_sel / D_sel) ** 2)
-                ) ** (-0.5)
-
+                blockage = self.induction.ct2a(ct_sel) * (1 + -xi / np.sqrt(1 + xi**2))
                 self._superp.add_wake(
                     algo,
                     mdata,

{foxes-1.2.4 → foxes-1.2.5}/foxes/utils/wrg_utils.py

@@ -58,13 +58,18 @@ class ReaderWRG:
         cols[10::3] = cols_sel("Ks", self._n_sectors)
 
         self._data = pd.read_csv(
-            self.fpath, names=cols, skiprows=1, sep="\s+", usecols=range(1, n_cols)
+            self.fpath, names=cols, skiprows=1, sep=r"\s+", usecols=range(1, n_cols)
         )
 
         self._data[cols_sel("fs", self._n_sectors)] /= 10
         self._data[cols_sel("As", self._n_sectors)] /= 10
         self._data[cols_sel("Ks", self._n_sectors)] /= 100
 
+        if len(self._data.index) != self._nx * self._ny:
+            raise ValueError(
+                f"Expecting {self._nx * self._ny} rows in data, got {len(self._data.index)}"
+            )
+
     @property
     def data(self):
         """
@@ -77,3 +82,81 @@ class ReaderWRG:
 
         """
         return self._data
+
+    @property
+    def nx(self):
+        """
+        The number of points in x direction
+
+        Returns
+        -------
+        n: int
+            The number of points in x direction
+
+        """
+        return self._nx
+
+    @property
+    def ny(self):
+        """
+        The number of points in y direction
+
+        Returns
+        -------
+        n: int
+            The number of points in y direction
+
+        """
+        return self._ny
+
+    @property
+    def x0(self):
+        """
+        The lower left x coordinate
+
+        Returns
+        -------
+        x: float
+            The lower left x coordinate
+
+        """
+        return self._utmx0
+
+    @property
+    def y0(self):
+        """
+        The lower left y coordinate
+
+        Returns
+        -------
+        y: float
+            The lower left y coordinate
+
+        """
+        return self._utmy0
+
+    @property
+    def n_sectors(self):
+        """
+        The number of wind direction sectors
+
+        Returns
+        -------
+        n: int
+            The number of wind direction sectors
+
+        """
+        return self._n_sectors
+
+    @property
+    def resolution(self):
+        """
+        The horizontal resolution
+
+        Returns
+        -------
+        res: float
+            The horizontal resolution
+
+        """
+        return self._res

{foxes-1.2.4 → foxes-1.2.5/foxes.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 1.2.4
+Version: 1.2.5
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Jonas Schulte
 Maintainer: Jonas Schulte
@@ -94,6 +94,8 @@ Requires-Dist: ipykernel; extra == "doc"
 Requires-Dist: ipywidgets; extra == "doc"
 Requires-Dist: m2r2; extra == "doc"
 Requires-Dist: lxml_html_clean; extra == "doc"
+Requires-Dist: dask; extra == "doc"
+Requires-Dist: distributed; extra == "doc"
 Provides-Extra: dev
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{foxes-1.2.4 → foxes-1.2.5}/foxes.egg-info/SOURCES.txt

@@ -127,6 +127,7 @@ foxes/input/states/one_point_flow.py
 foxes/input/states/scan.py
 foxes/input/states/single.py
 foxes/input/states/states_table.py
+foxes/input/states/wrg_states.py
 foxes/input/states/create/__init__.py
 foxes/input/states/create/random_abl_states.py
 foxes/input/states/create/random_timeseries.py

{foxes-1.2.4 → foxes-1.2.5}/foxes.egg-info/requires.txt

@@ -30,6 +30,8 @@ ipykernel
 ipywidgets
 m2r2
 lxml_html_clean
+dask
+distributed
 
 [eng]
 h5netcdf

{foxes-1.2.4 → foxes-1.2.5}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "foxes"
-version = "1.2.4"
+version = "1.2.5"
 authors = [
   {name = "Jonas Schulte"},
 ]
@@ -88,6 +88,8 @@ doc = [
     "ipywidgets",
     "m2r2",
     "lxml_html_clean",
+    "dask",
+    "distributed",
 ]
 dev = [
     "flake8",