MNT: make format changes

- MNT: used make format to correct formatting mistakes on all the new classes.

Author: aZira371

rocketpy/__init__.py

@@ -17,8 +17,8 @@
     MassBasedTank,
     MassFlowRateBasedTank,
     Motor,
-    SolidMotor,
     PointMassMotor,
+    SolidMotor,
     SphericalTank,
     Tank,
     TankGeometry,
@@ -36,9 +36,9 @@
     LinearGenericSurface,
     NoseCone,
     Parachute,
+    PointMassRocket,
     RailButtons,
     Rocket,
-    PointMassRocket,
     Tail,
     TrapezoidalFins,
 )

rocketpy/motors/__init__.py

@@ -3,8 +3,8 @@
 from .hybrid_motor import HybridMotor
 from .liquid_motor import LiquidMotor
 from .motor import GenericMotor, Motor
+from .point_mass_motor import PointMassMotor
 from .solid_motor import SolidMotor
-from .pointmassmotor import PointMassMotor
 from .tank import (
     LevelBasedTank,
     MassBasedTank,

rocketpy/motors/pointmassmotor.py renamed to rocketpy/motors/point_mass_motor.py

@@ -1,9 +1,13 @@
 from functools import cached_property
-import numpy as np
 from typing import Callable
+
+import numpy as np
+
 from rocketpy.mathutils.function import Function, funcify_method
+
 from .motor import Motor
 
+
 class PointMassMotor(Motor):
     """Motor modeled as a point mass for 3-DOF simulations."""
 
@@ -78,14 +82,25 @@ def _zero_inertia_func(self):
         return Function(0.0)
 
     @cached_property
-    def propellant_I_11(self): return self._zero_inertia_func()
+    def propellant_I_11(self):
+        return self._zero_inertia_func()
+
     @cached_property
-    def propellant_I_12(self): return self._zero_inertia_func()
+    def propellant_I_12(self):
+        return self._zero_inertia_func()
+
     @cached_property
-    def propellant_I_13(self): return self._zero_inertia_func()
+    def propellant_I_13(self):
+        return self._zero_inertia_func()
+
     @cached_property
-    def propellant_I_22(self): return self._zero_inertia_func()
+    def propellant_I_22(self):
+        return self._zero_inertia_func()
+
     @cached_property
-    def propellant_I_23(self): return self._zero_inertia_func()
+    def propellant_I_23(self):
+        return self._zero_inertia_func()
+
     @cached_property
-    def propellant_I_33(self): return self._zero_inertia_func()
+    def propellant_I_33(self):
+        return self._zero_inertia_func()

rocketpy/rocket/__init__.py

@@ -14,5 +14,4 @@
 )
 from rocketpy.rocket.components import Components
 from rocketpy.rocket.parachute import Parachute
-from rocketpy.rocket.rocket import Rocket
-from rocketpy.rocket.rocket import PointMassRocket
+from rocketpy.rocket.rocket import PointMassRocket, Rocket

rocketpy/rocket/rocket.py

@@ -2004,6 +2004,7 @@ def from_dict(cls, data):
 
         return rocket
 
+
 class PointMassRocket(Rocket):
     def __init__(
         self,
@@ -2065,31 +2066,49 @@ def center_of_mass(self, value):
     # Inertia Properties (always zero)
     # ------------------------------------------------------------------
     @property
-    def dry_I_11(self): return 0.0
+    def dry_I_11(self):
+        return 0.0
+
     @dry_I_11.setter
-    def dry_I_11(self, value): self._dry_I_11 = 0.0
+    def dry_I_11(self, value):
+        self._dry_I_11 = 0.0
 
     @property
-    def dry_I_22(self): return 0.0
+    def dry_I_22(self):
+        return 0.0
+
     @dry_I_22.setter
-    def dry_I_22(self, value): self._dry_I_22 = 0.0
+    def dry_I_22(self, value):
+        self._dry_I_22 = 0.0
 
     @property
-    def dry_I_33(self): return 0.0
+    def dry_I_33(self):
+        return 0.0
+
     @dry_I_33.setter
-    def dry_I_33(self, value): self._dry_I_33 = 0.0
+    def dry_I_33(self, value):
+        self._dry_I_33 = 0.0
 
     @property
-    def dry_I_12(self): return 0.0
+    def dry_I_12(self):
+        return 0.0
+
     @dry_I_12.setter
-    def dry_I_12(self, value): self._dry_I_12 = 0.0
+    def dry_I_12(self, value):
+        self._dry_I_12 = 0.0
 
     @property
-    def dry_I_13(self): return 0.0
+    def dry_I_13(self):
+        return 0.0
+
     @dry_I_13.setter
-    def dry_I_13(self, value): self._dry_I_13 = 0.0
+    def dry_I_13(self, value):
+        self._dry_I_13 = 0.0
 
     @property
-    def dry_I_23(self): return 0.0
+    def dry_I_23(self):
+        return 0.0
+
     @dry_I_23.setter
-    def dry_I_23(self, value): self._dry_I_23 = 0.0
+    def dry_I_23(self, value):
+        self._dry_I_23 = 0.0

rocketpy/simulation/flight.py

@@ -4,16 +4,17 @@
 import warnings
 from copy import deepcopy
 from functools import cached_property
-from ..motors.pointmassmotor import PointMassMotor
-from ..rocket import PointMassRocket
+
 import numpy as np
 import simplekml
 from scipy.integrate import BDF, DOP853, LSODA, RK23, RK45, OdeSolver, Radau
 
 from ..mathutils.function import Function, funcify_method
 from ..mathutils.vector_matrix import Matrix, Vector
+from ..motors.point_mass_motor import PointMassMotor
 from ..plots.flight_plots import _FlightPlots
 from ..prints.flight_prints import _FlightPrints
+from ..rocket import PointMassRocket
 from ..tools import (
     calculate_cubic_hermite_coefficients,
     euler313_to_quaternions,
@@ -1195,14 +1196,17 @@ def __init_solver_monitors(self):
     def __init_equations_of_motion(self):
         """Initialize equations of motion."""
         # Determine if a point-mass model is used.
-        is_point_mass = (
-            isinstance(self.rocket, PointMassRocket)
-            or (self.rocket._motors and isinstance(self.rocket._motors[0], PointMassMotor))
+        is_point_mass = isinstance(self.rocket, PointMassRocket) or (
+            hasattr(self.rocket, "motor")
+            and isinstance(self.rocket.motor, PointMassMotor)
         )
         # Set simulation mode based on model type.
         if is_point_mass:
             if self.simulation_mode != "3 DOF":
-                warnings.warn("A point-mass model was detected. Simulation mode should be '3 DOF'.", UserWarning)
+                warnings.warn(
+                    "A point-mass model was detected. Simulation mode should be '3 DOF'.",
+                    UserWarning,
+                )
             self.simulation_mode = "3 DOF"
         else:
             self.simulation_mode = self.simulation_mode
@@ -1213,14 +1217,15 @@ def __init_equations_of_motion(self):
             self.u_dot_generalized = self.u_dot_generalized_3dof
         elif self.simulation_mode == "6 DOF":
             if self.equations_of_motion == "solid_propulsion":
-                self.u_dot_generalized = self.u_dot_6dof
+                self.u_dot_generalized = self.u_dot
             else:
-                self.u_dot_generalized = self.u_dot_generalized_6dof
+                self.u_dot_generalized = self.u_dot_generalized
         else:
             raise ValueError(
                 f"Invalid simulation_mode: {self.simulation_mode}. "
                 "Must be '3 DOF' or '6 DOF'."
             )
+
     def __init_controllers(self):
         """Initialize controllers and sensors"""
         self._controllers = self.rocket._controllers[:]
@@ -1580,17 +1585,8 @@ def u_dot(self, t, u, post_processing=False):  # pylint: disable=too-many-locals
             R3 += Z
         # Linear acceleration
         L = [
-            (
-                R1
-
-            )
-            / total_mass_at_t,
-            (
-                R2
-
-            )
-            / total_mass_at_t,
-
+            (R1) / total_mass_at_t,
+            (R2) / total_mass_at_t,
             (R3 - b * propellant_mass_at_t * (alpha2 - omega1 * omega3) + net_thrust)
             / total_mass_at_t,
         ]
@@ -1622,7 +1618,6 @@ def u_dot(self, t, u, post_processing=False):  # pylint: disable=too-many-locals
 
         if post_processing:
             self.__post_processed_variables.append(
-
                 [
                     t,
                     ax,
@@ -1700,11 +1695,7 @@ def u_dot_generalized_3dof(self, t, u, post_processing=False):
                     air_brake.deployment_level, mach
                 )
                 ab_force = (
-                    -0.5
-                    * rho
-                    * free_stream_speed**2
-                    * air_brake.reference_area
-                    * ab_cd
+                    -0.5 * rho * free_stream_speed**2 * air_brake.reference_area * ab_cd
                 )
                 if air_brake.override_rocket_drag:
                     R3 = ab_force
@@ -1759,7 +1750,6 @@ def u_dot_generalized_3dof(self, t, u, post_processing=False):
         if post_processing:
             self.__post_processed_variables.append(
                 [t, *v_dot, *w_dot, R1, R2, R3, 0, 0, 0]
-
             )
 
         return u_dot
@@ -1769,7 +1759,7 @@ def u_dot_generalized(self, t, u, post_processing=False):  # pylint: disable=too
         rocket is flying in 6 DOF motion in space and significant mass variation
         effects exist. Typical flight phases include powered ascent after launch
         rail.
-    
+
         Parameters
         ----------
         t : float