Merge branch 'wisdem_315' into fix_tests

WISDEM · May 26, 2024 · c7863f0 · c7863f0
2 parents b2ab12e + efe33a8
commit c7863f0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,6 @@ dependencies = [
   "moorpy",
   "nlopt",
   "numpy",
-  "openmdao<3.28",
   "openpyxl",
   "openraft",
   "osqp",

diff --git a/weis/aeroelasticse/openmdao_openfast.py b/weis/aeroelasticse/openmdao_openfast.py
@@ -118,7 +118,6 @@ def setup(self):
                 while r[-1] should be the blade tip. Any number \
                 of locations can be specified between these in ascending order.')
             self.add_input('le_location',           val=np.zeros(n_span), desc='Leading-edge positions from a reference blade axis (usually blade pitch axis). Locations are normalized by the local chord length. Positive in -x direction for airfoil-aligned coordinate system')
-            self.add_input('beam:Tw_iner',          val=np.zeros(n_span), units='m', desc='y-distance to elastic center from point about which above structural properties are computed')
             self.add_input('beam:rhoA',             val=np.zeros(n_span), units='kg/m', desc='mass per unit length')
             self.add_input('beam:EIyy',             val=np.zeros(n_span), units='N*m**2', desc='flatwise stiffness (bending about y-direction of airfoil aligned coordinate system)')
             self.add_input('beam:EIxx',             val=np.zeros(n_span), units='N*m**2', desc='edgewise stiffness (bending about :ref:`x-direction of airfoil aligned coordinate system <blade_airfoil_coord>`)')

diff --git a/weis/glue_code/glue_code.py b/weis/glue_code/glue_code.py
@@ -541,7 +541,6 @@ def setup(self):
                 self.connect('rotorse.rhoA',                    'aeroelastic.beam:rhoA')
                 self.connect('rotorse.EIxx',                    'aeroelastic.beam:EIxx')
                 self.connect('rotorse.EIyy',                    'aeroelastic.beam:EIyy')
-                self.connect('rotorse.re.Tw_iner',                 'aeroelastic.beam:Tw_iner')
                 self.connect('rotorse.rs.frame.flap_mode_shapes',       'aeroelastic.flap_mode_shapes')
                 self.connect('rotorse.rs.frame.edge_mode_shapes',       'aeroelastic.edge_mode_shapes')
                 self.connect('rotorse.rp.powercurve.V',                'aeroelastic.U')
@@ -668,8 +667,8 @@ def setup(self):
                     self.connect('rotorse.mass_all_blades',     'drivese_post.blades_mass')
                     self.connect('rotorse.I_all_blades',        'drivese_post.blades_I')
 
-                    self.connect('nacelle.distance_hub2mb',           'drivese_post.L_h1')
-                    self.connect('nacelle.distance_mb2mb',            'drivese_post.L_12')
+                    self.connect('nacelle.distance_hub_mb',           'drivese_post.L_h1')
+                    self.connect('nacelle.distance_mb_mb',            'drivese_post.L_12')
                     self.connect('nacelle.L_generator',               'drivese_post.L_generator')
                     self.connect('nacelle.overhang',                  'drivese_post.overhang')
                     self.connect('nacelle.distance_tt_hub',           'drivese_post.drive_height')