Merge pull request NREL#169 from zerweck/patch-1

Bugfix: Sort frequency for AEP calculations
aduizr · Nov 18, 2020 · 6a0cd05 · 6a0cd05
2 parents ec89c14 + 3a3da83
commit 6a0cd05
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -50,15 +50,15 @@ Citation
 If FLORIS played a role in your research, please cite it. This software can be
 cited as:
 
-   FLORIS. Version 2.2.1 (2020). Available at https://github.com/NREL/floris.
+   FLORIS. Version 2.2.2 (2020). Available at https://github.com/NREL/floris.
 
 For LaTeX users:
 
 .. code-block:: latex
 
     @misc{FLORIS_2020,
     author = {NREL},
-    title = {{FLORIS. Version 2.2.1},
+    title = {{FLORIS. Version 2.2.2},
     year = {2020},
     publisher = {GitHub},
     journal = {GitHub repository},

diff --git a/docs/conf.py b/docs/conf.py
@@ -62,8 +62,8 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-version = "2.2.1"
-release = "2.2.1"
+version = "2.2.2"
+release = "2.2.2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

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

diff --git a/floris/tools/floris_interface.py b/floris/tools/floris_interface.py
@@ -1191,6 +1191,7 @@ def get_farm_AEP(
         inds = np.argsort(ws)
         ws = ws[inds]
         wd = wd[inds]
+        freq = freq[inds]
 
         # keep track of wind speeds where power stops increasing for each wind
         # direction

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@
 EMAIL = "[email protected]"
 AUTHOR = "NREL National Wind Technology Center"
 REQUIRES_PYTHON = ">=3.6.0"
-VERSION = "2.2.1"
+VERSION = "2.2.2"
 
 # What packages are required for this module to be executed?
 REQUIRED = [