Update to more flexible turbine operation model definitions

examples/18_check_turbine.py

@@ -49,7 +49,14 @@
 
 # TEMPORARY
 print(turbines)
-turbines = turbines[1:]
+turbines = [
+    t for t in turbines
+    if "converted" not in t
+    if "updated" not in t
+    if "legacy" not in t
+    if t != "x_20MW"
+]
+print(turbines)
 # END TEMPORARY
 
 # Declare a set of figures for comparing cp and ct across models

examples/24_floating_turbine_models.py

@@ -67,9 +67,11 @@
 power_floating_defined_floating = fi_floating_defined_floating.get_turbine_powers().flatten()/1000.
 
 # Grab Ct
-ct_fixed = fi_fixed.get_turbine_Cts().flatten()
-ct_floating = fi_floating.get_turbine_Cts().flatten()
-ct_floating_defined_floating = fi_floating_defined_floating.get_turbine_Cts().flatten()
+ct_fixed = fi_fixed.get_turbine_thrust_coefficients().flatten()
+ct_floating = fi_floating.get_turbine_thrust_coefficients().flatten()
+ct_floating_defined_floating = (
+    fi_floating_defined_floating.get_turbine_thrust_coefficients().flatten()
+)
 
 # Grab turbine tilt angles
 eff_vels = fi_fixed.turbine_average_velocities

examples/30_multi_dimensional_cp_ct.py

@@ -72,7 +72,7 @@
 fi.calculate_wake(yaw_angles=yaw_angles)
 
 # Get the turbine powers
-turbine_powers = fi.get_turbine_powers_multidim() / 1000.0
+turbine_powers = fi.get_turbine_powers() / 1000.0
 print("The turbine power matrix should be of dimensions 1 findex X 2 Turbines")
 print(turbine_powers)
 print("Shape: ",turbine_powers.shape)
@@ -86,7 +86,7 @@
 fi.reinitialize(wind_speeds=wind_speeds, wind_directions=wind_directions)
 yaw_angles = np.zeros([3, 2])  # 3 wind directions/ speeds, 2 turbines
 fi.calculate_wake(yaw_angles=yaw_angles)
-turbine_powers = fi.get_turbine_powers_multidim() / 1000.0
+turbine_powers = fi.get_turbine_powers() / 1000.0
 print("The turbine power matrix should be of dimensions 3 findex X 2 Turbines")
 print(turbine_powers)
 print("Shape: ",turbine_powers.shape)
@@ -100,7 +100,7 @@
 fi.reinitialize(wind_directions=wind_directions, wind_speeds=wind_speeds)
 yaw_angles = np.zeros([9, 2])  # 9 wind directions/ speeds, 2 turbines
 fi.calculate_wake(yaw_angles=yaw_angles)
-turbine_powers = fi.get_turbine_powers_multidim()/1000.
+turbine_powers = fi.get_turbine_powers()/1000.
 print("The turbine power matrix should be of dimensions 9 WD/WS X 2 Turbines")
 print(turbine_powers)
 print("Shape: ",turbine_powers.shape)

examples/31_multi_dimensional_cp_ct_2Hs.py

@@ -56,8 +56,8 @@
 fi_hs_1.calculate_wake()
 
 # Collect the turbine powers in kW
-turbine_powers = fi.get_turbine_powers_multidim()/1000.
-turbine_powers_hs_1 = fi_hs_1.get_turbine_powers_multidim()/1000.
+turbine_powers = fi.get_turbine_powers()/1000.
+turbine_powers_hs_1 = fi_hs_1.get_turbine_powers()/1000.
 
 # Plot the power in each case and the difference in power
 fig, axarr = plt.subplots(1,3,sharex=True,figsize=(12,4))

examples/33_specify_turbine_power_curve.py

@@ -16,8 +16,8 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from floris.simulation import turbine
-from floris.tools import build_turbine_dict, FlorisInterface
+from floris.tools import FlorisInterface
+from floris.turbine_library import build_cosine_loss_turbine_dict
 
 
 """
@@ -39,7 +39,7 @@
     "thrust_coefficient":[0, 0.9, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.25, 0.2]
 }
 
-turbine_dict = build_turbine_dict(
+turbine_dict = build_cosine_loss_turbine_dict(
     turbine_data_dict,
     "example_turbine",
     file_name=None,
@@ -70,7 +70,7 @@
 
 specified_powers = (
     np.array(turbine_data_dict["power_coefficient"])
-    *0.5*turbine_dict["ref_air_density"]
+    *0.5*turbine_dict["power_thrust_table"]["ref_air_density"]
     *turbine_dict["rotor_diameter"]**2*np.pi/4
     *np.array(turbine_data_dict["wind_speed"])**3
 )/1000

examples/inputs_floating/turbine_files/nrel_5MW_fixed.yaml

@@ -1,67 +1,67 @@
 turbine_type: 'nrel_5MW_floating'
 generator_efficiency: 1.0
 hub_height: 90.0
-pP: 1.88
-pT: 1.88
 rotor_diameter: 126.0
 TSR: 8.0
-ref_density_cp_ct: 1.225
-ref_tilt_cp_ct: 5.0
 correct_cp_ct_for_tilt: True # Apply tilt correction to cp/ct
 power_thrust_table:
+  ref_air_density: 1.225
+  ref_tilt: 5.0
+  pP: 1.88
+  pT: 1.88
   power:
     - 0.0
-    - 0.000000
-    - 0.000000
-    - 0.178085
-    - 0.289075
-    - 0.349022
-    - 0.384728
-    - 0.406059
-    - 0.420228
-    - 0.428823
-    - 0.433873
-    - 0.436223
-    - 0.436845
-    - 0.436575
-    - 0.436511
-    - 0.436561
-    - 0.436517
-    - 0.435903
-    - 0.434673
-    - 0.433230
-    - 0.430466
-    - 0.378869
-    - 0.335199
-    - 0.297991
-    - 0.266092
-    - 0.238588
-    - 0.214748
-    - 0.193981
-    - 0.175808
-    - 0.159835
-    - 0.145741
-    - 0.133256
-    - 0.122157
-    - 0.112257
-    - 0.103399
-    - 0.095449
-    - 0.088294
-    - 0.081836
-    - 0.075993
-    - 0.070692
-    - 0.065875
-    - 0.061484
-    - 0.057476
-    - 0.053809
-    - 0.050447
-    - 0.047358
-    - 0.044518
-    - 0.041900
-    - 0.039483
     - 0.0
     - 0.0
-  thrust:
+    - 36.722155848902254
+    - 94.65678115354163
+    - 170.596391826316
+    - 267.74933496419163
+    - 387.64681352354114
+    - 533.9617151673435
+    - 707.4062402827329
+    - 909.9965782677073
+    - 1142.7197798534328
+    - 1407.4994184495558
+    - 1707.1272243371227
+    - 2047.3355806543098
+    - 2430.5778091805637
+    - 2858.3081150622215
+    - 3329.100627354195
+    - 3842.9755943182267
+    - 4403.86140594055
+    - 4999.993508066915
+    - 4999.99850473839
+    - 4999.997854617397
+    - 5000.00304890274
+    - 5000.002113339491
+    - 4999.997282778227
+    - 5000.002243172759
+    - 5000.000360590384
+    - 5000.009074693787
+    - 4999.987262704901
+    - 5000.007345811091
+    - 5000.006875165497
+    - 4999.994990648268
+    - 4999.97705933755
+    - 4999.983698972648
+    - 4999.991318085188
+    - 5000.024022703328
+    - 5000.016589748782
+    - 5000.025709581146
+    - 4999.944891236294
+    - 5000.035324880168
+    - 4999.967955734346
+    - 5000.013248451465
+    - 5000.063199891701
+    - 5000.068982245371
+    - 4999.9325188896555
+    - 5000.011035557985
+    - 5000.012771123277
+    - 4717.243379938609
+    - 0.0
+    - 0.0
+  thrust_coefficient:
     - 0.0
     - 0.0
     - 0.0

examples/inputs_floating/turbine_files/nrel_5MW_floating.yaml

@@ -1,67 +1,67 @@
 turbine_type: 'nrel_5MW_floating'
 generator_efficiency: 1.0
 hub_height: 90.0
-pP: 1.88
-pT: 1.88
 rotor_diameter: 126.0
 TSR: 8.0
-ref_density_cp_ct: 1.225
-ref_tilt_cp_ct: 5.0
 correct_cp_ct_for_tilt: True # Apply tilt correction to cp/ct
 power_thrust_table:
+  ref_air_density: 1.225
+  ref_tilt: 5.0
+  pP: 1.88
+  pT: 1.88
   power:
     - 0.0
-    - 0.000000
-    - 0.000000
-    - 0.178085
-    - 0.289075
-    - 0.349022
-    - 0.384728
-    - 0.406059
-    - 0.420228
-    - 0.428823
-    - 0.433873
-    - 0.436223
-    - 0.436845
-    - 0.436575
-    - 0.436511
-    - 0.436561
-    - 0.436517
-    - 0.435903
-    - 0.434673
-    - 0.433230
-    - 0.430466
-    - 0.378869
-    - 0.335199
-    - 0.297991
-    - 0.266092
-    - 0.238588
-    - 0.214748
-    - 0.193981
-    - 0.175808
-    - 0.159835
-    - 0.145741
-    - 0.133256
-    - 0.122157
-    - 0.112257
-    - 0.103399
-    - 0.095449
-    - 0.088294
-    - 0.081836
-    - 0.075993
-    - 0.070692
-    - 0.065875
-    - 0.061484
-    - 0.057476
-    - 0.053809
-    - 0.050447
-    - 0.047358
-    - 0.044518
-    - 0.041900
-    - 0.039483
     - 0.0
     - 0.0
-  thrust:
+    - 36.722155848902254
+    - 94.65678115354163
+    - 170.596391826316
+    - 267.74933496419163
+    - 387.64681352354114
+    - 533.9617151673435
+    - 707.4062402827329
+    - 909.9965782677073
+    - 1142.7197798534328
+    - 1407.4994184495558
+    - 1707.1272243371227
+    - 2047.3355806543098
+    - 2430.5778091805637
+    - 2858.3081150622215
+    - 3329.100627354195
+    - 3842.9755943182267
+    - 4403.86140594055
+    - 4999.993508066915
+    - 4999.99850473839
+    - 4999.997854617397
+    - 5000.00304890274
+    - 5000.002113339491
+    - 4999.997282778227
+    - 5000.002243172759
+    - 5000.000360590384
+    - 5000.009074693787
+    - 4999.987262704901
+    - 5000.007345811091
+    - 5000.006875165497
+    - 4999.994990648268
+    - 4999.97705933755
+    - 4999.983698972648
+    - 4999.991318085188
+    - 5000.024022703328
+    - 5000.016589748782
+    - 5000.025709581146
+    - 4999.944891236294
+    - 5000.035324880168
+    - 4999.967955734346
+    - 5000.013248451465
+    - 5000.063199891701
+    - 5000.068982245371
+    - 4999.9325188896555
+    - 5000.011035557985
+    - 5000.012771123277
+    - 4717.243379938609
+    - 0.0
+    - 0.0
+  thrust_coefficient:
     - 0.0
     - 0.0
     - 0.0