Bug fix: GCH effective yaw angle in FLORIS v2 (#734)

NREL · Dec 8, 2023 · 00a40e9 · 00a40e9
1 parent 6e856e5
commit 00a40e9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/continuous-integration-workflow.yaml b/.github/workflows/continuous-integration-workflow.yaml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         # 3.5 fails with a bad comparison in TurbineMap unit tests
-        python-version: [3.6, 3.7, 3.8, 3.9] # 3.5
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         # windows-latest fails in codecov
         os: [ubuntu-latest, macos-latest]
       fail-fast: False
@@ -60,4 +60,4 @@ jobs:
       uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: true
+        fail_ci_if_error: false
diff --git a/README.rst b/README.rst
@@ -55,15 +55,15 @@ Citation
 If FLORIS played a role in your research, please cite it. This software can be
 cited as:
 
-   FLORIS. Version 2.4 (2021). Available at https://github.com/NREL/floris.
+   FLORIS. Version 2.5.1 (2021). Available at https://github.com/NREL/floris.
 
 For LaTeX users:
 
 .. code-block:: latex
 
     @misc{FLORIS_2021,
     author = {NREL},
-    title = {FLORIS. Version 2.4},
+    title = {FLORIS. Version 2.5.1},
     year = {2021},
     publisher = {GitHub},
     journal = {GitHub repository},

diff --git a/docs/index.rst b/docs/index.rst
@@ -74,15 +74,15 @@ Citation
 If FLORIS played a role in your research, please cite it. This software can be
 cited as:
 
-   FLORIS. Version 2.4 (2021). Available at https://github.com/NREL/floris.
+   FLORIS. Version 2.5.1 (2021). Available at https://github.com/NREL/floris.
 
 For LaTeX users:
 
 .. code-block:: latex
 
     @misc{FLORIS_2021,
     author = {NREL},
-    title = {FLORIS. Version 2.4},
+    title = {FLORIS. Version 2.5.1},
     year = {2021},
     publisher = {GitHub},
     journal = {GitHub repository},

diff --git a/floris/VERSION b/floris/VERSION
@@ -1 +1 @@
-2.4
+2.5.1
diff --git a/floris/simulation/wake_deflection/gauss.py b/floris/simulation/wake_deflection/gauss.py
@@ -348,7 +348,7 @@ def calculate_effective_yaw_angle(
                 yaw_effective = max_yaw
             # check edge case, if true, assign min yaw value
             elif idx_1 == 0 or idx_2 == 0:
-                yaw_effective = -min_yaw
+                yaw_effective = min_yaw
             # for each identified minimum residual, use adjacent points to determine
             # two equations of line and find the intersection of the two lines to
             # determine the effective yaw angle to add; the if/else structure is based

diff --git a/requirements.txt b/requirements.txt
@@ -10,7 +10,7 @@ scipy>=1.1
 pandas>=0.24
 pyproj>=2.1
 seaborn>=0.9
-sklearn>=0.0
+scikit-learn
 shapely>=1.7.1
 
 # utilities

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@
 URL = "https://github.com/NREL/FLORIS"
 EMAIL = "rafael.mudafort@nrel.gov"
 AUTHOR = "NREL National Wind Technology Center"
-REQUIRES_PYTHON = ">=3.6.0"
+REQUIRES_PYTHON = ">=3.8.0"
 
 # What packages are required for this module to be executed?
 REQUIRED = [
@@ -48,7 +48,7 @@
     "pandas>=0.24",
     "pyproj>=2.1",
     "seaborn>=0.9",
-    "sklearn>=0.0",
+    "scikit-learn",
     "shapely>=1.7.1",
 ]
 
@@ -105,7 +105,7 @@
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],