Refactoring cubit branch to reflect new structural changes to Blade o…

…bject. Additionally, applied black formatting
kbonney · Sep 8, 2023 · 32c39be · 32c39be
1 parent 52c541e
commit 32c39be
Show file tree

Hide file tree

Showing 5 changed files with 2,224 additions and 1,490 deletions.
diff --git a/src/pynumad/analysis/beam_utils.py b/src/pynumad/analysis/beam_utils.py
@@ -81,14 +81,15 @@ def trsf_sixbysix(M, T):
 
 # --- Write BeamDyn file with blade reference line locations ---#
 def write_beamdyn_axis(directory, wt_name, blade,radial_stations):
-
+    definition = blade.definition
+    geometry = blade.geometry
     n_pts = 50
     grid = np.linspace(0, 1, n_pts)
 
-    kp_xr=interpolator_wrap(radial_stations,blade.prebend,grid,'pchip', axis=1)
-    kp_yr=interpolator_wrap(radial_stations,blade.sweep,grid,'pchip', axis=1)
-    kp_zr=interpolator_wrap(radial_stations,blade.ispan,grid,'pchip', axis=1)
-    twist_interp=interpolator_wrap(radial_stations,blade.idegreestwist,grid,'pchip', axis=1)
+    kp_xr=interpolator_wrap(radial_stations,definition.prebend,grid,'pchip', axis=1)
+    kp_yr=interpolator_wrap(radial_stations,definition.sweep,grid,'pchip', axis=1)
+    kp_zr=interpolator_wrap(radial_stations,geometry.ispan,grid,'pchip', axis=1)
+    twist_interp=interpolator_wrap(radial_stations,geometry.idegreestwist,grid,'pchip', axis=1)
 
 
     data = np.vstack((kp_xr, kp_yr, kp_zr, twist_interp)).T