NREL · misi9170 · Dec 13, 2023 · Dec 13, 2023 · Dec 13, 2023 · Dec 13, 2023
diff --git a/examples/18_check_turbine.py b/examples/18_check_turbine.py
@@ -47,6 +47,11 @@
     if t.suffix == ".yaml" and ("multi_dim" not in t.stem)
 ]
 
+# TEMPORARY
+print(turbines)
+turbines = turbines[1:]
+# END TEMPORARY
+
 # Declare a set of figures for comparing cp and ct across models
 fig_cp_ct, axarr_cp_ct = plt.subplots(2,1,sharex=True,figsize=(10,10))
 
@@ -66,14 +71,14 @@
     )
     axarr_cp_ct[0].grid(True)
     axarr_cp_ct[0].legend()
-    axarr_cp_ct[0].set_ylabel('Cp')
+    axarr_cp_ct[0].set_ylabel('Power (kW)')
     axarr_cp_ct[1].plot(
         fi.floris.farm.turbine_map[0].power_thrust_table["wind_speed"],
-        fi.floris.farm.turbine_map[0].power_thrust_table["thrust"],label=t
+        fi.floris.farm.turbine_map[0].power_thrust_table["thrust_coefficient"],label=t
     )
     axarr_cp_ct[1].grid(True)
     axarr_cp_ct[1].legend()
-    axarr_cp_ct[1].set_ylabel('Ct')
+    axarr_cp_ct[1].set_ylabel('Ct (-)')
     axarr_cp_ct[1].set_xlabel('Wind Speed (m/s)')
 
     # Create a figure

diff --git a/examples/24_floating_turbine_models.py b/examples/24_floating_turbine_models.py
@@ -26,7 +26,7 @@
 is computed for each turbine based on effective velocity.  This tilt angle is then passed on
 to the respective wake model.
 
-The value of the parameter ref_tilt_cp_ct is the value of tilt at which the ct/cp curves
+The value of the parameter ref_tilt is the value of tilt at which the ct/cp curves
 have been defined.
 
 If `correct_cp_ct_for_tilt` is True, then the difference between the current tilt as

diff --git a/examples/29_floating_vs_fixedbottom_farm.py b/examples/29_floating_vs_fixedbottom_farm.py
@@ -29,7 +29,7 @@
 turbine based on effective velocity.  This tilt angle is then passed on
 to the respective wake model.
 
-The value of the parameter ref_tilt_cp_ct is the value of tilt at which the
+The value of the parameter ref_tilt is the value of tilt at which the
 ct/cp curves have been defined.
 
 With `correct_cp_ct_for_tilt` True, the difference between the current

diff --git a/examples/32_specify_turbine_power_curve.py → examples/33_specify_turbine_power_curve.py b/examples/32_specify_turbine_power_curve.py → examples/33_specify_turbine_power_curve.py
@@ -16,8 +16,8 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from floris.tools import FlorisInterface
-from floris.turbine_library.turbine_utilities import build_turbine_dict
+from floris.simulation import turbine
+from floris.tools import build_turbine_dict, FlorisInterface
 
 
 """
@@ -30,24 +30,27 @@
 """
 
 # Generate an example turbine power and thrust curve for use in the FLORIS model
+powers_orig = np.array([0, 30, 200, 500, 1000, 2000, 4000, 4000, 4000, 4000, 4000])
+wind_speeds = np.array([0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20])
+power_coeffs = powers_orig[1:]/(0.5*126.**2*np.pi/4*1.225*wind_speeds[1:]**3)
 turbine_data_dict = {
-    "wind_speed":[0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20],
-    "power_absolute":[0, 30, 200, 500, 1000, 2000, 4000, 4000, 4000, 4000, 4000],
+    "wind_speed":list(wind_speeds),
+    "power_coefficient":[0]+list(power_coeffs),
     "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_data_dict,
     "example_turbine",
-    file_path=None,
+    file_name=None,
     generator_efficiency=1,
     hub_height=90,
     pP=1.88,
     pT=1.88,
     rotor_diameter=126,
     TSR=8,
-    air_density=1.225,
-    ref_tilt_cp_ct=5
+    ref_air_density=1.225,
+    ref_tilt=5
 )
 
 fi = FlorisInterface("inputs/gch.yaml")
@@ -57,18 +60,25 @@
 fi.reinitialize(
     layout_x=[0],
     layout_y=[0],
-    wind_speeds=wind_speeds,
     wind_directions=wind_directions,
+    wind_speeds=wind_speeds,
     turbine_type=[turbine_dict]
 )
 fi.calculate_wake()
 
 powers = fi.get_farm_power()
 
-fig, ax = plt.subplots(1,1)
+specified_powers = (
+    np.array(turbine_data_dict["power_coefficient"])
+    *0.5*turbine_dict["ref_air_density"]
+    *turbine_dict["rotor_diameter"]**2*np.pi/4
+    *np.array(turbine_data_dict["wind_speed"])**3
+)/1000
+
+fig, ax = plt.subplots(1,1,sharex=True)
 
 ax.scatter(wind_speeds, powers/1000, color="C0", s=5, label="Test points")
-ax.scatter(turbine_data_dict["wind_speed"], turbine_data_dict["power_absolute"],
+ax.scatter(turbine_data_dict["wind_speed"], specified_powers,
     color="red", s=20, label="Specified points")
 
 ax.grid()

diff --git a/examples/inputs/cc.yaml b/examples/inputs/cc.yaml
@@ -1,7 +1,7 @@
 
 name: CC
 description: Three turbines using Cumulative Gauss Curl model
-floris_version: v3.0.0
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs/emgauss.yaml b/examples/inputs/emgauss.yaml
@@ -1,7 +1,7 @@
 
 name: Emperical Gaussian
 description: Three turbines using emperical Gaussian model
-floris_version: v3.x
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs/gch.yaml b/examples/inputs/gch.yaml
@@ -12,7 +12,7 @@ description: Three turbines using Gauss Curl Hybrid model
 ###
 # The earliest verion of FLORIS this input file supports.
 # This is not currently only for the user's reference.
-floris_version: v3.0.0
+floris_version: v4.x
 
 ###
 # Configure the logging level and where to show the logs.

diff --git a/examples/inputs/gch_heterogeneous_inflow.yaml b/examples/inputs/gch_heterogeneous_inflow.yaml
@@ -1,6 +1,6 @@
 name: GCH
 description: Three turbines using Gauss Curl Hybrid model
-floris_version: v3.0.0
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs/gch_multi_dim_cp_ct.yaml b/examples/inputs/gch_multi_dim_cp_ct.yaml
@@ -1,7 +1,7 @@
 
 name: GCH multi dimensional Cp/Ct
 description: Three turbines using GCH model
-floris_version: v3.0.0
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs/gch_multiple_turbine_types.yaml b/examples/inputs/gch_multiple_turbine_types.yaml
@@ -1,7 +1,7 @@
 
 name: GCH
 description: Three turbines using Gauss Curl Hybrid model
-floris_version: v3.0.0
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs/jensen.yaml b/examples/inputs/jensen.yaml
@@ -1,7 +1,7 @@
 
 name: Jensen-Jimenez
 description: Three turbines using Jensen / Jimenez models
-floris_version: v3.0.0
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs/turbopark.yaml b/examples/inputs/turbopark.yaml
@@ -1,7 +1,7 @@
 
 name: TurbOPark
 description: Three turbines using TurbOPark model
-floris_version: v3.0.0
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs_floating/emgauss_fixed.yaml b/examples/inputs_floating/emgauss_fixed.yaml
@@ -1,7 +1,7 @@
 
 name: Emperical Gaussian
 description: Example of single fixed-bottom turbine
-floris_version: v3.x
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs_floating/emgauss_floating.yaml b/examples/inputs_floating/emgauss_floating.yaml
@@ -1,7 +1,7 @@
 
 name: Emperical Gaussian
 description: Example of single floating turbine
-floris_version: v3.x
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs_floating/emgauss_floating_fixedtilt15.yaml b/examples/inputs_floating/emgauss_floating_fixedtilt15.yaml
@@ -1,7 +1,7 @@
 
 name: Emperical Gaussian floating
 description: Single turbine using emperical Gaussian model for floating
-floris_version: v3.x
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs_floating/emgauss_floating_fixedtilt5.yaml b/examples/inputs_floating/emgauss_floating_fixedtilt5.yaml
@@ -1,7 +1,7 @@
 
 name: Emperical Gaussian floating
 description: Single turbine using emperical Gaussian model for floating
-floris_version: v3.x
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs_floating/gch_fixed.yaml b/examples/inputs_floating/gch_fixed.yaml
@@ -1,7 +1,7 @@
 
 name: GCH
 description: Example of single fixed-bottom turbine
-floris_version: v3.0.0
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs_floating/gch_floating.yaml b/examples/inputs_floating/gch_floating.yaml
@@ -2,7 +2,7 @@
 
 name: GCH
 description: Example of single floating turbine
-floris_version: v3.0.0
+floris_version: v4.x
 
 logging:
   console:

diff --git a/examples/inputs_floating/gch_floating_defined_floating.yaml b/examples/inputs_floating/gch_floating_defined_floating.yaml
@@ -1,7 +1,7 @@
 
 name: GCH
 description: Example of single floating turbine where the cp/ct is calculated with floating tilt included
-floris_version: v3.0.0
+floris_version: v4.x
 
 logging:
   console: