turbo-design 1.3.4__py3-none-any.whl → 1.3.6__py3-none-any.whl

{turbo_design-1.3.4.dist-info → turbo_design-1.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: turbo-design
-Version: 1.3.4
+Version: 1.3.6
 Summary: TurboDesign is a library used to design turbines and compressors using radial equilibrium.
 Author: Paht Juangphanich
 Author-email: paht.juangphanich@nasa.gov
@@ -10,6 +10,7 @@ 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.3.4.dist-info → turbo_design-1.3.6.dist-info}/RECORD

@@ -1,11 +1,11 @@
 turbodesign/__init__.py,sha256=N8Nu0I1vrlEHYJZZ7yhhg-FtbNbLyrgjy7hoicygUqg,325
 turbodesign/arrayfuncs.py,sha256=GHIlTyLfeNsNCQQoh5m1aXK3iyvU6RjdYQipkqpU_ps,519
-turbodesign/bladerow.py,sha256=FOs3I1dPHG0sPvfGH0PtZK9tyoTV9C8062_xGNZ4CrA,24974
+turbodesign/bladerow.py,sha256=351FMt9UtbFMAKtU-mDkJ12hmIdaaa4qF6K6Q-ZYkBM,25063
 turbodesign/cantera_gas/co2.yaml,sha256=M2o_RzxV9B9rDkgkXJC-l3voKraFZguTZuKKt4F7S_c,887
 turbodesign/compressorspool.py,sha256=z8ZVczJ-EdZvIqqZArC6UdwC5MbU2SZh_MT2CGq5avY,2600
 turbodesign/coolant.py,sha256=evDtUFOYhfZKTVAsDWzxRzUX20gTvfjj0uybaWg4CsI,427
-turbodesign/enums.py,sha256=T4aFrGMnx9fgZkrExMBIY2IbCueA0utqr_afk-TUe9Q,1188
-turbodesign/inlet.py,sha256=L_IHE8zzm3uFMSow0iO-VxI71SnyQZwRhJMlJDcwZ4o,7329
+turbodesign/enums.py,sha256=WC6VPmHw3UF1zR1SLjj8z00gIWSNso66MShFGoYRY4U,1164
+turbodesign/inlet.py,sha256=5uja906IA-_gca4FJykZvFLJ1he6HRy5pZDNQE1D2_g,7945
 turbodesign/isentropic.py,sha256=YLTmNx69e_M5fTuLOmk_KvaQ6ABv0aZsityfBihJOmI,2003
 turbodesign/loss/__init__.py,sha256=ZJomzXa6ElduFruURukCrFwJQXMWS2aW8JSaVQ-M2r8,46
 turbodesign/loss/compressor/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -15,19 +15,19 @@ turbodesign/loss/turbine/__init__.py,sha256=d1UrbiIicO60FhDlOemo_irYW2asUaYoqlXU
 turbodesign/loss/turbine/ainleymathieson.py,sha256=8UbugNmxI12I68HGctJe2lQpqjKZN1b40UOTzqU6hQQ,5861
 turbodesign/loss/turbine/craigcox.py,sha256=TrbNdpGdyD5kTRFKfNmbRDhCOjA0-GT5xoluLQpO1gA,9664
 turbodesign/loss/turbine/fixedefficiency.py,sha256=JJv4GUS5q9pvuf3akjBtlcHOykRYmRVFfDDrdWqH6S4,774
-turbodesign/loss/turbine/fixedpressureloss.py,sha256=jbm8dt8wtyN1RaOgpgYZsvwM0-0lv2Y73kXleyoy0zE,683
+turbodesign/loss/turbine/fixedpressureloss.py,sha256=sgkm6uQwz6Qz2LDCEmir46aJRSPLAdCKpDyR1hNdgQ8,682
 turbodesign/loss/turbine/kackerokapuu.py,sha256=hUmZdyA1hAhN3_xbwBhka2dyk0Aq9rqq62S2ghuKSOk,5071
 turbodesign/loss/turbine/traupel.py,sha256=aZxFE9JDcCfi1gy-fqS1SxjjlhuDG-H-g3LPurty1M0,4164
 turbodesign/lossinterp.py,sha256=B2KEobp-nD9jwD6UINgBmTlH9kKyWg3UNvXxqfUsr-k,6198
-turbodesign/outlet.py,sha256=-0XpeEmTQpFjUQNYQxOp5WuHkF7cXfx59hxy7BmaxgY,2119
-turbodesign/passage.py,sha256=Ur6zZCzI9Y7HW0o5LrDq9yeatRain1mBLZBcTOzgjEU,11996
+turbodesign/outlet.py,sha256=MaZJ-mDuLvh19AashnMQLx2XlR-Rk1r0HQS4kE0OxeI,2191
+turbodesign/passage.py,sha256=RZ8giKMcpJI7EnO4SEnbGYcPFmKdGyzWC0UZTXHnS6g,12181
 turbodesign/radeq.py,sha256=KiZybA8EtOKMzszstdlaR-sF5KI9nUBgYOGZYLU1x4I,6516
 turbodesign/rotor.py,sha256=tHl9o5H4aQ6Etd4gqa8Ime1UK7k0de4GLt5Yb1sJdGs,1376
 turbodesign/solve_radeq.py,sha256=nLYlRtXElPgHaoUP9jwMulRmYKTJs_uQ1eCulk2V59I,1938
-turbodesign/spool.py,sha256=63Gc6U3-6zcHEJx8RDLN4kM12poo5E-M-nlbKvHm43I,14376
+turbodesign/spool.py,sha256=81UFbBi5JKm0RJ_hjB40bKWeCXx0V2lt0b2VAwOtTDU,14376
 turbodesign/stage.py,sha256=UP45sDKDLsAkO_WfDWJ6kqXU7cYKh_4QO01QZnSN1oQ,166
-turbodesign/td_math.py,sha256=czq-u1otamELybdBW5tP_05rzeTHo7lnrckzQkR4rG4,16183
-turbodesign/turbinespool.py,sha256=8ttt2DuExuQFt9SXraRWhaYHQDkgyh_B6AoJqdNgRlg,25046
-turbo_design-1.3.4.dist-info/METADATA,sha256=IRGdTBpHziYpyQ2K8pqkCRDsocU1HTFSDMHRMnAC9Bk,683
-turbo_design-1.3.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-turbo_design-1.3.4.dist-info/RECORD,,
+turbodesign/td_math.py,sha256=qlLlAMB3kHUMdkvr9sOKl-rPShDx-XQCqG9DHOr7Vis,16268
+turbodesign/turbinespool.py,sha256=vpmrNmZ23k2wU7b9GAZrT3dOpX3otkpTtjAlfCY92sQ,25271
+turbo_design-1.3.6.dist-info/METADATA,sha256=T0hurxrmU0EtnW6pWQzml9KF7o22etumb68C3wWU0gA,734
+turbo_design-1.3.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+turbo_design-1.3.6.dist-info/RECORD,,

{turbo_design-1.3.4.dist-info → turbo_design-1.3.6.dist-info}/WHEEL

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

turbodesign/bladerow.py

@@ -1,5 +1,5 @@
 from dataclasses import field, Field
-from typing import Any, Callable, List, Tuple, Union
+from typing import Any, Callable, List, Optional, Tuple, Union
 from .enums import RowType, PowerType
 import numpy as np 
 import numpy.typing as npt
@@ -99,10 +99,10 @@ class BladeRow:
     rm: npt.NDArray = field(default_factory=lambda: np.array([0]))                      # Curvature
     incli_curve_radii: npt.NDArray = field(default_factory=lambda: np.array([0]))       # radius at which curvature was evaluated
     mprime:npt.NDArray = field(default_factory=lambda: np.array([0]))                   # Mprime distance
-    axial_chord:float = 0
     
     Yp: float = 0                   # Pressure loss
     power:float = 0                 # Watts 
+    power_mean:float = 0
     power_distribution:npt.NDArray  # How power is divided by radius. Example: Equal distribution [0.33 0.33 0.33]. More at Tip [0.2,0.3,0.5]. More at Hub [0.6 0.5 ]
     P0_P:float = 0                  # Total to Static Pressure Ratio 
     Power_Type:PowerType
@@ -132,7 +132,7 @@ class BladeRow:
         Returns:
             List[float]: _description_
         """
-        return self._inlet_to_outlet_pratio
+        return self._inlet_to_outlet_pratio # type: ignore
     
     @inlet_to_outlet_pratio.setter
     def inlet_to_outlet_pratio(self,val:Tuple[float,float]=(0.06,0.7)):
@@ -355,7 +355,7 @@ class BladeRow:
         """
         self._beta1_metal = np.radians(convert_to_ndarray(beta1_metal))
         if len(percent) != len(beta1_metal):
-            percent = np.linspace(0,1,len(self._beta1_metal)).tolist()
+            percent = np.linspace(0,1,len(self._beta1_metal)).tolist() # type: ignore
         self.beta1_metal_radii = convert_to_ndarray(percent)
         self.beta1_fixed = True
         self.beta1 = self.beta1_metal.copy()
@@ -371,7 +371,7 @@ class BladeRow:
         """
         self._beta2_metal = np.radians(convert_to_ndarray(beta2_metal))
         if len(percent) != len(beta2_metal):
-            percent = np.linspace(0,1,len(self._beta2_metal)).tolist()
+            percent = np.linspace(0,1,len(self._beta2_metal)).tolist() # type: ignore
         self.beta2_metal_radii = convert_to_ndarray(percent)
         self.beta2_fixed = True
         self.beta2 = self._beta2_metal.copy()
@@ -418,7 +418,7 @@ class BladeRow:
             code to do something with machine learning
             return pressure loss
         """
-        self.loss_function = model
+        self.loss_function = model # type: ignore
     
     @property
     def te_pitch(self):
@@ -568,11 +568,11 @@ def interpolate_streamline_radii(row:BladeRow,passage:Passage,num_streamlines:in
     row.T_is = interpolate_quantities(row.T_is,row.percent_hub_shroud,streamline_percent_length)
     row.rho = interpolate_quantities(row.rho,row.percent_hub_shroud,streamline_percent_length)
 
-    if row.row_type == RowType.Inlet:
-        row.P0_fun = interp1d(row.percent_hub_shroud,row.P0) 
-        row.T0_fun = interp1d(row.percent_hub_shroud,row.T0) 
-    elif row.row_type == RowType.Outlet:
-        row.P_fun = interp1d(row.percent_hub_shroud,row.P) 
+    # if row.row_type == RowType.Inlet:
+    #     row.P0_fun = interp1d(row.percent_hub_shroud,row.P0) 
+    #     row.T0_fun = interp1d(row.percent_hub_shroud,row.T0) 
+    # elif row.row_type == RowType.Outlet:
+    #     row.P_fun = interp1d(row.percent_hub_shroud,row.P) 
 
     return row
 
@@ -611,7 +611,7 @@ def interpolate_quantities(q:npt.NDArray,r:npt.NDArray,r2:npt.NDArray):
     else:
         return interp1d(r,q,kind='linear')(r2)
     
-def compute_gas_constants(row:BladeRow,fluid:Solution=None) -> None:
+def compute_gas_constants(row:BladeRow,fluid:Optional[Solution]=None) -> None:
     """Updates the Cp, Gamma, and density for a blade row. If fluid is not specified then only density and viscosity is updated. 
     
     Args:

turbodesign/enums.py

@@ -13,8 +13,8 @@ class RowType(Enum):
     Outlet = 4
 
 class MassflowConstraint(Enum):
-    MatchMassFlow:int = 1 # Changes the exit angles to match the massflow
-    BalanceMassFlow:int = 2 # Keeps the exit angle but balances the massflow between the stages as best it can. This will affect the static pressure at the stage exit
+    MatchMassFlow = 1 # Changes the exit angles to match the massflow
+    BalanceMassFlow = 2 # Keeps the exit angle but balances the massflow between the stages as best it can. This will affect the static pressure at the stage exit
 
 class PowerType(Enum):
     """The code for BladeRow will assume a PowerType automatically depending on what you specify. If you specify the blade row to have P0_P which is the stator inlet total pressure to rotor exit static pressure then that will be used to calculate all the quantities.
@@ -27,10 +27,10 @@ class PowerType(Enum):
     
     """
     # 
-    P0_P:int = 1 
-    T0:int = 2 
+    P0_P = 1 
+    T0 = 2 
 
 
 class PassageType(Enum):
-    Centrifugal:int=0
-    Axial:int=1
+    Centrifugal=0
+    Axial=1

turbodesign/inlet.py

@@ -40,8 +40,16 @@ class Inlet(BladeRow):
         self.T0 = convert_to_ndarray(T0)
         self.P0 = convert_to_ndarray(P0)
         self.percent_hub_shroud = convert_to_ndarray(percent_radii)
+   
+    def initialize_inputs(self,num_streamlines:int=5):
+        self.M = interpolate_quantities(self.M, self.percent_hub_shroud, np.linspace(0,1,num_streamlines))
+        self.P0 = interpolate_quantities(self.P0,self.percent_hub_shroud, np.linspace(0,1,num_streamlines))
+        self.T0 = interpolate_quantities(self.T0,self.percent_hub_shroud, np.linspace(0,1,num_streamlines)) 
+        # if it's inlet alpha and beta are the same, relative flow angle = absolute. 
+        self.beta1 = interpolate_quantities(self.beta1,self.percent_hub_shroud, np.linspace(0,1,num_streamlines)) 
+        self.beta2 = np.radians(convert_to_ndarray(self.beta1))
+        self.alpha1 = np.radians(convert_to_ndarray(self.beta1))         
         
-    
     def initialize_fluid(self,fluid:Solution=None,R:float=287.15,gamma:float=1.4,Cp:float=1024):
         """Initialize the inlet using the fluid. This function should be called by a class that inherits from spool
 
@@ -54,10 +62,6 @@ class Inlet(BladeRow):
         """
         self.loss_function = None
         
-        # if it's inlet alpha and beta are the same, relative flow angle = absolute. 
-        self.beta2 = np.radians(convert_to_ndarray(self.beta1))
-        self.alpha1 = np.radians(convert_to_ndarray(self.beta1))
-        
         if fluid:
             fluid.TP = self.T0.mean(),self.P0.mean()
             self.gamma = fluid.cp/fluid.cv
@@ -76,6 +80,10 @@ class Inlet(BladeRow):
         self.rpm = 0
         self.beta1_metal = [0] 
         self.beta2_metal = [0]
+        if len(self.percent_hub_shroud) == 1:
+            self.percent_hub_shroud = np.linspace(0,1,2)
+            self.P0 = self.percent_hub_shroud*0+self.P0[0]
+            self.T0 = self.percent_hub_shroud*0+self.T0[0]
         self.P0_fun = interp1d(self.percent_hub_shroud,self.P0)
         self.T0_fun = interp1d(self.percent_hub_shroud,self.T0)
         self.mprime = [0]
@@ -91,8 +99,6 @@ class Inlet(BladeRow):
         """
         # Perform Calculations on Velocity 
         Vm_prev = 0; Vm_err = 0 
-        t,x,radius = passage.get_streamline(self.percent_hub_shroud)
-        radius = radius[0]
 
         cutline,_,_ = passage.get_cutting_line(self.location)
         self.x,self.r = cutline.get_point(np.linspace(0,1,num_streamlines))
@@ -116,7 +122,7 @@ class Inlet(BladeRow):
             rho_mean = self.rho.mean()
             for i in range(len(self.massflow)-1):    
                 tube_massflow = self.massflow[i+1]-self.massflow[i]
-                if np.abs((self.x[i]-self.x[i-1]))<1E-12: # Axial Machines
+                if np.abs((self.x[-1]-self.x[0]))<1E-5: # Axial Machines
                     self.Vm[i+1] = tube_massflow/(rho_mean*np.pi*(self.r[i+1]**2-self.r[i]**2))
                 else:   # Radial Machines
                     dx = self.x[i]-self.x[i-1]

turbodesign/loss/turbine/fixedpressureloss.py

@@ -20,6 +20,6 @@ class FixedPressureLoss(LossBaseClass):
             row (BladeRow): downstream blade row
 
         Returns:
-            float: Pressure Loss 
+            float: Pressure Loss
         """
         return self.pressure_loss

turbodesign/outlet.py

@@ -12,7 +12,7 @@ from scipy.interpolate import interp1d
 class Outlet(BladeRow):
     P_fun:interp1d
     
-    def __init__(self,P:Union[float,List[float]],percent_radii:List[float],num_streamlines:int=3,location:float=1):
+    def __init__(self,P:Union[float,List[float]],percent_radii:Union[List[float],float],num_streamlines:int=3,location:float=1):
         """Initialize the outlet
 
         Args:
@@ -23,6 +23,7 @@ class Outlet(BladeRow):
         self.percent_hub_shroud = convert_to_ndarray(percent_radii)
         if len(self.percent_hub_shroud)==1:
             self.percent_hub_shroud = np.arange(0,1,num_streamlines)
+            self.P = self.P[0]+0*self.percent_hub_shroud*0
         self.P_fun = interp1d(self.percent_hub_shroud,self.P)
         self.row_type = RowType.Outlet
         self.loss_function = None

turbodesign/passage.py

@@ -1,4 +1,4 @@
-from typing import List, Tuple
+from typing import List, Tuple, Union
 import numpy as np
 import numpy.typing as npt
 from scipy.interpolate import PchipInterpolator, interp1d
@@ -6,7 +6,8 @@ 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,xr_to_mprime
+from pyturbo.helper import convert_to_ndarray, xr_to_mprime
+
 import matplotlib.pyplot as plt 
 
 class Passage:
@@ -27,8 +28,8 @@ class Passage:
     r_streamlines:npt.NDArray
     hub_arc_len:float 
     
-    def __init__(self,xhub:List[float],rhub:List[float],
-                 xshroud:List[float],rshroud:List[float],
+    def __init__(self,xhub:Union[npt.NDArray,List[float]],rhub:Union[npt.NDArray,List[float]],
+                 xshroud:Union[npt.NDArray,List[float]],rshroud:Union[npt.NDArray,List[float]],
                  passageType:PassageType=PassageType.Axial):
         """_summary_
 
@@ -50,10 +51,13 @@ class Passage:
         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)
+        if len(xhub) < 10:
+            self.n = 10
+        else:
+            self.n = len(xhub)
         
-        self.xhub_pts = convert_to_ndarray(xhub)
-        self.rhub_pts = convert_to_ndarray(rhub)
+        self.xhub_pts = convert_to_ndarray(xhub) # type: ignore
+        self.rhub_pts = convert_to_ndarray(rhub) # type: ignore
         self.xshroud_pts = convert_to_ndarray(xshroud)
         self.rshroud_pts = convert_to_ndarray(rshroud)
         
@@ -81,8 +85,7 @@ class Passage:
             rhub = self.rhub(t)
             xshroud = self.xshroud(t)
             rshroud = self.rshroud(t)
-            x_streamline[i],r_streamline[i] = line2D([xhub,rhub],[xshroud,rshroud]).get_point(t_radial)
-        
+            x_streamline[i] ,r_streamline[i] = line2D([xhub,rhub],[xshroud,rshroud]).get_point(t_radial)
         return t_streamline,x_streamline,r_streamline
 
     @staticmethod
@@ -115,6 +118,7 @@ class Passage:
     
         d_dx = FinDiff(0,x_streamline[indices[0]:indices[-1]],1)
         d2_dx2 = FinDiff(0,x_streamline[indices[0]:indices[-1]],2)
+        
         dr_dx = d_dx(r_streamline[indices[0]:indices[-1]])
         d2r_dx2 = d2_dx2(r_streamline[indices[0]:indices[-1]])    
             

turbodesign/spool.py

@@ -32,7 +32,7 @@ class Spool:
     
     # Inlet Conditions 
     def __init__(self,passage:Passage,
-                 massflow:float,rows=List[BladeRow],
+                 massflow:float,rows:List[BladeRow],
                  num_streamlines:int=3,
                  fluid:Solution=None,
                  rpm:float=-1,

turbodesign/td_math.py

@@ -1,4 +1,4 @@
-from typing import List, Tuple
+from typing import List, Optional, Tuple
 import numpy as np
 import math
 import numpy.typing as npt
@@ -93,7 +93,7 @@ def compute_reynolds(rows:List[BladeRow],passage:Passage):
     
     for i in range(1,len(rows)):
         row = rows[i]
-        xr = passage.get_xr_slice(0.5,[rows[i-1].location,row.percent_hub])
+        xr = passage.get_xr_slice(0.5,(rows[i-1].location,row.percent_hub))
         dx = np.diff(xr[:,0])
         dr = np.diff(xr[:,1])
         c = np.sum(np.sqrt(dx**2+dr**2))
@@ -124,8 +124,8 @@ def compute_power(row:BladeRow,upstream:BladeRow) -> None:
         row.eta_total = 0
         row.stage_loading = 0
         row.euler_power = 0
-        row.T_is = 0 
-        row.T0_is = 0
+        row.T_is = 0 * row.T0 
+        row.T0_is = 0 * row.T0 # Make it an array
     else:
         P0_P = (upstream.P0/row.P).mean()
         row.T_is = upstream.T0 * (1/P0_P)**((row.gamma-1)/row.gamma)
@@ -165,7 +165,7 @@ def compute_quantities(row:BladeRow,upstream:BladeRow):
             row.T = (row.P/row.P0R)**((row.gamma-1)/row.gamma) * row.T0R
             row.T0 = (1+(row.gamma-1)/2 * row.M**2) * row.T
             row.power_distribution = row.massflow * row.Cp * (upstream.T0 - row.T0)
-            row.power = np.trapz(row.power_distribution,row.r-row.r[0])
+            row.power = np.trapezoid(row.power_distribution,row.r-row.r[0])
             row.power_mean = row.massflow[-1] * row.Cp * (upstream.T0.mean()-row.T0.mean())
 
         elif row.loss_function.loss_type == LossType.Enthalpy:
@@ -175,7 +175,7 @@ def compute_quantities(row:BladeRow,upstream:BladeRow):
 
             def calculate_power(T0:npt.NDArray):
                 row.power_distribution = row.massflow * row.Cp * (upstream.T0 - T0)
-                row.power = np.trapz(row.power_distribution,row.r-row.r[0])
+                row.power = np.trapezoid(row.power_distribution,row.r-row.r[0])
                 row.power_mean = row.massflow[-1] * row.Cp * (upstream.T0.mean() - T0.mean())
 
                 # Factor in T0R_drop. Convert T0R drop to absolute terms
@@ -206,7 +206,7 @@ def compute_quantities(row:BladeRow,upstream:BladeRow):
         row.T0R = row.T + row.W**2 / (2*row.Cp)
         row.P0R = row.P*(row.T0R/row.T)**((row.gamma)/(row.gamma-1))
    
-def stator_calc(row:BladeRow,upstream:BladeRow,downstream:BladeRow=None,calculate_vm:bool=True):
+def stator_calc(row:BladeRow,upstream:BladeRow,downstream:Optional[BladeRow]=None,calculate_vm:bool=True):
     """Given P0, T0, P, alpha2 of stator calculate all other quantities
 
     Usage:
@@ -233,8 +233,8 @@ def stator_calc(row:BladeRow,upstream:BladeRow,downstream:BladeRow=None,calculat
     row.P0 = upstream.P0 - row.Yp*(upstream.P0-row.P)
     
     if downstream is not None:
-        row.P0_P = row.P0/downstream.P
-        row.rp = (row.P-downstream.P)/(upstream.P0-downstream.P)
+        row.P0_P = float((row.P0/downstream.P).mean())
+        row.rp = ((row.P-downstream.P)/(upstream.P0-downstream.P)).mean()
         
     if calculate_vm:
         row.M = ((row.P0/row.P)**((row.gamma-1)/row.gamma) - 1) * 2/(row.gamma-1)
@@ -276,7 +276,7 @@ def rotor_calc(row:BladeRow,upstream:BladeRow,calculate_vm:bool=True):
     # row.P = row.P0_stator_inlet*1/row.P0_P
     
     # Static Pressure is assumed
-    row.P0_P = row.P0_stator_inlet/row.P
+    row.P0_P = (row.P0_stator_inlet/row.P).mean()
     upstream_radius = upstream.r
     row.U = row.omega*row.r
     # Upstream Relative Frame Calculations 
@@ -353,7 +353,7 @@ def inlet_calc(row:BladeRow):
         for j in range(1,len(row.percent_hub_shroud)):
             rho = row.rho[j]
             tube_massflow = row.massflow[j]-row.massflow[j-1]
-            if np.abs((row.x[j]-row.x[j-1]))<1E-12: # Axial Machines  
+            if np.abs((row.x[j]-row.x[j-1]))<1E-6: # Axial Machines  
                 total_area += np.pi*(row.r[j]**2-row.r[j-1]**2)
                 row.Vm[j] = tube_massflow/(rho*np.pi*(row.r[j]**2-row.r[j-1]**2))
             else:   # Radial Machines
@@ -364,10 +364,6 @@ def inlet_calc(row:BladeRow):
                 total_area += area[j]
                 row.Vm[j] = tube_massflow/(rho*area[j])
         avg_mach = np.mean(row.M)
-        if np.mean(row.M)>0.5:
-            raise ValueError(f"High inlet mach can lead to errors iter:{iter} Mach:{avg_mach}")
-        if np.mean(row.M)<0.01:
-            raise ValueError(f"Unusually slow flow:{iter} Mach:{avg_mach}")
         row.Vm[0] = 1/(len(row.Vm)-1)*row.Vm[1:].sum() # Initialize the value at the hub to not upset the mean
         row.Vr = row.Vm*np.sin(row.phi)
         row.Vt = row.Vm*np.tan(row.alpha2)
@@ -376,4 +372,10 @@ def inlet_calc(row:BladeRow):
         row.M = row.V/np.sqrt(row.gamma*row.R*row.T)
         row.T = row.T0 * 1/(1+(row.gamma-1)/2*row.M**2)
         row.P = row.P0 * (row.T/row.T0)**(row.gamma/(row.gamma-1))
-        compute_gas_constants(row)
+        compute_gas_constants(row)
+        
+    if np.mean(row.M)>0.5:
+        raise ValueError(f"High inlet mach can lead to errors iter:{iter} Mach:{avg_mach}")
+    
+    if np.mean(row.M)<0.01:
+        print(f"Unusually slow flow:{iter} Mach:{avg_mach}")

turbodesign/turbinespool.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Optional
 from cantera.composite import Solution
 from .bladerow import BladeRow, interpolate_streamline_radii
 from .enums import RowType, MassflowConstraint, LossType, PassageType
@@ -20,9 +20,9 @@ class TurbineSpool(Spool):
     def __init__(self,passage:Passage,
                  massflow:float,rows:List[BladeRow],
                  num_streamlines:int=3,
-                 fluid:Solution=Solution('air.yaml'),
+                 fluid:Optional[Solution]=Solution('air.yaml'),
                  rpm:float=-1,
-                 massflow_constraint:MassflowConstraint=MassflowConstraint.MatchMassFlow):
+                 massflow_constraint:MassflowConstraint=MassflowConstraint.MatchMassFlow): # type: ignore
         """Initializes a Turbine Spool
 
         Args:
@@ -48,9 +48,9 @@ class TurbineSpool(Spool):
         W0 = self.massflow
         inlet = self.blade_rows[0]
         if self.fluid:
-            inlet.initialize_fluid(self.fluid)
+            inlet.initialize_fluid(self.fluid) # type: ignore
         else:
-            inlet.initialize_fluid(R=self.blade_rows[1].R,
+            inlet.initialize_fluid(R=self.blade_rows[1].R, # type: ignore
                                     gamma=self.blade_rows[1].gamma,
                                     Cp=self.blade_rows[1].Cp)
         
@@ -58,7 +58,8 @@ class TurbineSpool(Spool):
         inlet.total_massflow_no_coolant = W0
         inlet.massflow = np.linspace(0,1,self.num_streamlines)*W0
         
-        inlet.initialize_velocity(self.passage,self.num_streamlines)    
+        inlet.initialize_inputs(self.num_streamlines)
+        inlet.initialize_velocity(self.passage,self.num_streamlines)     # type: ignore
         interpolate_streamline_radii(inlet,self.passage,self.num_streamlines)
 
         compute_gas_constants(inlet,self.fluid)
@@ -69,10 +70,10 @@ class TurbineSpool(Spool):
 
         outlet = self.blade_rows[-1]
         for j in range(self.num_streamlines):
-            P0 = inlet.get_total_pressure(inlet.percent_hub_shroud[j])
+            P0 = inlet.get_total_pressure(inlet.percent_hub_shroud[j]) # type: ignore
             percents = np.zeros(shape=(len(self.blade_rows)-2)) + 0.3
             percents[-1] = 1
-            Ps_range = outlet_pressure(percents=percents,inletP0=inlet.P0[j],outletP=outlet.P[j])
+            Ps_range = outlet_pressure(percents=percents,inletP0=inlet.P0[j],outletP=outlet.P[j]) # type: ignore
             for i in range(1,len(self.blade_rows)-1):
                 self.blade_rows[i].P[j] = Ps_range[i-1]
             
@@ -122,7 +123,7 @@ class TurbineSpool(Spool):
             row.R = upstream.R
             
             if row.row_type == RowType.Stator:
-                stator_calc(row,upstream,downstream)
+                stator_calc(row,upstream,downstream) # type: ignore
                 compute_massflow(row)
             elif row.row_type == RowType.Rotor:
                 rotor_calc(row,upstream)
@@ -162,11 +163,11 @@ class TurbineSpool(Spool):
                 
                 if row.row_type == RowType.Stator:
                     bounds = [0,80]
-                elif row.row_type == RowType.Rotor:
+                else:# row.row_type == RowType.Rotor:
                     bounds = [-80,0]
                 if row.row_type != RowType.Inlet:
                     for j in range(1,self.num_streamlines):
-                        res = minimize_scalar(massflow_loss_function, bounds=bounds,args=(j,row,upstream,downstream),tol=1E-3)
+                        res = minimize_scalar(massflow_loss_function, bounds=bounds,args=(j,row,upstream,downstream),tol=1E-3) 
                         if row.row_type == RowType.Rotor:
                             row.beta2[j] = np.radians(res.x)
                              # Initialize the value at the hub to not upset the mean
@@ -228,7 +229,7 @@ class TurbineSpool(Spool):
        
             
         # Balance the massflow between Stages
-        def balance_massflows(x0:List[float],blade_rows:List[List[BladeRow]],P0:npt.NDArray,P:npt.NDArray,balance_mean_pressure:bool=True):
+        def balance_massflows(x0:List[float],blade_rows:List[BladeRow],P0:npt.NDArray,P:npt.NDArray,balance_mean_pressure:bool=True):
             """Balance Massflows. 
             
             Steps:
@@ -247,18 +248,18 @@ class TurbineSpool(Spool):
             Returns:
                 _type_: _description_
             """
-            blade_rows_backup = copy.deepcopy(blade_rows)
+            # blade_rows_backup = copy.deepcopy(blade_rows)
             # try:
             if balance_mean_pressure:
                 for j in range(self.num_streamlines):
                     Ps = outlet_pressure(x0,P0[j],P[j])
                     for i in range(1,len(blade_rows)-2):
-                        blade_rows[i].P[j] = float(Ps[i-1])
-                blade_rows[-2].P = P
+                        blade_rows[i].P[j] = float(Ps[i-1]) # type: ignore
+                blade_rows[-2].P = P # type: ignore
             else:
                 for i in range(1,len(blade_rows)-1):
                     for j in range(self.num_streamlines):
-                        blade_rows[i].P[j] = P[j]*x0[(i-1)*self.num_streamlines+j]    # x0 size = num_streamlines -1 
+                        blade_rows[i].P[j] = P[j]*x0[(i-1)*self.num_streamlines+j]    # type: ignore # x0 size = num_streamlines -1 
             # try:  
             calculate_massflows(blade_rows,True,self.fluid)
             print(x0)
@@ -293,14 +294,14 @@ class TurbineSpool(Spool):
             # Adjust the inlet: Set the massflow
             self.blade_rows[0].massflow = np.linspace(0,1,self.num_streamlines)*self.blade_rows[1].total_massflow_no_coolant
             self.blade_rows[0].total_massflow_no_coolant = self.blade_rows[1].total_massflow_no_coolant
-            self.blade_rows[0].total_massflow = np.linspace(0,1,self.num_streamlines)*self.blade_rows[1].total_massflow_no_coolant
+            self.blade_rows[0].total_massflow = self.blade_rows[1].total_massflow_no_coolant
             self.blade_rows[0].calculated_massflow = self.blade_rows[0].total_massflow_no_coolant
             inlet_calc(self.blade_rows[0]) # adjust the inlet to match massflow 
         
             if self.adjust_streamlines:
                 adjust_streamlines(self.blade_rows[:-1],self.passage)
                 
-            self.blade_rows[-1].transfer_quantities(self.blade_rows[-2])
+            self.blade_rows[-1].transfer_quantities(self.blade_rows[-2])    # This would be the outlet
             self.blade_rows[-1].P = self.blade_rows[-1].get_static_pressure(self.blade_rows[-1].percent_hub_shroud)
             
             past_err = err
@@ -388,7 +389,7 @@ class TurbineSpool(Spool):
             json.dump(data, f, indent=4,cls=NumpyEncoder)
 
 
-def calculate_massflows(blade_rows:List[BladeRow],calculate_vm:bool=False,fluid:Solution=None):
+def calculate_massflows(blade_rows:List[BladeRow],calculate_vm:bool=False,fluid:Optional[Solution]=None):
     """Calculates the massflow 
 
     Args: