Merge pull request #374 from WISDEM/distance_mb

Distance mb
WISDEM · May 19, 2022 · 77ecf90 · 77ecf90
2 parents 47d5b96 + 1722968
commit 77ecf90
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/examples/02_reference_turbines/IEA-10-198-RWT.yaml b/examples/02_reference_turbines/IEA-10-198-RWT.yaml
@@ -383,8 +383,8 @@ components:
             distance_tt_hub: 3.37
             overhang: 10.039
             drag_coefficient: 0.5
-            distance_hub2mb: 1.0
-            distance_mb2mb: 1.2
+            distance_hub_mb: 1.0
+            distance_mb_mb: 1.2
             lss_diameter: [2.5, 2.5]
             lss_wall_thickness: [0.1, 0.1]
             nose_diameter: [1.5, 1.5]

diff --git a/examples/02_reference_turbines/IEA-15-240-RWT.yaml b/examples/02_reference_turbines/IEA-15-240-RWT.yaml
@@ -464,8 +464,8 @@ components:
             distance_tt_hub: 5.614
             overhang: 12.0313
             drag_coefficient: 0.5
-            distance_hub2mb: 1.0
-            distance_mb2mb: 1.2
+            distance_hub_mb: 1.0
+            distance_mb_mb: 1.2
             lss_diameter: [3.0, 3.0]
             lss_wall_thickness: [0.1, 0.1]
             nose_diameter: [2.2, 2.2]

diff --git a/examples/02_reference_turbines/IEA-3p4-130-RWT.yaml b/examples/02_reference_turbines/IEA-3p4-130-RWT.yaml
@@ -288,8 +288,8 @@ components:
             diameter: 3.0
             uptilt: 0.08726 # 5 deg
             distance_tt_hub: 2.
-            distance_hub2mb: 1.912
-            distance_mb2mb: 0.368
+            distance_hub_mb: 1.912
+            distance_mb_mb: 0.368
             overhang: 5.
             lss_diameter: [0.577, 0.577]
             lss_wall_thickness: [0.288, 0.288]

diff --git a/examples/02_reference_turbines/nrel5mw.yaml b/examples/02_reference_turbines/nrel5mw.yaml
@@ -210,8 +210,8 @@ components:
             diameter: 3.0
             uptilt: 0.08726
             distance_tt_hub: 2.3
-            distance_hub2mb: 1.912
-            distance_mb2mb: 0.368
+            distance_hub_mb: 1.912
+            distance_mb_mb: 0.368
             overhang: 5.
             lss_diameter: [0.577, 0.577]
             lss_wall_thickness: [0.288, 0.288]

diff --git a/examples/03_blade/BAR_USC.yaml b/examples/03_blade/BAR_USC.yaml
@@ -419,8 +419,8 @@ components:
             diameter: 3.0
             uptilt: 0.06981317007977318
             distance_tt_hub: 3.0
-            distance_hub2mb: 1.912
-            distance_mb2mb: 0.368
+            distance_hub_mb: 1.912
+            distance_mb_mb: 0.368
             overhang: 7.0
             lss_diameter: [0.577, 0.577]
             lss_wall_thickness: [0.288, 0.288]
@@ -441,8 +441,6 @@ components:
             lss_material: steel
             hss_material: steel
             bedplate_material: steel
-            distance_hub_mb: 2.0
-            distance_mb_mb: 1.0
             generator_mass_user: 0.0
             generator_rpm_efficiency_user:
                 grid: [0.0, 1.0]

diff --git a/examples/09_floating/IEA-15-240-RWT_VolturnUS-S.yaml b/examples/09_floating/IEA-15-240-RWT_VolturnUS-S.yaml
@@ -464,8 +464,8 @@ components:
             distance_tt_hub: 5.614
             overhang: 12.0313
             drag_coefficient: 0.5
-            distance_hub2mb: 1.0
-            distance_mb2mb: 1.2
+            distance_hub_mb: 1.0
+            distance_mb_mb: 1.2
             lss_diameter: [3.0, 3.0]
             lss_wall_thickness: [0.1, 0.1]
             nose_diameter: [2.2, 2.2]

diff --git a/examples/09_floating/nrel5mw-semi_oc4.yaml b/examples/09_floating/nrel5mw-semi_oc4.yaml
@@ -211,8 +211,8 @@ components:
             diameter: 3.0
             uptilt: 0.08726
             distance_tt_hub: 2.3
-            distance_hub2mb: 1.912
-            distance_mb2mb: 0.368
+            distance_hub_mb: 1.912
+            distance_mb_mb: 0.368
             overhang: 5.
             lss_diameter: [0.577, 0.577]
             lss_wall_thickness: [0.288, 0.288]

diff --git a/examples/09_floating/nrel5mw-spar_oc3.yaml b/examples/09_floating/nrel5mw-spar_oc3.yaml
@@ -211,8 +211,8 @@ components:
             diameter: 3.0
             uptilt: 0.08726
             distance_tt_hub: 2.3
-            distance_hub2mb: 1.912
-            distance_mb2mb: 0.368
+            distance_hub_mb: 1.912
+            distance_mb_mb: 0.368
             overhang: 5.
             lss_diameter: [0.577, 0.577]
             lss_wall_thickness: [0.288, 0.288]

diff --git a/wisdem/test/test_gluecode/test_gluecode.py b/wisdem/test/test_gluecode/test_gluecode.py
@@ -25,7 +25,7 @@ def test5MW(self):
 
         self.assertAlmostEqual(wt_opt["rotorse.re.precomp.blade_mass"][0], 16403.682326940743, 2)
         self.assertAlmostEqual(wt_opt["rotorse.rp.AEP"][0] * 1.0e-6, 23.8785992698, 2)
-        self.assertAlmostEqual(wt_opt["financese.lcoe"][0] * 1.0e3, 51.56107634198011, 2)
+        self.assertAlmostEqual(wt_opt["financese.lcoe"][0] * 1.0e3, 51.4758370352531, 2)
         self.assertAlmostEqual(wt_opt["rotorse.rs.tip_pos.tip_deflection"][0], 4.6449973294, 1)
         self.assertAlmostEqual(wt_opt["towerse.z_param"][-1], 87.7, 2)
 
@@ -47,7 +47,7 @@ def test3p4MW(self):
 
         self.assertAlmostEqual(wt_opt["rotorse.re.precomp.blade_mass"][0], 14555.7435212969, 1)
         self.assertAlmostEqual(wt_opt["rotorse.rp.AEP"][0] * 1.0e-6, 13.606611767407955, 1)
-        self.assertAlmostEqual(wt_opt["financese.lcoe"][0] * 1.0e3, 37.3543293351, 1)
+        self.assertAlmostEqual(wt_opt["financese.lcoe"][0] * 1.0e3, 37.1968555990, 1)
         self.assertAlmostEqual(wt_opt["rotorse.rs.tip_pos.tip_deflection"][0], 6.497131502270892, 1)
         self.assertAlmostEqual(wt_opt["towerse.z_param"][-1], 108.0, 3)