turbo-design 1.1.2__tar.gz → 1.1.4__tar.gz

{turbo_design-1.1.2 → turbo_design-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: turbo-design
-Version: 1.1.2
+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.2 → turbo_design-1.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "turbo-design"
-version = "1.1.2"
+version = "1.1.4"
 description = "TurboDesign is a library used to design turbines and compressors using radial equilibrium."
 authors = ["Paht Juangphanich <paht.juangphanich@nasa.gov>"]
 packages = [

{turbo_design-1.1.2 → turbo_design-1.1.4}/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

{turbo_design-1.1.2 → turbo_design-1.1.4}/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()

{turbo_design-1.1.2 → turbo_design-1.1.4}/turbodesign/td_math.py

@@ -195,7 +195,7 @@ def compute_quantities(row:BladeRow,upstream:BladeRow):
         else:
             row.P0 = upstream.P0
         row.T0 = upstream.T0 - T0_coolant_weighted_average(row)
-        row.T = row.T0 * (1+(row.gamma-1)/2*row.M**2)
+        row.T = row.T0 / (1+(row.gamma-1)/2*row.M**2)
         row.P = row.P0 * (row.T/row.T0)**((row.gamma)/(row.gamma-1))
         row.T0R = row.T + row.W**2 / (2*row.Cp)
         row.P0R = row.P*(row.T0R/row.T)**((row.gamma)/(row.gamma-1))