Revert comments in reference turbine yamls.

NREL · Jan 2, 2025 · d5cf1f2 · d5cf1f2
1 parent 572e2fe
commit d5cf1f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/floris/turbine_library/iea_10MW.yaml b/floris/turbine_library/iea_10MW.yaml
@@ -7,22 +7,15 @@ rotor_diameter: 198.0
 TSR: 8.0
 operation_model: cosine-loss
 power_thrust_table:
-  # General parameters
   ref_air_density: 1.225
   ref_tilt: 6.0
-
-  # Parameters for 'cosine-loss' operation model
   cosine_loss_exponent_yaw: 1.88
   cosine_loss_exponent_tilt: 1.88
-
-  # Parameters for 'awc' operation model
   helix_a: 1.719
   helix_power_b: 4.823e-03
   helix_power_c: 2.314e-10
   helix_thrust_b: 1.157e-03
   helix_thrust_c: 1.167e-04
-
-  # Parameters for 'controller-dependent' operation model
   rotor_solidity: 0.03500415472147307
   rated_rpm:  8.6
   generator_efficiency: 0.944
@@ -32,8 +25,6 @@ power_thrust_table:
   cd:  0.004612981322772105
   cl_alfa: 4.602140680380394
   cp_ct_data_file: "iea_10MW_demo_cp_ct_surface.npz"
-
-  # Power and thrust curves
   power:
     - 0.0
     - 0.0

diff --git a/floris/turbine_library/iea_15MW.yaml b/floris/turbine_library/iea_15MW.yaml
@@ -9,22 +9,15 @@ rotor_diameter: 242.24
 TSR: 8.0
 operation_model: cosine-loss
 power_thrust_table:
-  # General parameters
   ref_air_density: 1.225
   ref_tilt: 6.0
-
-  # Parameters for 'cosine-loss' operation model
   cosine_loss_exponent_yaw: 1.88
   cosine_loss_exponent_tilt: 1.88
-
-  # Parameters for 'awc' operation model
   helix_a: 1.809
   helix_power_b: 4.828e-03
   helix_power_c: 4.017e-11
   helix_thrust_b: 1.390e-03
   helix_thrust_c: 5.084e-04
-
-  # Parameters for 'controller-dependent' operation model
   rotor_solidity: 0.031018237027995298
   rated_rpm: 7.55
   generator_efficiency: 0.95756
@@ -34,8 +27,6 @@ power_thrust_table:
   cd:  0.004426686198054057
   cl_alfa: 4.546410770937916
   cp_ct_data_file: "iea_15MW_demo_cp_ct_surface.npz"
-
-  # Power and thrust curves
   power:
     - 0.000000
     - 0.000000

diff --git a/floris/turbine_library/nrel_5MW.yaml b/floris/turbine_library/nrel_5MW.yaml
@@ -29,28 +29,27 @@ operation_model: 'cosine-loss'
 ###
 # Parameters needed to evaluate the power and thrust produced by the turbine.
 power_thrust_table:
-  ### General parameters
+  ### Power thrust table parameters
   # The air density at which the power and thrust_coefficient curves are defined.
   ref_air_density: 1.225
+  ###
   # The tilt angle at which the Cp and Ct curves are defined. This is used to capture
   # the effects of a floating platform on a turbine's power and wake.
   ref_tilt: 5.0
-
-  ### Parameters for 'cosine-loss' operation model
+  ###
   # Cosine exponent for power loss due to tilt.
   cosine_loss_exponent_tilt: 1.88
+  ###
   # Cosine exponent for power loss due to yaw misalignment.
   cosine_loss_exponent_yaw: 1.88
-
-  ### Parameters for the 'awc' operation model
+  ###
   # Helix parameters
   helix_a: 1.802
   helix_power_b: 4.568e-03
   helix_power_c: 1.629e-10
   helix_thrust_b: 1.027e-03
   helix_thrust_c: 1.378e-06
-
-  ### Parameters for the 'peak-shaving' operation model
+  ### Peak shaving parameters
   # Fraction of peak thrust by which to reduce
   peak_shaving_fraction: 0.2
   # Threshold turbulence intensity above which to apply peak shaving