From 1eb76b1129587d18c1a6aa6807d9a4a8306c0d71 Mon Sep 17 00:00:00 2001
From: paulf81 <paul.fleming@nrel.gov>
Date: Mon, 29 Jan 2024 14:10:25 -0700
Subject: [PATCH] Remove small variations in above rated power (#784)

* Remove small variations in above rated power

* Make matching change in conftest

* Updating floating turbine examples to match 5MW in turbine_library.

* Update descriptions for clarity.

---------

Co-authored-by: misi9170 <michael.sinner@nrel.gov>
---
 .../turbine_files/nrel_5MW_fixed.yaml         | 40 ++++++++---------
 .../turbine_files/nrel_5MW_floating.yaml      | 40 ++++++++---------
 .../nrel_5MW_floating_defined_floating.yaml   | 40 ++++++++---------
 .../nrel_5MW_floating_fixedtilt15.yaml        | 40 ++++++++---------
 .../nrel_5MW_floating_fixedtilt5.yaml         | 40 ++++++++---------
 floris/turbine_library/iea_10MW.yaml          | 21 ++++-----
 floris/turbine_library/iea_15MW.yaml          | 45 ++++++++++---------
 floris/turbine_library/nrel_5MW.yaml          | 41 ++++++++---------
 tests/conftest.py                             | 40 ++++++++---------
 9 files changed, 175 insertions(+), 172 deletions(-)

diff --git a/examples/inputs_floating/turbine_files/nrel_5MW_fixed.yaml b/examples/inputs_floating/turbine_files/nrel_5MW_fixed.yaml
index 917696d90..1a0fb784b 100644
--- a/examples/inputs_floating/turbine_files/nrel_5MW_fixed.yaml
+++ b/examples/inputs_floating/turbine_files/nrel_5MW_fixed.yaml
@@ -42,26 +42,26 @@ power_thrust_table:
     - 4683.419890251577
     - 4806.164748311019
     - 4929.931918769215
-    - 5000.920541636473
-    - 5000.155331018289
-    - 4999.981249947396
-    - 4999.95577837709
-    - 4999.977954833183
-    - 4999.99729673573
-    - 5000.00107322333
-    - 5000.006250888532
-    - 5000.005783964932
-    - 5000.0180481355455
-    - 5000.00295266134
-    - 5000.015689533812
-    - 5000.027006739212
-    - 5000.015694513332
-    - 5000.037874470919
-    - 5000.021829556129
-    - 5000.047786595209
-    - 5000.006722827633
-    - 5000.003398457957
-    - 5000.044012521576
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
     - 0.0
     - 0.0
   thrust_coefficient:
diff --git a/examples/inputs_floating/turbine_files/nrel_5MW_floating.yaml b/examples/inputs_floating/turbine_files/nrel_5MW_floating.yaml
index 1ebee827a..668ff65fa 100644
--- a/examples/inputs_floating/turbine_files/nrel_5MW_floating.yaml
+++ b/examples/inputs_floating/turbine_files/nrel_5MW_floating.yaml
@@ -42,26 +42,26 @@ power_thrust_table:
     - 4683.419890251577
     - 4806.164748311019
     - 4929.931918769215
-    - 5000.920541636473
-    - 5000.155331018289
-    - 4999.981249947396
-    - 4999.95577837709
-    - 4999.977954833183
-    - 4999.99729673573
-    - 5000.00107322333
-    - 5000.006250888532
-    - 5000.005783964932
-    - 5000.0180481355455
-    - 5000.00295266134
-    - 5000.015689533812
-    - 5000.027006739212
-    - 5000.015694513332
-    - 5000.037874470919
-    - 5000.021829556129
-    - 5000.047786595209
-    - 5000.006722827633
-    - 5000.003398457957
-    - 5000.044012521576
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
     - 0.0
     - 0.0
   thrust_coefficient:
diff --git a/examples/inputs_floating/turbine_files/nrel_5MW_floating_defined_floating.yaml b/examples/inputs_floating/turbine_files/nrel_5MW_floating_defined_floating.yaml
index 8b40f916b..7ba75de17 100644
--- a/examples/inputs_floating/turbine_files/nrel_5MW_floating_defined_floating.yaml
+++ b/examples/inputs_floating/turbine_files/nrel_5MW_floating_defined_floating.yaml
@@ -42,26 +42,26 @@ power_thrust_table:
     - 4683.419890251577
     - 4806.164748311019
     - 4929.931918769215
-    - 5000.920541636473
-    - 5000.155331018289
-    - 4999.981249947396
-    - 4999.95577837709
-    - 4999.977954833183
-    - 4999.99729673573
-    - 5000.00107322333
-    - 5000.006250888532
-    - 5000.005783964932
-    - 5000.0180481355455
-    - 5000.00295266134
-    - 5000.015689533812
-    - 5000.027006739212
-    - 5000.015694513332
-    - 5000.037874470919
-    - 5000.021829556129
-    - 5000.047786595209
-    - 5000.006722827633
-    - 5000.003398457957
-    - 5000.044012521576
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
     - 0.0
     - 0.0
   thrust_coefficient:
diff --git a/examples/inputs_floating/turbine_files/nrel_5MW_floating_fixedtilt15.yaml b/examples/inputs_floating/turbine_files/nrel_5MW_floating_fixedtilt15.yaml
index fa5e1f824..4923d4e55 100644
--- a/examples/inputs_floating/turbine_files/nrel_5MW_floating_fixedtilt15.yaml
+++ b/examples/inputs_floating/turbine_files/nrel_5MW_floating_fixedtilt15.yaml
@@ -42,26 +42,26 @@ power_thrust_table:
     - 4683.419890251577
     - 4806.164748311019
     - 4929.931918769215
-    - 5000.920541636473
-    - 5000.155331018289
-    - 4999.981249947396
-    - 4999.95577837709
-    - 4999.977954833183
-    - 4999.99729673573
-    - 5000.00107322333
-    - 5000.006250888532
-    - 5000.005783964932
-    - 5000.0180481355455
-    - 5000.00295266134
-    - 5000.015689533812
-    - 5000.027006739212
-    - 5000.015694513332
-    - 5000.037874470919
-    - 5000.021829556129
-    - 5000.047786595209
-    - 5000.006722827633
-    - 5000.003398457957
-    - 5000.044012521576
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
     - 0.0
     - 0.0
   thrust_coefficient:
diff --git a/examples/inputs_floating/turbine_files/nrel_5MW_floating_fixedtilt5.yaml b/examples/inputs_floating/turbine_files/nrel_5MW_floating_fixedtilt5.yaml
index 917696d90..1a0fb784b 100644
--- a/examples/inputs_floating/turbine_files/nrel_5MW_floating_fixedtilt5.yaml
+++ b/examples/inputs_floating/turbine_files/nrel_5MW_floating_fixedtilt5.yaml
@@ -42,26 +42,26 @@ power_thrust_table:
     - 4683.419890251577
     - 4806.164748311019
     - 4929.931918769215
-    - 5000.920541636473
-    - 5000.155331018289
-    - 4999.981249947396
-    - 4999.95577837709
-    - 4999.977954833183
-    - 4999.99729673573
-    - 5000.00107322333
-    - 5000.006250888532
-    - 5000.005783964932
-    - 5000.0180481355455
-    - 5000.00295266134
-    - 5000.015689533812
-    - 5000.027006739212
-    - 5000.015694513332
-    - 5000.037874470919
-    - 5000.021829556129
-    - 5000.047786595209
-    - 5000.006722827633
-    - 5000.003398457957
-    - 5000.044012521576
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
     - 0.0
     - 0.0
   thrust_coefficient:
diff --git a/floris/turbine_library/iea_10MW.yaml b/floris/turbine_library/iea_10MW.yaml
index 90d5eb64d..33ffdc037 100644
--- a/floris/turbine_library/iea_10MW.yaml
+++ b/floris/turbine_library/iea_10MW.yaml
@@ -1,5 +1,6 @@
 # Data based on:
 # https://github.com/NREL/turbine-models/blob/master/Offshore/IEA_10MW_198_RWT.csv
+# Note: Generator efficiency of 94% used. Small power variations above rated removed.
 turbine_type: 'iea_10MW'
 generator_efficiency: 0.94
 hub_height: 119.0
@@ -24,16 +25,16 @@ power_thrust_table:
     - 7392.13274
     - 8514.32824
     - 9691.10578
-    - 10000.002
-    - 10000.002
-    - 10000.002
-    - 10000.002
-    - 10000.002
-    - 10000.002
-    - 10000.002
-    - 10000.002
-    - 10000.002
-    - 10000.003
+    - 10000.00
+    - 10000.00
+    - 10000.00
+    - 10000.00
+    - 10000.00
+    - 10000.00
+    - 10000.00
+    - 10000.00
+    - 10000.00
+    - 10000.00
     - 0.0
     - 0.0
   thrust_coefficient:
diff --git a/floris/turbine_library/iea_15MW.yaml b/floris/turbine_library/iea_15MW.yaml
index 847145bcd..3da19c654 100644
--- a/floris/turbine_library/iea_15MW.yaml
+++ b/floris/turbine_library/iea_15MW.yaml
@@ -1,6 +1,7 @@
 # Data based on:
 # https://github.com/IEAWindTask37/IEA-15-240-RWT/blob/master/Documentation/
 # IEA-15-240-RWT_tabular.xlsx
+# Note: Small power variations above rated removed.
 turbine_type: 'iea_15MW'
 generator_efficiency: 1.0
 hub_height: 150.0
@@ -43,28 +44,28 @@ power_thrust_table:
     - 10285.211
     - 11617.23699
     - 13194.41511
-    - 15000.0
-    - 15000.00129
-    - 14999.97096
-    - 15000.00934
-    - 15000.00063
-    - 15000.00011
-    - 14999.94712
-    - 15000.08082
-    - 15000.05209
-    - 15000.03592
-    - 15000.02562
-    - 15000.01835
-    - 15000.01281
-    - 15000.00835
-    - 15000.00488
-    - 15000.00233
-    - 15000.00066
-    - 14999.87148
-    - 15000.00047
-    - 15000.00194
-    - 15000.00417
-    - 15000.00688
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
+    - 15000.00
     - 0.0
     - 0.0
   thrust_coefficient:
diff --git a/floris/turbine_library/nrel_5MW.yaml b/floris/turbine_library/nrel_5MW.yaml
index 066eb9b79..2b44977e7 100644
--- a/floris/turbine_library/nrel_5MW.yaml
+++ b/floris/turbine_library/nrel_5MW.yaml
@@ -1,6 +1,7 @@
 # NREL 5MW reference wind turbine.
 # Data based on:
 # https://github.com/NREL/turbine-models/blob/master/Offshore/NREL_5MW_126_RWT_corrected.csv
+# Note: Small power variations above rated removed. Rotor diameter includes coning angle.
 
 ###
 # An ID for this type of turbine definition.
@@ -130,26 +131,26 @@ power_thrust_table:
     - 4683.419890251577
     - 4806.164748311019
     - 4929.931918769215
-    - 5000.920541636473
-    - 5000.155331018289
-    - 4999.981249947396
-    - 4999.95577837709
-    - 4999.977954833183
-    - 4999.99729673573
-    - 5000.00107322333
-    - 5000.006250888532
-    - 5000.005783964932
-    - 5000.0180481355455
-    - 5000.00295266134
-    - 5000.015689533812
-    - 5000.027006739212
-    - 5000.015694513332
-    - 5000.037874470919
-    - 5000.021829556129
-    - 5000.047786595209
-    - 5000.006722827633
-    - 5000.003398457957
-    - 5000.044012521576
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
+    - 5000.00
     - 0.0
     - 0.0
   thrust_coefficient:
diff --git a/tests/conftest.py b/tests/conftest.py
index 65a0144a4..ecd9ab9a9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -243,26 +243,26 @@ def __init__(self):
                     4683.419890251577,
                     4806.164748311019,
                     4929.931918769215,
-                    5000.920541636473,
-                    5000.155331018289,
-                    4999.981249947396,
-                    4999.95577837709,
-                    4999.977954833183,
-                    4999.99729673573,
-                    5000.00107322333,
-                    5000.006250888532,
-                    5000.005783964932,
-                    5000.018048135545,
-                    5000.00295266134,
-                    5000.015689533812,
-                    5000.027006739212,
-                    5000.015694513332,
-                    5000.037874470919,
-                    5000.021829556129,
-                    5000.047786595209,
-                    5000.006722827633,
-                    5000.003398457957,
-                    5000.044012521576,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
+                    5000.00,
                     0.0,
                     0.0,
                 ],