Fix: Add opening shock calculation to overshoot loop

Author: FelipeAlmeidaUSP

rocketpy/rocket/parachute.py

@@ -321,6 +321,7 @@ def to_dict(self, **kwargs):
             "radius": self.radius,
             "height": self.height,
             "porosity": self.porosity,
+            "opening_shock_coefficient": self.opening_shock_coefficient,
         }
 
         if kwargs.get("include_outputs", False):
@@ -332,6 +333,7 @@ def to_dict(self, **kwargs):
             )
             data["noisy_pressure_signal"] = self.noisy_pressure_signal
             data["clean_pressure_signal"] = self.clean_pressure_signal
+            data["opening_shock_force"] = self.opening_shock_force
 
         return data
 
@@ -354,6 +356,7 @@ def from_dict(cls, data):
             radius=data.get("radius", 1.5),
             height=data.get("height", None),
             porosity=data.get("porosity", 0.0432),
+            opening_shock_coefficient=data.get("opening_shock_coefficient", 1.6),
         )
 
         return parachute

rocketpy/simulation/flight.py

@@ -774,20 +774,8 @@ def __simulate(self, verbose):
                         self.sensors,
                     ):
 
-                        # Calculate opening shock force
-                        opening_altitude = self.y_sol[2]
-                        opening_density = self.env.density(opening_altitude)
-                        opening_velocity = (
-                            (self.y_sol[3]) ** 2
-                            + (self.y_sol[4]) ** 2
-                            + (self.y_sol[5]) ** 2
-                        ) ** 0.5
-
-                        parachute.opening_shock_force = (
-                            parachute.calculate_opening_shock(
-                                opening_density, opening_velocity
-                            )
-                        )
+                        # Calculates the parachute's opening shock force
+                        self.calculate_parachute_opening_shock_force(parachute)
 
                         # Remove parachute from flight parachutes
                         self.parachutes.remove(parachute)
@@ -1108,6 +1096,12 @@ def __simulate(self, verbose):
                                         phase.time_nodes.flush_after(node_index)
                                         phase.time_nodes.add_node(self.t, [], [], [])
                                         phase.solver.status = "finished"
+
+                                        # Calculates the parachute's opening shock force
+                                        self.calculate_parachute_opening_shock_force(
+                                            parachute
+                                        )
+
                                         # Save parachute event
                                         self.parachute_events.append(
                                             [self.t, parachute]
@@ -4371,3 +4365,18 @@ def rail_button2_bending_moment(self):
     def max_rail_button2_bending_moment(self):
         """Maximum lower rail button bending moment, in N·m."""
         return self.calculate_rail_button_bending_moments[3]
+
+    def calculate_parachute_opening_shock_force(self, parachute):
+        """Calculates and stores the shock force on parachute opening
+        Uses the current self.y_sol and self.env.
+        """
+        # Calculate opening shock force
+        opening_altitude = self.y_sol[2]
+        opening_density = self.env.density(opening_altitude)
+        opening_velocity = (
+            (self.y_sol[3]) ** 2 + (self.y_sol[4]) ** 2 + (self.y_sol[5]) ** 2
+        ) ** 0.5
+
+        parachute.opening_shock_force = parachute.calculate_opening_shock(
+            opening_density, opening_velocity
+        )

tests/integration/simulation/test_flight.py

@@ -454,7 +454,6 @@ def test_rocket_csys_equivalence(
     )
 
 
-# TODO: fix the issues on this test and debug shock analysis
 def test_opening_shock_recorded_during_flight(calisto, example_plain_env):
     """
     Testing if the opening shock is being saved correctly during simulations.