verified typing changes

Author: peterdsharpe

aerosandbox/aerodynamics/aero_2D/mses.py

@@ -1,5 +1,6 @@
 from aerosandbox.common import ExplicitAnalysis
 import aerosandbox.numpy as np
+from aerosandbox.numpy.typing import ConcreteVectorizable
 import subprocess
 from pathlib import Path
 from aerosandbox.geometry import Airfoil
@@ -184,9 +185,9 @@ def __init__(
 
     def run(
         self,
-        alpha: float | np.ndarray | list = 0.0,
-        Re: float | np.ndarray | list = 0.0,
-        mach: float | np.ndarray | list = 0.01,
+        alpha: ConcreteVectorizable = 0.0,
+        Re: ConcreteVectorizable = 0.0,
+        mach: ConcreteVectorizable = 0.01,
     ):
         ### Make all inputs iterables:
         alphas, Res, machs = np.broadcast_arrays(

aerosandbox/aerodynamics/aero_2D/xfoil.py

@@ -1,5 +1,6 @@
 from aerosandbox.common import ExplicitAnalysis
 import aerosandbox.numpy as np
+from aerosandbox.numpy.typing import ConcreteVectorizable, ConcreteArray
 import subprocess
 from pathlib import Path
 from aerosandbox.geometry import Airfoil
@@ -265,7 +266,7 @@ def _run_xfoil(
         self,
         run_command: str,
         read_bl_data_from: str | None = None,
-    ) -> dict[str, np.ndarray]:
+    ) -> dict[str, ConcreteArray]:
         """
         Private function to run XFoil.
 
@@ -597,9 +598,9 @@ def open_interactive(self) -> None:
 
     def alpha(
         self,
-        alpha: float | np.ndarray,
+        alpha: ConcreteVectorizable,
         start_at: float | None = 0,
-    ) -> dict[str, np.ndarray]:
+    ) -> dict[str, ConcreteArray]:
         """
         Execute XFoil at a given angle of attack, or at a sequence of angles of attack.
 
@@ -675,9 +676,9 @@ def schedule_run(alpha: float):
 
     def cl(
         self,
-        cl: float | np.ndarray,
+        cl: ConcreteVectorizable,
         start_at: float | None = 0,
-    ) -> dict[str, np.ndarray]:
+    ) -> dict[str, ConcreteArray]:
         """
         Execute XFoil at a given lift coefficient, or at a sequence of lift coefficients.
 

aerosandbox/aerodynamics/aero_3D/singularities/point_source.py

@@ -1,16 +1,17 @@
 import aerosandbox.numpy as np
+from aerosandbox.numpy.typing import Vectorizable
 
 
 def calculate_induced_velocity_point_source(
-    x_field: float | np.ndarray,
-    y_field: float | np.ndarray,
-    z_field: float | np.ndarray,
-    x_source: float | np.ndarray,
-    y_source: float | np.ndarray,
-    z_source: float | np.ndarray,
-    sigma: float | np.ndarray = 1,
+    x_field: Vectorizable,
+    y_field: Vectorizable,
+    z_field: Vectorizable,
+    x_source: Vectorizable,
+    y_source: Vectorizable,
+    z_source: Vectorizable,
+    sigma: Vectorizable = 1,
     viscous_radius=0,
-) -> tuple[float | np.ndarray, float | np.ndarray, float | np.ndarray]:
+) -> tuple[Vectorizable, Vectorizable, Vectorizable]:
     """
     Calculates the induced velocity at a point:
         [x_field, y_field, z_field]

aerosandbox/aerodynamics/aero_3D/singularities/uniform_strength_horseshoe_singularities.py

@@ -1,20 +1,21 @@
 import aerosandbox.numpy as np
+from aerosandbox.numpy.typing import Vectorizable
 
 
 def calculate_induced_velocity_horseshoe(
-    x_field: float | np.ndarray,
-    y_field: float | np.ndarray,
-    z_field: float | np.ndarray,
-    x_left: float | np.ndarray,
-    y_left: float | np.ndarray,
-    z_left: float | np.ndarray,
-    x_right: float | np.ndarray,
-    y_right: float | np.ndarray,
-    z_right: float | np.ndarray,
-    gamma: float | np.ndarray = 1,
+    x_field: Vectorizable,
+    y_field: Vectorizable,
+    z_field: Vectorizable,
+    x_left: Vectorizable,
+    y_left: Vectorizable,
+    z_left: Vectorizable,
+    x_right: Vectorizable,
+    y_right: Vectorizable,
+    z_right: Vectorizable,
+    gamma: Vectorizable = 1,
     trailing_vortex_direction: np.ndarray | None = None,
     vortex_core_radius: float = 0,
-) -> tuple[float | np.ndarray, float | np.ndarray, float | np.ndarray]:
+) -> tuple[Vectorizable, Vectorizable, Vectorizable]:
     """
     Calculates the induced velocity at a point:
         [x_field, y_field, z_field]

aerosandbox/atmosphere/thermodynamics/gas.py

@@ -1,4 +1,5 @@
 import aerosandbox.numpy as np
+from aerosandbox.numpy.typing import Vectorizable
 from aerosandbox.tools.string_formatting import eng_string
 from typing import Literal
 
@@ -19,8 +20,8 @@ class PerfectGas:
 
     def __init__(
         self,
-        pressure: float | np.ndarray = 101325,
-        temperature: float | np.ndarray = 273.15 + 15,
+        pressure: Vectorizable = 101325,
+        temperature: Vectorizable = 273.15 + 15,
         specific_heat_constant_pressure: float = 1006,
         specific_heat_constant_volume: float = 717,
         molecular_mass: float = 28.9644e-3,

aerosandbox/dynamics/point_mass/common_point_mass.py

@@ -362,9 +362,9 @@ def convert_axes(
     @abstractmethod
     def add_force(
         self,
-        Fx: float | np.ndarray = 0,
-        Fy: float | np.ndarray = 0,
-        Fz: float | np.ndarray = 0,
+        Fx: Vectorizable = 0,
+        Fy: Vectorizable = 0,
+        Fz: Vectorizable = 0,
         axes: Literal["geometry", "body", "wind", "stability", "earth"] = "wind",
     ) -> None:
         """

aerosandbox/geometry/airfoil/airfoil.py

@@ -1,6 +1,7 @@
 import plotly.graph_objects
 import matplotlib.figure
 import aerosandbox.numpy as np
+from aerosandbox.numpy.typing import Vectorizable
 from aerosandbox.geometry.polygon import Polygon
 from aerosandbox.geometry.airfoil.airfoil_families import (
     get_NACA_coordinates,
@@ -779,8 +780,8 @@ def plot_polars(
             )
 
     def local_camber(
-        self, x_over_c: float | np.ndarray = np.linspace(0, 1, 101)
-    ) -> float | np.ndarray:
+        self, x_over_c: Vectorizable = np.linspace(0, 1, 101)
+    ) -> Vectorizable:
         """
         Returns the local camber of the airfoil at a given point or points.
 
@@ -807,8 +808,8 @@ def local_camber(
         return (upper_interpolated + lower_interpolated) / 2
 
     def local_thickness(
-        self, x_over_c: float | np.ndarray = np.linspace(0, 1, 101)
-    ) -> float | np.ndarray:
+        self, x_over_c: Vectorizable = np.linspace(0, 1, 101)
+    ) -> Vectorizable:
         """
         Returns the local thickness of the airfoil at a given point or points.
 

aerosandbox/geometry/airfoil/kulfan_airfoil.py

@@ -472,7 +472,7 @@ def get_aero_from_neuralfoil(
 
     def upper_coordinates(
         self,
-        x_over_c: float | np.ndarray = np.linspace(1, 0, 101),
+        x_over_c: Vectorizable = np.linspace(1, 0, 101),
     ) -> np.ndarray:
         x_over_c = np.array(x_over_c)
 
@@ -528,7 +528,7 @@ def tall(vector):
 
     def lower_coordinates(
         self,
-        x_over_c: float | np.ndarray = np.linspace(0, 1, 101),
+        x_over_c: Vectorizable = np.linspace(0, 1, 101),
     ) -> np.ndarray:
         x_over_c = np.array(x_over_c)
 
@@ -578,8 +578,8 @@ def tall(vector):
 
     def local_camber(
         self,
-        x_over_c: float | np.ndarray = np.linspace(0, 1, 101),
-    ) -> float | np.ndarray:
+        x_over_c: Vectorizable = np.linspace(0, 1, 101),
+    ) -> Vectorizable:
         upper = self.upper_coordinates(x_over_c=x_over_c)
         lower = self.lower_coordinates(x_over_c=x_over_c)
 
@@ -590,8 +590,8 @@ def local_camber(
 
     def local_thickness(
         self,
-        x_over_c: float | np.ndarray = np.linspace(0, 1, 101),
-    ) -> float | np.ndarray:
+        x_over_c: Vectorizable = np.linspace(0, 1, 101),
+    ) -> Vectorizable:
         upper = self.upper_coordinates(x_over_c=x_over_c)
         lower = self.lower_coordinates(x_over_c=x_over_c)
 

aerosandbox/geometry/fuselage.py

@@ -2,7 +2,7 @@
 from typing import Any, Callable, Literal, Sequence
 import aerosandbox.numpy as np
 import copy
-from aerosandbox.numpy.typing import Scalar  # Type alias including CasADi types
+from aerosandbox.numpy.typing import Scalar, Vectorizable
 
 
 class Fuselage(AeroSandboxObject):
@@ -858,8 +858,8 @@ def compute_frame(self) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
         return xg_local, yg_local, zg_local
 
     def get_3D_coordinates(
-        self, theta: float | np.ndarray | None = None
-    ) -> tuple[float | np.ndarray, float | np.ndarray, float | np.ndarray]:
+        self, theta: Vectorizable | None = None
+    ) -> tuple[Vectorizable, Vectorizable, Vectorizable]:
         """
         Samples points from the perimeter of this FuselageXSec.
 

aerosandbox/geometry/polygon.py

@@ -1,4 +1,5 @@
 import aerosandbox.numpy as np
+from aerosandbox.numpy.typing import ConcreteVectorizable
 from matplotlib import path
 from aerosandbox.common import AeroSandboxObject
 from pathlib import Path
@@ -286,9 +287,9 @@ def write_sldcrv(self, filepath: Path | str | None = None):
 
     def contains_points(
         self,
-        x: float | np.ndarray,
-        y: float | np.ndarray,
-    ) -> float | np.ndarray:
+        x: ConcreteVectorizable,
+        y: ConcreteVectorizable,
+    ) -> ConcreteVectorizable:
         """
         Returns a boolean array of whether some (x, y) point(s) are contained within the Polygon.