Merge pull request #486 from WISDEM/develop

Release v3.13
WISDEM · Jan 25, 2024 · 26da3dc · 26da3dc
2 parents 525da76 + 49c2728
commit 26da3dc
Show file tree

Hide file tree

Showing 70 changed files with 1,706 additions and 6,431 deletions.
diff --git a/docs/examples/airfoilprep/tutorial.rst b/docs/examples/airfoilprep/tutorial.rst
diff --git a/examples/02_reference_turbines/IEA-15-240-RWT.yaml b/examples/02_reference_turbines/IEA-15-240-RWT.yaml
@@ -6,7 +6,7 @@ assembly:
     rotor_orientation: Upwind
     number_of_blades: 3
     hub_height: 150.
-    rotor_diameter: 242.23775645
+    rotor_diameter: 241.94
     rated_power: 15.e+6
     lifetime: 25.0
 components:

diff --git a/examples/03_blade/BAR_USC.yaml b/examples/03_blade/BAR_USC.yaml
@@ -1,6 +1,6 @@
 name: BAR_USC
 description: BAR-USC - Upwind segmented design - Spar caps with industry baseline CFRP - last updated on April 23rd 2021 by Pietro Bortolotti
-assembly: {turbine_class: III, turbulence_class: A, drivetrain: Constant_eff, rotor_orientation: Upwind, number_of_blades: 3, rotor_diameter: 206.0, hub_height: 140.0, rated_power: 5000000.0, lifetime: 25.0}
+assembly: {turbine_class: III, turbulence_class: A, drivetrain: Constant_eff, rotor_orientation: Upwind, number_of_blades: 3, rotor_diameter: 205.9925356168168, hub_height: 140.0, rated_power: 5000000.0, lifetime: 25.0}
 components:
     blade:
         outer_shape_bem:

diff --git a/examples/03_blade/analysis_options_aero.yaml b/examples/03_blade/analysis_options_aero.yaml
@@ -40,7 +40,7 @@ driver:
         tol: 1.e-3          # Optimality tolerance
         # max_major_iter: 10  # Maximum number of major design iterations (SNOPT)
         # max_minor_iter: 100 # Maximum number of minor design iterations (SNOPT)
-        max_iter: 2         # Maximum number of iterations (SLSQP)
+        max_iter: 1         # Maximum number of iterations (SLSQP)
         solver: SLSQP       # Optimization solver. Other options are 'SLSQP' - 'CONMIN'
         step_size: 1.e-3    # Step size for finite differencing
         form: forward       # Finite differencing mode, either forward or central

diff --git a/examples/03_blade/analysis_options_aerostruct.yaml b/examples/03_blade/analysis_options_aerostruct.yaml
@@ -92,7 +92,7 @@ driver:
         tol: 1.e-5          # Optimality tolerance
         # max_major_iter: 10  # Maximum number of major design iterations (SNOPT)
         # max_minor_iter: 100 # Maximum number of minor design iterations (SNOPT)
-        max_iter: 2         # Maximum number of iterations (SLSQP)
+        max_iter: 1         # Maximum number of iterations (SLSQP)
         solver: SLSQP       # Optimization solver. Other options are 'SLSQP' - 'CONMIN'
         step_size: 1.e-3    # Step size for finite differencing
         form: forward       # Finite differencing mode, either forward or central

diff --git a/examples/03_blade/analysis_options_struct.yaml b/examples/03_blade/analysis_options_struct.yaml
@@ -70,7 +70,7 @@ driver:
         tol: 1.e-3          # Optimality tolerance
         # max_major_iter: 10  # Maximum number of major design iterations (SNOPT)
         # max_minor_iter: 100 # Maximum number of minor design iterations (SNOPT)
-        max_iter: 2         # Maximum number of iterations (SLSQP)
+        max_iter: 1         # Maximum number of iterations (SLSQP)
         solver: SLSQP       # Optimization solver. Other options are 'SLSQP' - 'CONMIN'
         step_size: 1.e-3    # Step size for finite differencing
         form: forward       # Finite differencing mode, either forward or central

diff --git a/examples/05_tower_monopile/analysis_options.yaml b/examples/05_tower_monopile/analysis_options.yaml
@@ -47,7 +47,7 @@ driver:
         tol: 1.e-6          # Optimality tolerance
         # max_major_iter: 10  # Maximum number of major design iterations (SNOPT)
         # max_minor_iter: 100 # Maximum number of minor design iterations (SNOPT)
-        max_iter: 100         # Maximum number of iterations (SLSQP)
+        max_iter: 1         # Maximum number of iterations (SLSQP)
         solver: SLSQP       # Optimization solver. Other options are 'SLSQP' - 'CONMIN'
         step_size: 1.e-6    # Step size for finite differencing
         form: forward       # Finite differencing mode, either forward or central

diff --git a/examples/05_tower_monopile/analysis_options_monopile.yaml b/examples/05_tower_monopile/analysis_options_monopile.yaml
@@ -83,7 +83,7 @@ driver:
         tol: 1.e-3            # Optimality tolerance
         max_major_iter: 10    # Maximum number of major design iterations (SNOPT)
         max_minor_iter: 100   # Maximum number of minor design iterations (SNOPT)
-        max_iter: 100         # Maximum number of iterations (SLSQP)
+        max_iter: 1         # Maximum number of iterations (SLSQP)
         solver: SLSQP         # Optimization solver. Other options are 'SLSQP' - 'CONMIN'
         step_size: 1.e-3      # Step size for finite differencing
         form: forward         # Finite differencing mode, either forward or central

diff --git a/examples/09_floating/IEA-15-240-RWT_VolturnUS-S.yaml b/examples/09_floating/IEA-15-240-RWT_VolturnUS-S.yaml
@@ -6,7 +6,7 @@ assembly:
     rotor_orientation: Upwind
     number_of_blades: 3
     hub_height: 150.
-    rotor_diameter: 242.23775645
+    rotor_diameter: 241.94
     rated_power: 15.e+6
     lifetime: 25.0
 components:

diff --git a/examples/09_floating/analysis_options.yaml b/examples/09_floating/analysis_options.yaml
@@ -355,7 +355,7 @@ driver:
         tol: 1.e-2          # Optimality tolerance
         max_major_iter: 10  # Maximum number of major design iterations (SNOPT)
         max_minor_iter: 100 # Maximum number of minor design iterations (SNOPT)
-        max_iter: 100         # Maximum number of iterations (SLSQP)
+        max_iter: 1         # Maximum number of iterations (SLSQP)
         solver: SLSQP       # Optimization solver. Other options are 'SLSQP' - 'CONMIN'
         step_size: 1.e-3    # Step size for finite differencing
         form: central       # Finite differencing mode, either forward or central

diff --git a/examples/09_floating/analysis_options_mooropt.yaml b/examples/09_floating/analysis_options_mooropt.yaml
@@ -61,7 +61,7 @@ driver:
         tol: 1.e-6          # Optimality tolerance
         max_major_iter: 10  # Maximum number of major design iterations (SNOPT)
         max_minor_iter: 100 # Maximum number of minor design iterations (SNOPT)
-        max_iter: 100         # Maximum number of iterations (SLSQP)
+        max_iter: 1         # Maximum number of iterations (SLSQP)
         solver: SLSQP       # Optimization solver. Other options are 'SLSQP' - 'CONMIN'
         step_size: 1.e-6    # Step size for finite differencing
         form: forward       # Finite differencing mode, either forward or central

diff --git a/examples/09_floating/analysis_options_semiopt.yaml b/examples/09_floating/analysis_options_semiopt.yaml
@@ -135,7 +135,7 @@ driver:
         tol: 1.e-2          # Optimality tolerance
         max_major_iter: 10  # Maximum number of major design iterations (SNOPT)
         max_minor_iter: 100 # Maximum number of minor design iterations (SNOPT)
-        max_iter: 100         # Maximum number of iterations (SLSQP)
+        max_iter: 1         # Maximum number of iterations (SLSQP)
         solver: SLSQP       # Optimization solver. Other options are 'SLSQP' - 'CONMIN'
         step_size: 1.e-3    # Step size for finite differencing
         form: central       # Finite differencing mode, either forward or central

diff --git a/examples/09_floating/analysis_options_sparopt.yaml b/examples/09_floating/analysis_options_sparopt.yaml
@@ -62,7 +62,7 @@ driver:
         tol: 1.e-6          # Optimality tolerance
         max_major_iter: 10  # Maximum number of major design iterations (SNOPT)
         max_minor_iter: 100 # Maximum number of minor design iterations (SNOPT)
-        max_iter: 100         # Maximum number of iterations (SLSQP)
+        max_iter: 1         # Maximum number of iterations (SLSQP)
         solver: SLSQP       # Optimization solver. Other options are 'SLSQP' - 'CONMIN'
         step_size: 1.e-6    # Step size for finite differencing
         form: forward       # Finite differencing mode, either forward or central

diff --git a/examples/10_ccblade/example.py b/examples/10_ccblade/example.py
@@ -96,19 +96,24 @@
 
 
 # 2 ----------
-
-afinit = CCAirfoil.initFromAerodynFile  # just for shorthand
-
-# load all airfoils
-airfoil_types = [0] * 8
-airfoil_types[0] = afinit("../_airfoil_files/Cylinder1.dat")
-airfoil_types[1] = afinit("../_airfoil_files/Cylinder2.dat")
-airfoil_types[2] = afinit("../_airfoil_files/DU40_A17.dat")
-airfoil_types[3] = afinit("../_airfoil_files/DU35_A17.dat")
-airfoil_types[4] = afinit("../_airfoil_files/DU30_A17.dat")
-airfoil_types[5] = afinit("../_airfoil_files/DU25_A17.dat")
-airfoil_types[6] = afinit("../_airfoil_files/DU21_A17.dat")
-airfoil_types[7] = afinit("../_airfoil_files/NACA64_A17.dat")
+import os
+from wisdem.inputs.validation import load_geometry_yaml
+baseyaml = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "02_reference_turbines", "nrel5mw.yaml")
+data = load_geometry_yaml(baseyaml)
+af = data['airfoils']
+af_names = ["Cylinder", "Cylinder", "DU40_A17", "DU35_A17", "DU30_A17", "DU25_A17", "DU21_A17", "NACA64_A17"]
+airfoil_types = [0] * len(af_names)
+for i in range(len(af_names)):
+    for j in range(len(af)):
+        if af[j]["name"] == af_names[i]:
+            polars = af[j]['polars'][0]
+            airfoil_types[i] = CCAirfoil(
+                np.rad2deg(polars["c_l"]["grid"]),
+                [polars["re"]],
+                polars["c_l"]["values"],
+                polars["c_d"]["values"],
+                polars["c_m"]["values"],
+            )
 
 # place at appropriate radial stations
 af_idx = [0, 0, 1, 2, 3, 3, 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7]