Minor bug fix and feature extension

- Fixed airfoil signature to be the same as power_off_drag (str -> List[tuples])
- Implement multiple rocket fins attachment

Fixes #32

Author: GabrielBarberini

lib/models/aerosurfaces.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Optional
+from typing import Optional, List, Tuple
 from pydantic import BaseModel
 
 
@@ -34,7 +34,7 @@ class Fins(BaseModel):
     position: float
     cant_angle: float
     radius: float
-    airfoil: str
+    airfoil: Tuple[float, float]
 
 
 # TODO: implement airbrakes

lib/models/rocket.py

@@ -60,18 +60,20 @@ class Rocket(BaseModel):
         base_radius=0.0635,
         rocket_radius=0.0635,
     )
-    fins: Optional[Fins] = Fins(
-        fins_kind=FinsKinds.TRAPEZOIDAL,
-        name="Fins",
-        n=4,
-        root_chord=0.12,
-        tip_chord=0.04,
-        span=0.1,
-        position=-1.04956,
-        cant_angle=0,
-        radius=0.0635,
-        airfoil="",
-    )
+    fins: Optional[List[Fins]] = [
+        Fins(
+            fins_kind=FinsKinds.TRAPEZOIDAL,
+            name="Fins",
+            n=4,
+            root_chord=0.12,
+            tip_chord=0.04,
+            span=0.1,
+            position=-1.04956,
+            cant_angle=0,
+            radius=0.0635,
+            airfoil=(0.0, 0.0),
+        )
+    ]
     tail: Optional[Tail] = Tail(
         name="Tail",
         top_radius=0.0635,

lib/services/rocket.py

@@ -1,4 +1,4 @@
-from typing import Self
+from typing import Self, List
 
 import dill
 
@@ -63,9 +63,12 @@ def from_rocket_model(cls, rocket: Rocket) -> Self:
         rocketpy_rocket.evaluate_static_margin()
 
         # FinSet
-        finset = cls.get_rocketpy_finset(rocket.fins, rocket.fins.fins_kind)
-        rocketpy_rocket.aerodynamic_surfaces.add(finset, finset.position)
-        rocketpy_rocket.evaluate_static_margin()
+        rocketpy_finset_list = cls.get_rocketpy_finset_list_from_fins_list(
+            rocket.fins
+        )
+        for finset in rocketpy_finset_list:
+            rocketpy_rocket.aerodynamic_surfaces.add(finset, finset.position)
+            rocketpy_rocket.evaluate_static_margin()
 
         # Tail
         tail = cls.get_rocketpy_tail(rocket.tail)
@@ -134,6 +137,18 @@ def get_rocketpy_nose(nose: NoseCone) -> RocketPyNoseCone:
         rocketpy_nose.position = nose.position
         return rocketpy_nose
 
+    @classmethod
+    def get_rocketpy_finset_list_from_fins_list(
+        cls, fins_list: List[Fins]
+    ) -> List[RocketPyFins]:
+        rocketpy_finset_list = []
+        if not fins_list:
+            return []
+        for fins in fins_list:
+            rocketpy_fins = cls.get_rocketpy_finset(fins, fins.fins_kind)
+            rocketpy_finset_list.append(rocketpy_fins)
+        return rocketpy_finset_list
+
     @staticmethod
     def get_rocketpy_finset(fins: Fins, kind: str) -> RocketPyFins:
         """