ENH: address comments and change mixin classes to geometry classes

Author: MateusStano

rocketpy/prints/aero_surface_prints.py

@@ -1,6 +1,5 @@
 from abc import ABC, abstractmethod
 
-
 class _AeroSurfacePrints(ABC):
     def __init__(self, aero_surface):
         self.aero_surface = aero_surface
@@ -77,10 +76,8 @@ def geometry(self):
         print("-------------------------------------")
         print(f"Number of fins: {self.aero_surface.n}")
         print(f"Reference rocket radius: {self.aero_surface.rocket_radius:.3f} m")
-        try:
+        if hasattr(self.aero_surface, "tip_chord"):
             print(f"Tip chord: {self.aero_surface.tip_chord:.3f} m")
-        except AttributeError:
-            pass  # it isn't a trapezoidal fin, just don't worry about tip chord
         print(f"Root chord: {self.aero_surface.root_chord:.3f} m")
         print(f"Span: {self.aero_surface.span:.3f} m")
         print(
@@ -176,10 +173,8 @@ def geometry(self):
         print("Geometric information of the fin set:")
         print("-------------------------------------")
         print(f"Reference rocket radius: {self.aero_surface.rocket_radius:.3f} m")
-        try:
+        if hasattr(self.aero_surface, "tip_chord"):
             print(f"Tip chord: {self.aero_surface.tip_chord:.3f} m")
-        except AttributeError:
-            pass  # it isn't a trapezoidal fin, just don't worry about tip chord
         print(f"Root chord: {self.aero_surface.root_chord:.3f} m")
         print(f"Span: {self.aero_surface.span:.3f} m")
         print(

rocketpy/rocket/aero_surface/fins/_base_fin.py

@@ -44,82 +44,180 @@ def __init__(
         self._airfoil = airfoil
         self._cant_angle = cant_angle
         self._cant_angle_rad = math.radians(cant_angle)
+        self.geometry = None
 
         self.d = 2 * rocket_radius
         self.ref_area = np.pi * rocket_radius**2
 
         super().__init__(name, self.ref_area, self.d)
 
+    def _run_geometry_update_chain(self):
+        """Recompute all dependent aerodynamic properties after a geometry change."""
+        self.evaluate_geometrical_parameters()
+        self.evaluate_center_of_pressure()
+        self.evaluate_lift_coefficient()
+        self.evaluate_roll_parameters()
+
     @property
     def rocket_radius(self):
+        """Rocket radius in meters.
+
+        Returns
+        -------
+        float
+            Rocket radius in meters.
+        """
         return self._rocket_radius
 
     @rocket_radius.setter
     def rocket_radius(self, value):
+        """Set rocket radius and update dependent properties.
+
+        Parameters
+        ----------
+        value : float
+            Rocket radius in meters.
+        """
         self._rocket_radius = value
-        self.evaluate_geometrical_parameters()
-        self.evaluate_center_of_pressure()
-        self.evaluate_lift_coefficient()
-        self.evaluate_roll_parameters()
+        self._run_geometry_update_chain()
 
     @property
     def root_chord(self):
+        """Root chord length in meters.
+
+        Returns
+        -------
+        float
+            Root chord length in meters.
+        """
         return self._root_chord
 
     @root_chord.setter
     def root_chord(self, value):
+        """Set root chord and update dependent properties.
+
+        Parameters
+        ----------
+        value : float
+            Root chord length in meters.
+        """
         self._root_chord = value
-        self.evaluate_geometrical_parameters()
-        self.evaluate_center_of_pressure()
-        self.evaluate_lift_coefficient()
-        self.evaluate_roll_parameters()
+        self._run_geometry_update_chain()
 
     @property
     def span(self):
+        """Fin span in meters.
+
+        Returns
+        -------
+        float
+            Fin span in meters.
+        """
         return self._span
 
     @span.setter
     def span(self, value):
+        """Set fin span and update dependent properties.
+
+        Parameters
+        ----------
+        value : float
+            Fin span in meters.
+        """
         self._span = value
-        self.evaluate_geometrical_parameters()
-        self.evaluate_center_of_pressure()
-        self.evaluate_lift_coefficient()
-        self.evaluate_roll_parameters()
+        self._run_geometry_update_chain()
 
     @property
     def cant_angle(self):
+        """Cant angle in degrees.
+
+        Returns
+        -------
+        float
+            Cant angle in degrees.
+        """
         return self._cant_angle
 
     @cant_angle.setter
     def cant_angle(self, value):
+        """Set cant angle and update radian representation.
+
+        Parameters
+        ----------
+        value : float
+            Cant angle in degrees.
+        """
         self._cant_angle = value
         self.cant_angle_rad = math.radians(value)
 
     @property
     def cant_angle_rad(self):
+        """Cant angle in radians.
+
+        Returns
+        -------
+        float
+            Cant angle in radians.
+        """
         return self._cant_angle_rad
 
     @cant_angle_rad.setter
     def cant_angle_rad(self, value):
+        """Set cant angle in radians and update dependent properties.
+
+        Parameters
+        ----------
+        value : float
+            Cant angle in radians.
+        """
         self._cant_angle_rad = value
-        self.evaluate_geometrical_parameters()
-        self.evaluate_center_of_pressure()
-        self.evaluate_lift_coefficient()
-        self.evaluate_roll_parameters()
+        self._run_geometry_update_chain()
 
     @property
     def airfoil(self):
+        """Airfoil data for the fin.
+
+        Returns
+        -------
+        tuple or None
+            Tuple containing airfoil data and unit ('degrees' or 'radians'),
+            or None if using planar fin.
+        """
         return self._airfoil
 
     @airfoil.setter
     def airfoil(self, value):
+        """Set airfoil data and update dependent properties.
+
+        Parameters
+        ----------
+        value : tuple or None
+            Tuple containing airfoil data and unit ('degrees' or 'radians'),
+            or None for planar fin.
+        """
         self._airfoil = value
-        self.evaluate_geometrical_parameters()
-        self.evaluate_center_of_pressure()
-        self.evaluate_lift_coefficient()
-        self.evaluate_roll_parameters()
+        self._run_geometry_update_chain()
+
+    def info(self):
+        """Print fin geometry and lift information."""
+        self.prints.geometry()
+        self.prints.lift()
+
+    def all_info(self):
+        """Print all available fin information and show all fin plots."""
+        self.prints.all()
+        self.plots.all()
 
     def evaluate_single_fin_lift_coefficient(self):
+        """Evaluate the lift coefficient derivative for a single fin.
+
+        Computes the lift coefficient derivative (clalpha) considering the
+        fin's geometry, airfoil characteristics (if provided), and Mach number
+        effects using Prandtl-Glauert compressibility correction and
+        Diederich's planform correlation.
+
+        Sets the `clalpha_single_fin` attribute as a Function of Mach number.
+        """
         if not self.airfoil:
             # Defines clalpha2D as 2*pi for planar fins
             clalpha2D_incompressible = 2 * np.pi
@@ -133,9 +231,7 @@ def evaluate_single_fin_lift_coefficient(self):
             )
 
             # Differentiating at alpha = 0 to get cl_alpha
-            clalpha2D_incompressible = self.airfoil_cl.differentiate_complex_step(
-                x=1e-3, dx=1e-3
-            )
+            clalpha2D_incompressible = self.airfoil_cl.differentiate(x=1e-3, dx=1e-3)
 
             # Convert to radians if needed
             if self.airfoil[1] == "degrees":
@@ -170,24 +266,30 @@ def lift_source(mach):
 
     @abstractmethod
     def evaluate_lift_coefficient(self):
-        pass
+        """Evaluate the lift coefficient for the fin."""
 
     @abstractmethod
     def evaluate_roll_parameters(self):
-        pass
+        """Evaluate roll-related parameters for the fin."""
 
     @abstractmethod
     def evaluate_center_of_pressure(self):
-        pass
+        """Evaluate the center of pressure for the fin."""
 
-    @abstractmethod
     def evaluate_geometrical_parameters(self):
-        pass
+        """Evaluate geometric parameters of the fin.
+
+        This method delegates to the configured geometry strategy.
+        """
+        self.geometry.evaluate_geometrical_parameters()
 
-    @abstractmethod
     def evaluate_shape(self):
-        pass
+        """Evaluate the shape representation of the fin.
+
+        This method delegates to the configured geometry strategy.
+        """
+        self.geometry.evaluate_shape()
 
     @abstractmethod
     def draw(self):
-        pass
+        """Draw or render the fin."""

rocketpy/rocket/aero_surface/fins/_free_form_mixin.py

@@ -114,19 +114,17 @@ def evaluate_geometrical_parameters(self):  # pylint: disable=too-many-statement
                     chord_length[i] += x
 
         # Replace infinities and handle invalid values in chord_lead and chord_trail
-        for i in range(points_per_line):
-            if (
-                np.isinf(chord_lead[i])
-                or np.isinf(chord_trail[i])
-                or np.isnan(chord_lead[i])
-                or np.isnan(chord_trail[i])
-            ):
-                chord_lead[i] = 0
-                chord_trail[i] = 0
-            if chord_length[i] < 0 or np.isnan(chord_length[i]):
-                chord_length[i] = 0
-            if chord_length[i] > chord_trail[i] - chord_lead[i]:
-                chord_length[i] = chord_trail[i] - chord_lead[i]
+        # Use vectorized operations for better performance
+        invalid_lead = np.isnan(chord_lead) | np.isinf(chord_lead)
+        invalid_trail = np.isnan(chord_trail) | np.isinf(chord_trail)
+        chord_lead[invalid_lead | invalid_trail] = 0
+        chord_trail[invalid_lead | invalid_trail] = 0
+
+        # Clamp chord_length to valid range
+        chord_length[chord_length < 0] = 0
+        chord_length[np.isnan(chord_length)] = 0
+        max_chord = chord_trail - chord_lead
+        chord_length = np.minimum(chord_length, max_chord)
 
         # Initialize integration variables for various aerodynamic and roll properties
         radius = self.rocket_radius