Merge branch 'develop' of https://github.com/peterdsharpe/AeroSandbox into develop

Author: peterdsharpe

aerosandbox/aerodynamics/aero_3D/aero_buildup.py

@@ -11,6 +11,7 @@
     softmax_scalefree,
 )
 from dataclasses import dataclass
+from typing import Literal
 
 
 class AeroBuildup(ExplicitAnalysis):
@@ -52,7 +53,7 @@ def __init__(
         airplane: Airplane,
         op_point: OperatingPoint,
         xyz_ref: np.ndarray | list[float] | None = None,
-        model_size: str = "small",
+        model_size: Literal["small", "large"] = "small",
         include_wave_drag: bool = True,
     ):
         """

aerosandbox/atmosphere/atmosphere.py

@@ -170,7 +170,7 @@ def density(self):
 
         return rho
 
-    def density_altitude(self, method: str = "approximate"):
+    def density_altitude(self, method: Literal["approximate", "exact"] = "approximate"):
         """
         Returns the density altitude, in meters.
 

aerosandbox/dynamics/point_mass/common_point_mass.py

@@ -1,7 +1,7 @@
 import aerosandbox.numpy as np
 from aerosandbox.common import AeroSandboxObject
 from abc import ABC, abstractmethod
-from typing import Sequence
+from typing import Literal, Sequence
 from aerosandbox import (
     MassProperties,
     Opti,
@@ -13,7 +13,7 @@
 from aerosandbox.tools.string_formatting import trim_string
 import inspect
 import copy
-from aerosandbox.numpy.typing import Vectorizable, Scalar, Vector
+from aerosandbox.numpy.typing import Vectorizable, Vector
 
 
 class _DynamicsPointMassBaseClass(AeroSandboxObject, ABC):
@@ -363,7 +363,7 @@ def add_force(
         Fx: float | np.ndarray = 0,
         Fy: float | np.ndarray = 0,
         Fz: float | np.ndarray = 0,
-        axes: str = "wind",
+        axes: Literal["geometry", "body", "wind", "stability", "earth"] = "wind",
     ) -> None:
         """
         Adds a force (in whichever axis system you choose) to this Dynamics instance.
@@ -423,14 +423,14 @@ def op_point(self):
     def draw(
         self,
         vehicle_model: "Airplane | PolyData | None" = None,
-        backend: str = "pyvista",
+        backend: Literal["pyvista"] = "pyvista",
         plotter=None,
         draw_axes: bool = True,
         draw_global_axes: bool = True,
         draw_global_grid: bool = True,
         scale_vehicle_model: float | None = None,
         n_vehicles_to_draw: int = 10,
-        cg_axes: str = "geometry",
+        cg_axes: Literal["geometry", "body", "wind", "stability"] = "geometry",
         draw_trajectory_line: bool = True,
         trajectory_line_color=None,
         draw_altitude_drape: bool = True,

aerosandbox/dynamics/point_mass/point_1D/horizontal.py

@@ -2,7 +2,6 @@
     DynamicsPointMass3DCartesian,
 )
 from aerosandbox.weights.mass_properties import MassProperties
-import aerosandbox.numpy as np
 from aerosandbox.numpy.typing import Vectorizable
 
 

aerosandbox/dynamics/point_mass/point_1D/vertical.py

@@ -2,7 +2,6 @@
     DynamicsPointMass3DCartesian,
 )
 from aerosandbox.weights.mass_properties import MassProperties
-import aerosandbox.numpy as np
 from aerosandbox.numpy.typing import Vectorizable
 
 

aerosandbox/dynamics/point_mass/point_2D/cartesian.py

@@ -2,7 +2,6 @@
     DynamicsPointMass3DCartesian,
 )
 from aerosandbox.weights.mass_properties import MassProperties
-import aerosandbox.numpy as np
 from aerosandbox.numpy.typing import Vectorizable
 
 

aerosandbox/dynamics/point_mass/point_2D/speed_gamma.py

@@ -2,7 +2,6 @@
     DynamicsPointMass3DSpeedGammaTrack,
 )
 from aerosandbox.weights.mass_properties import MassProperties
-import aerosandbox.numpy as np
 from aerosandbox.numpy.typing import Vectorizable
 
 

aerosandbox/dynamics/point_mass/point_3D/speed_gamma_track.py

@@ -3,7 +3,7 @@
 )
 from aerosandbox.weights.mass_properties import MassProperties
 import aerosandbox.numpy as np
-from aerosandbox.numpy.typing import Vectorizable, Scalar
+from aerosandbox.numpy.typing import Vectorizable
 
 
 class DynamicsPointMass3DSpeedGammaTrack(_DynamicsPointMassBaseClass):

aerosandbox/dynamics/rigid_body/rigid_2D/body.py

@@ -2,7 +2,6 @@
     DynamicsRigidBody3DBodyEuler,
 )
 from aerosandbox.weights.mass_properties import MassProperties
-import aerosandbox.numpy as np
 from aerosandbox.numpy.typing import Vectorizable
 
 

aerosandbox/geometry/airfoil/airfoil.py

@@ -16,7 +16,7 @@
 import json
 from pathlib import Path
 import os
-from aerosandbox.numpy.typing import Vectorizable, ArrayLike
+from aerosandbox.numpy.typing import Vectorizable
 
 
 class Airfoil(Polygon):