Merge pull request #248 from NREL/develop

FLASC v2.3

Author: paulf81

docs/index.md

@@ -4,6 +4,10 @@
 
 Welcome to the documentation of the NREL FLASC repository!
 
+```{note}
+FLASC v2.3 now requires `numpy` version 2, following the update in FLORIS v4.3. See the [numpy documentation for details](https://numpy.org/doc/stable/numpy_2_0_migration_guide.html).
+```
+
 FLASC provides a rich suite of analysis tools for SCADA data filtering &
 analysis, wind farm model validation, field experiment design, and field
 experiment monitoring. The repository is centrally built around NRELs

flasc/utilities/floris_tools.py

@@ -702,18 +702,18 @@ def yw_upper(x):
                 y = (y0 + D[ii]) + (x - x0) * wake_slope
                 if isinstance(y, (float, np.float64, np.float32)):
                     if x < (x0 + 0.01):
-                        y = -np.Inf
+                        y = -np.inf
                 else:
-                    y[x < x0 + 0.01] = -np.Inf
+                    y[x < x0 + 0.01] = -np.inf
                 return y
 
             def yw_lower(x):
                 y = (y0 - D[ii]) - (x - x0) * wake_slope
                 if isinstance(y, (float, np.float64, np.float32)):
                     if x < (x0 + 0.01):
-                        y = -np.Inf
+                        y = -np.inf
                 else:
-                    y[x < x0 + 0.01] = -np.Inf
+                    y[x < x0 + 0.01] = -np.inf
                 return y
 
             def is_in_wake(xt, yt):
@@ -804,18 +804,18 @@ def yw_upper(x):
                 y = (y0 + D[ii]) + (x - x0) * wake_slope
                 if isinstance(y, (float, np.float64, np.float32)):
                     if x < (x0 + 0.01):
-                        y = -np.Inf
+                        y = -np.inf
                 else:
-                    y[x < x0 + 0.01] = -np.Inf
+                    y[x < x0 + 0.01] = -np.inf
                 return y
 
             def yw_lower(x):
                 y = (y0 - D[ii]) - (x - x0) * wake_slope
                 if isinstance(y, (float, np.float64, np.float32)):
                     if x < (x0 + 0.01):
-                        y = -np.Inf
+                        y = -np.inf
                 else:
-                    y[x < x0 + 0.01] = -np.Inf
+                    y[x < x0 + 0.01] = -np.inf
                 return y
 
             def is_in_wake(xt, yt):

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flasc"
-version = "2.2.1"
+version = "2.3"
 description = "FLASC provides a rich suite of analysis tools for SCADA data filtering & analysis, wind farm model validation, field experiment design, and field experiment monitoring."
 readme = "README.md"
 requires-python = ">=3.9"
@@ -24,11 +24,11 @@ classifiers = [
 ]
 dependencies = [
     "bokeh>=2, <4",
-    "floris~=4.0",
+    "floris~=4.3",
     "feather-format~=0.0",
     "ipympl~=0.9",
     "matplotlib~=3.8",
-    "numpy~=1.20",
+    "numpy~=2.0",
     "pandas~=2.0",
     "SALib~=1.0",
     "scipy~=1.1",

tests/expected_power_analysis_test.py

@@ -4,6 +4,7 @@
 import pandas as pd
 import polars as pl
 from polars.testing import assert_frame_equal
+from pytest import approx
 
 from flasc.analysis.analysis_input import AnalysisInput
 from flasc.analysis.expected_power_analysis import (
@@ -811,3 +812,29 @@ def test_uncertain_intervals():
         epao_standard_var.uplift_results["scada_uplift"]["energy_uplift_ub"]
         >= epao_standard_var.uplift_results["scada_uplift"]["energy_uplift_ctr"]
     )
+
+
+def test_expected_power_var_cov_option():
+    """Test uplift center and variance using cov option when dropping rows with missing vars."""
+    a_in = load_data()
+
+    epao_standard_cov_or_var = total_uplift_expected_power(
+        a_in=a_in,
+        uplift_pairs=[("baseline", "wake_steering")],
+        uplift_names=["scada_uplift"],
+        test_turbines=[0, 1],
+        use_predefined_wd=True,
+        use_predefined_ws=True,
+        wd_step=1.0,
+        wd_min=0.5,
+        ws_min=0.5,
+        use_standard_error=True,
+        cov_terms="cov",
+    )
+
+    expected_uplift_var = (25 + 100 * (35 / 30) ** 2) / (30**2)
+
+    assert epao_standard_cov_or_var.uplift_results["scada_uplift"]["energy_uplift_ctr"] == 7 / 6
+    assert epao_standard_cov_or_var.uplift_results["scada_uplift"]["energy_uplift_var"] == approx(
+        expected_uplift_var
+    )