Merge 529e857 into 8093f48

WISDEM · Jan 12, 2024 · fde4dee · fde4dee
2 parents 8093f48 + 529e857
commit fde4dee
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 25 deletions.
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/16_inverse_design/analysis_options.yaml b/examples/16_inverse_design/analysis_options.yaml
@@ -48,3 +48,4 @@ driver:
         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
+        max_iter: 1          # Maximum number of iterations (SLSQP)
diff --git a/examples/17_jacket/analysis_options_jacket.yaml b/examples/17_jacket/analysis_options_jacket.yaml
@@ -52,7 +52,7 @@ driver:
         tol: 1.e-2            # Optimality tolerance
         max_major_iter: 100    # Maximum number of major design iterations (SNOPT)
         max_minor_iter: 1000   # Maximum number of minor design iterations (SNOPT)
-        max_iter: 10          # 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/18_rotor_tower_monopile/IEA15MW_FB.yaml b/examples/18_rotor_tower_monopile/IEA15MW_FB.yaml
@@ -1,5 +1,5 @@
 name: IEA 15MW Offshore Reference Turbine
-assembly: {turbine_class: I, turbulence_class: B, drivetrain: direct_drive, rotor_orientation: Upwind, number_of_blades: 3, hub_height: 150.0, rotor_diameter: 242.23775645, rated_power: 15000000.0, lifetime: 25.0}
+assembly: {turbine_class: I, turbulence_class: B, drivetrain: direct_drive, rotor_orientation: Upwind, number_of_blades: 3, hub_height: 150.0, rotor_diameter: 241.94, rated_power: 15000000.0, lifetime: 25.0}
 components:
     blade:
         outer_shape_bem:

diff --git a/examples/18_rotor_tower_monopile/IEA15MW_FB_scaled.yaml b/examples/18_rotor_tower_monopile/IEA15MW_FB_scaled.yaml
@@ -1,5 +1,5 @@
 name: IEA 15MW Offshore Reference Turbine Scaled to 20MW
-assembly: {turbine_class: I, turbulence_class: B, drivetrain: direct_drive, rotor_orientation: Upwind, number_of_blades: 3, hub_height: 170.0, rotor_diameter: 279.71, rated_power: 20000000.0, lifetime: 25.0}
+assembly: {turbine_class: I, turbulence_class: B, drivetrain: direct_drive, rotor_orientation: Upwind, number_of_blades: 3, hub_height: 170.0, rotor_diameter: 241.94, rated_power: 20000000.0, lifetime: 25.0}
 components:
     blade:
         outer_shape_bem:

diff --git a/examples/19_rotor_drivetrain_tower/analysis_options.yaml b/examples/19_rotor_drivetrain_tower/analysis_options.yaml
@@ -137,7 +137,7 @@ driver:
         tol: 1.e-3          # Optimality tolerance
         # max_major_iter: 100  # Maximum number of major design iterations (SNOPT)
         # max_minor_iter: 1000 # 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: central       # Finite differencing mode, either forward or central

diff --git a/wisdem/glue_code/gc_WT_DataStruc.py b/wisdem/glue_code/gc_WT_DataStruc.py
@@ -3151,11 +3151,11 @@ def compute(self, inputs, outputs):
             outputs["blade_ref_axis"][:, 2] = (
                 inputs["blade_ref_axis_user"][:, 2]
                 * inputs["rotor_diameter_user"]
-                / ((arc_length(inputs["blade_ref_axis_user"])[-1] + inputs["hub_radius"]) * 2.0)
+                / ((inputs["blade_ref_axis_user"][-1,2] + inputs["hub_radius"]) * 2.0)
             )
         # If the user does not provide a rotor diameter, this is computed from the hub diameter and the blade length
         else:
-            outputs["rotor_diameter"] = (arc_length(inputs["blade_ref_axis_user"])[-1] + inputs["hub_radius"]) * 2.0
+            outputs["rotor_diameter"] = (inputs["blade_ref_axis_user"][-1,2] + inputs["hub_radius"]) * 2.0
             outputs["blade_ref_axis"][:, 2] = inputs["blade_ref_axis_user"][:, 2]
         outputs["r_blade"] = outputs["blade_ref_axis"][:, 2] + inputs["hub_radius"]
         outputs["rotor_radius"] = outputs["r_blade"][-1]

diff --git a/wisdem/inputs/geometry_schema.yaml b/wisdem/inputs/geometry_schema.yaml
@@ -73,7 +73,7 @@ properties:
             rotor_diameter:
                 type: number
                 default: 0
-                description: Diameter of the rotor, defined as two times the blade length plus the hub diameter
+                description: Diameter of the rotor, defined as two times the projected blade length plus the hub diameter
                 unit: m
                 minimum: 0
                 maximum: 1000

diff --git a/wisdem/test/test_gluecode/test_gluecode.py b/wisdem/test/test_gluecode/test_gluecode.py
@@ -49,11 +49,11 @@ def test3p4MW(self):
         wt_opt, _, _ = run_wisdem(fname_wt_input, fname_modeling_options, fname_analysis_options)
 
         self.assertAlmostEqual(
-            wt_opt["rotorse.blade_mass"][0], 14542.248883586388, 1
+            wt_opt["rotorse.blade_mass"][0], 14563.4133964110, 1
         )  # new value: improved interpolation
-        self.assertAlmostEqual(wt_opt["rotorse.rp.AEP"][0] * 1.0e-6, 13.606611767407955, 1)
-        self.assertAlmostEqual(wt_opt["financese.lcoe"][0] * 1.0e3, 39.37508197421948, 1)
-        self.assertAlmostEqual(wt_opt["rotorse.rs.tip_pos.tip_deflection"][0], 6.5221733906, 1)
+        self.assertAlmostEqual(wt_opt["rotorse.rp.AEP"][0] * 1.0e-6, 13.6224907440, 1)
+        self.assertAlmostEqual(wt_opt["financese.lcoe"][0] * 1.0e3, 39.3341150071, 1)
+        self.assertAlmostEqual(wt_opt["rotorse.rs.tip_pos.tip_deflection"][0], 6.5577831500, 1)
         self.assertAlmostEqual(wt_opt["towerse.z_param"][-1], 108.0, 3)
 
 

diff --git a/wisdem/test/test_rotorse/test_BladeJointSizing.py b/wisdem/test/test_rotorse/test_BladeJointSizing.py
@@ -24,8 +24,8 @@ def testBladeJointSizerBAR_USC(self):
         self.assertAlmostEqual(wt_opt["rotorse.rs.bjs.t_reinf_ratio_joint"][0], 0.9899571827651443, places=accuracy)
         self.assertAlmostEqual(wt_opt["rotorse.rs.bjs.w_reinf_ratio_joint"][0], 1.2087641190997038, places=accuracy)
         self.assertAlmostEqual(wt_opt["rotorse.rs.bjs.n_joint_bolt"][0], 38.05368523091661, places=accuracy)
-        self.assertAlmostEqual(wt_opt["rotorse.rs.bjs.joint_mass"][0], 430.1017211887711, places=accuracy)
-        self.assertAlmostEqual(wt_opt["rotorse.rs.bjs.joint_material_cost"][0], 1853.9220992785758, places=accuracy)
+        self.assertAlmostEqual(wt_opt["rotorse.rs.bjs.joint_mass"][0], 431.4099793266359, places=accuracy)
+        self.assertAlmostEqual(wt_opt["rotorse.rs.bjs.joint_material_cost"][0], 1859.559671891965, places=accuracy)
 
 
 def suite():