Updating 15mw based on https://github.com/IEAWindTask37/IEA-15-240-RW…

…T/blob/master/Documentation/IEA-15-240-RWT_tabular.xlsx
misi9170 · Dec 14, 2023 · 8590d22 · 8590d22
1 parent c120467
commit 8590d22
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 103 deletions.
diff --git a/examples/18_check_turbine.py b/examples/18_check_turbine.py
@@ -48,7 +48,8 @@
 ]
 
 # TEMPORARY
-turbines = [turbines[2]]
+print(turbines)
+turbines = turbines[2:]
 # END TEMPORARY
 
 # Declare a set of figures for comparing cp and ct across models

diff --git a/floris/simulation/turbine.py b/floris/simulation/turbine.py
@@ -594,7 +594,6 @@ def check_power_thrust_table(self, instance: attrs.Attribute, value: dict) -> No
         to the wind speed array.
         """
         if len(value.keys()) != 3 or set(value.keys()) != {"wind_speed", "power", "thrust_coefficient"}:
-            import ipdb; ipdb.set_trace()
             raise ValueError(
                 """
                 power_thrust_table dictionary must have the form:

diff --git a/floris/turbine_library/iea_15MW.yaml b/floris/turbine_library/iea_15MW.yaml
@@ -10,110 +10,110 @@ ref_tilt_cp_ct: 6.0
 power_thrust_table:
   power:
     - 0.000000
-    - 0.049361236
-    - 0.224324252
-    - 0.312216418
-    - 0.36009987
-    - 0.38761204
-    - 0.404010164
-    - 0.413979324
-    - 0.420083692
-    - 0.423787764
-    - 0.425977895
-    - 0.427193272
-    - 0.427183505
-    - 0.426860928
-    - 0.426617959
-    - 0.426458783
-    - 0.426385957
-    - 0.426371389
-    - 0.426268826
-    - 0.426077456
-    - 0.425795302
-    - 0.425420049
-    - 0.424948854
-    - 0.424379028
-    - 0.423707714
-    - 0.422932811
-    - 0.422052556
-    - 0.421065815
-    - 0.419972455
-    - 0.419400676
-    - 0.418981957
-    - 0.385839135
-    - 0.335840083
-    - 0.29191329
-    - 0.253572514
-    - 0.220278082
-    - 0.191477908
-    - 0.166631343
-    - 0.145236797
-    - 0.126834289
-    - 0.111011925
-    - 0.097406118
-    - 0.085699408
-    - 0.075616912
-    - 0.066922115
-    - 0.059412477
-    - 0.052915227
-    - 0.04728299
-    - 0.042390922
-    - 0.038132739
-    - 0.03441828
+    - 42.733312
+    - 292.585981
+    - 607.966543
+    - 981.097693
+    - 1401.98084
+    - 1858.67086
+    - 2337.575997
+    - 2824.097302
+    - 3303.06456
+    - 3759.432328
+    - 4178.637714
+    - 4547.19121
+    - 4855.342682
+    - 5091.537139
+    - 5248.453137
+    - 5320.793207
+    - 5335.345498
+    - 5437.90563
+    - 5631.253025
+    - 5920.980626
+    - 6315.115602
+    - 6824.470067
+    - 7462.846389
+    - 8238.359448
+    - 9167.96703
+    - 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
     - 0.0
     - 0.0
-  thrust:
+  thrust_coefficient:
     - 0.000000
-    - 0.817533319
-    - 0.792115292
-    - 0.786401899
-    - 0.788898744
-    - 0.790774576
-    - 0.79208669
-    - 0.79185809
-    - 0.7903853
-    - 0.788253035
-    - 0.785845184
-    - 0.783367164
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.77853469
-    - 0.781531069
-    - 0.758935311
-    - 0.614478855
-    - 0.498687801
-    - 0.416354609
-    - 0.351944846
-    - 0.299832337
-    - 0.256956606
-    - 0.221322169
-    - 0.19150758
-    - 0.166435523
-    - 0.145263684
-    - 0.127319849
-    - 0.11206048
-    - 0.099042189
-    - 0.087901155
-    - 0.078337446
-    - 0.07010295
-    - 0.062991402
-    - 0.056831647
-    - 0.05148062
-    - 0.046818787
+    - 0.80742173
+    - 0.784655297
+    - 0.781771245
+    - 0.785377072
+    - 0.788045584
+    - 0.789922119
+    - 0.790464625
+    - 0.789868339
+    - 0.788727582
+    - 0.787359348
+    - 0.785895402
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.778275899
+    - 0.77176172
+    - 0.747149663
+    - 0.562338457
+    - 0.463477777
+    - 0.389083718
+    - 0.329822385
+    - 0.281465071
+    - 0.241494345
+    - 0.208180574
+    - 0.180257568
+    - 0.156747535
+    - 0.136877529
+    - 0.120026379
+    - 0.105689427
+    - 0.093453742
+    - 0.082979637
+    - 0.073986457
+    - 0.066241166
+    - 0.059552107
+    - 0.053756866
+    - 0.048721662
+    - 0.044334197
     - 0.0
     - 0.0
   wind_speed: