turbo-design 1.1.3__py3-none-any.whl → 1.1.4__py3-none-any.whl

{turbo_design-1.1.3.dist-info → turbo_design-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: turbo-design
-Version: 1.1.3
+Version: 1.1.4
 Summary: TurboDesign is a library used to design turbines and compressors using radial equilibrium.
 Author: Paht Juangphanich
 Author-email: paht.juangphanich@nasa.gov
@@ -10,7 +10,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: cantera
 Requires-Dist: findiff
 Requires-Dist: matplotlib

{turbo_design-1.1.3.dist-info → turbo_design-1.1.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 turbodesign/__init__.py,sha256=N8Nu0I1vrlEHYJZZ7yhhg-FtbNbLyrgjy7hoicygUqg,325
 turbodesign/arrayfuncs.py,sha256=GHIlTyLfeNsNCQQoh5m1aXK3iyvU6RjdYQipkqpU_ps,519
-turbodesign/bladerow.py,sha256=I0KYtw7c5cy32vxq1D54TrIkfsdbRlDWsnoCIADtCUA,24582
+turbodesign/bladerow.py,sha256=WqAB_BZFXu-y-m-leSbDNxUlt578A4clJhaNkkpxBbM,24731
 turbodesign/cantera_gas/co2.yaml,sha256=M2o_RzxV9B9rDkgkXJC-l3voKraFZguTZuKKt4F7S_c,887
 turbodesign/compressorspool.py,sha256=z8ZVczJ-EdZvIqqZArC6UdwC5MbU2SZh_MT2CGq5avY,2600
 turbodesign/coolant.py,sha256=nuj7ryUXuBhuOPt2jHjHwtEM_LVno7A8Wm14P0lJn-8,436
@@ -20,7 +20,7 @@ turbodesign/loss/turbine/kackerokapuu.py,sha256=hUmZdyA1hAhN3_xbwBhka2dyk0Aq9rqq
 turbodesign/loss/turbine/traupel.py,sha256=aZxFE9JDcCfi1gy-fqS1SxjjlhuDG-H-g3LPurty1M0,4164
 turbodesign/lossinterp.py,sha256=B2KEobp-nD9jwD6UINgBmTlH9kKyWg3UNvXxqfUsr-k,6198
 turbodesign/outlet.py,sha256=SwTwoL6XnWlsrE5A6wLxu3qXkydDDUsdKKeBbJm4mrQ,2069
-turbodesign/passage.py,sha256=a3DMc-QdlFEdjOEL1cockcTUFu_1iT1PSDrGo1qKN9s,9659
+turbodesign/passage.py,sha256=vKcEzQmQIlc-88DD1zr2f0F5s1r4x6OFQLtuTgkYMBA,10033
 turbodesign/radeq.py,sha256=RCsiQzcHvR5dozK6XG0eysAhXYewF0BY_qX0f1knURo,10091
 turbodesign/rotor.py,sha256=tHl9o5H4aQ6Etd4gqa8Ime1UK7k0de4GLt5Yb1sJdGs,1376
 turbodesign/solve_radeq.py,sha256=2VGzFSVkyN0rTPFHaCQiD3v166cdEs39x7x7RuzLgmw,1886
@@ -28,6 +28,6 @@ turbodesign/spool.py,sha256=h4m--HR5g8o01Kkhl4Mbvx7WORQez3YpncDE7XxbNaw,14172
 turbodesign/stage.py,sha256=UP45sDKDLsAkO_WfDWJ6kqXU7cYKh_4QO01QZnSN1oQ,166
 turbodesign/td_math.py,sha256=GjJdH9Mym1_vMSDT7lxilzSLVHBM5-Z5UE0wfsH2hr4,16153
 turbodesign/turbinespool.py,sha256=U_TMv5XNTlRWP9NJWTaaFWfNeTEGEuSVWt3HDi8QyFI,26124
-turbo_design-1.1.3.dist-info/METADATA,sha256=F1sI0aDeah1bWEhX57xeQTvt5aMMwHR9bkWyV7VFa-M,734
-turbo_design-1.1.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-turbo_design-1.1.3.dist-info/RECORD,,
+turbo_design-1.1.4.dist-info/METADATA,sha256=4pe7fwIxSnpYVF86iou7pFaKh4usQfKMe2Co--6U__w,683
+turbo_design-1.1.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+turbo_design-1.1.4.dist-info/RECORD,,

{turbo_design-1.1.3.dist-info → turbo_design-1.1.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any

turbodesign/bladerow.py

@@ -463,10 +463,10 @@ class BladeRow:
             "Vx":self.Vx.tolist(),
             "Vr":self.Vr.tolist(),
             "Vt":self.Vt.tolist(),
+            "U":self.U.tolist(),
             "V":self.V.tolist(),
             "M":self.M.tolist(),
             "M_rel":self.M_rel.tolist(),
-            "U":self.U.tolist(),
             "W":self.W.tolist(),
             "Wt":self.Wt.tolist(),
             "omega":self.omega,
@@ -488,6 +488,10 @@ class BladeRow:
             "aspect_ratio":self.aspect_ratio,
             "num_blades":self.num_blades,
             "area": self.area,
+            "radius":self.r.tolist(),
+            "x":self.x.tolist(),
+            "dx":self.x[-1]-self.x[0],
+            "dr":self.r[-1]-self.r[0],
             "mprime":self.mprime[-1],
             "Reynolds":self.Reynolds,
             "axial_chord":self.axial_chord

turbodesign/passage.py

@@ -1,22 +1,22 @@
 from typing import List, Tuple
 import numpy as np
 import numpy.typing as npt
-from scipy.interpolate import interp1d
+from scipy.interpolate import PchipInterpolator
 from pyturbo.helper import line2D
 from .enums import PassageType
 from scipy.optimize import minimize_scalar
 from findiff import FinDiff
-from pyturbo.helper import convert_to_ndarray 
+from pyturbo.helper import convert_to_ndarray,xr_to_mprime
 import matplotlib.pyplot as plt 
 
 class Passage:
-    xhub:interp1d
-    rhub:interp1d
+    xhub:PchipInterpolator
+    rhub:PchipInterpolator
     xhub_pts:npt.NDArray
     rhub_pts:npt.NDArray
     
-    xshroud:interp1d
-    rshroud:interp1d
+    xshroud:PchipInterpolator
+    rshroud:PchipInterpolator
     xshroud_pts:npt.NDArray
     rshroud_pts:npt.NDArray
     
@@ -25,6 +25,7 @@ class Passage:
 
     x_streamlines:npt.NDArray
     r_streamlines:npt.NDArray
+    hub_arc_len:float 
     
     def __init__(self,xhub:List[float],rhub:List[float],
                  xshroud:List[float],rshroud:List[float],
@@ -41,12 +42,15 @@ class Passage:
         assert len(xhub) == len(xshroud), "xHub and xShroud should be the same length"
         assert len(rhub) == len(rshroud), "rHub and rShroud should be the same length"
 
+        hub_arc_len = xr_to_mprime(np.vstack([xhub,rhub]).transpose())[1]
+        self.hub_arc_len = hub_arc_len[-1]
+        
+        self.xhub = PchipInterpolator(hub_arc_len/hub_arc_len[-1],xhub)         # Get the xhub,rhub in terms of the hub arc len
+        self.rhub = PchipInterpolator(hub_arc_len/hub_arc_len[-1],rhub)
+        self.xshroud = PchipInterpolator(hub_arc_len/hub_arc_len[-1],xshroud)
+        self.rshroud = PchipInterpolator(hub_arc_len/hub_arc_len[-1],rshroud)
+        
         self.n = len(xhub)
-        t_streamline = np.linspace(0,1,len(xhub))
-        self.xhub = interp1d(t_streamline,xhub)
-        self.rhub = interp1d(t_streamline,rhub)
-        self.xshroud = interp1d(t_streamline,xshroud)
-        self.rshroud = interp1d(t_streamline,rshroud)
         
         self.xhub_pts = convert_to_ndarray(xhub)
         self.rhub_pts = convert_to_ndarray(rhub)
@@ -148,7 +152,7 @@ class Passage:
             (Tuple) containing:
         
                 cut (line2D): line from hub to shroud
-                t_hub (float): t corresponding to xhub location
+                t_hub (float): Percentage along hub arc length
                 t_shroud (float): t corresponding to intersection of bisector of hub 
                                 
         """
@@ -195,6 +199,7 @@ class Passage:
             np.NDArray: _description_
         """
         t_hub = np.linspace(axial_location[0],axial_location[1],100)
+        t_hub = convert_to_ndarray(t_hub)*self.hub_length
         
         shroud_pts_cyl = np.vstack([self.xshroud(t_hub),self.rshroud(t_hub)]).transpose()
         hub_pts_cyl = np.vstack([self.xhub(t_hub),self.rhub(t_hub)]).transpose()