DEV: remove merge conflicts

Author: MateusStano

docs/notebooks/coeff_testing.ipynb

@@ -208,13 +208,13 @@ def _compute_from_coefficients(
         dyn_pressure_area_length = dyn_pressure_area * self.reference_length
 
         # Compute aerodynamic forces
-        lift = dyn_pressure_area * self.cl_lift(
+        lift = dyn_pressure_area * self.cL(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
         )
-        side = dyn_pressure_area * self.cq_side_force(
+        side = dyn_pressure_area * self.cQ(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
         )
-        drag = dyn_pressure_area * self.cd_drag(
+        drag = dyn_pressure_area * self.cD(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
         )
 
@@ -444,4 +444,4 @@ def wrapper(alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate):
             interpolation="linear",
             extrapolation="natural",
         )
-        return func
+        return func

rocketpy/rocket/aero_surface/generic_surface.py

@@ -285,20 +285,17 @@ def compute_all_coefficients(self):
         self.cLf = self.compute_forcing_coefficient(
             self.cL_0, self.cL_alpha, self.cL_beta
         )
+        self.cLd = self.compute_damping_coefficient(self.cL_p, self.cL_q, self.cL_r)
 
-        self.c_q_pitch_f = self.compute_forcing_coefficient(
-            self.cq_pitch_0, self.cq_pitch_alpha, self.cq_pitch_beta
-        )
-        self.c_q_pitch_d = self.compute_damping_coefficient(
-            self.cq_pitch_p, self.cq_pitch_q, self.cq_pitch_r
+        self.cQf = self.compute_forcing_coefficient(
+            self.cQ_0, self.cQ_alpha, self.cQ_beta
         )
+        self.cQd = self.compute_damping_coefficient(self.cQ_p, self.cQ_q, self.cQ_r)
 
-        self.c_d_drag_f = self.compute_forcing_coefficient(
-            self.cd_drag_0, self.cd_drag_alpha, self.cd_drag_beta
-        )
-        self.c_d_drag_d = self.compute_damping_coefficient(
-            self.cd_drag_p, self.cd_drag_q, self.cd_drag_r
+        self.cDf = self.compute_forcing_coefficient(
+            self.cD_0, self.cD_alpha, self.cD_beta
         )
+        self.cDd = self.compute_damping_coefficient(self.cD_p, self.cD_q, self.cD_r)
 
         self.cmf = self.compute_forcing_coefficient(
             self.cm_0, self.cm_alpha, self.cm_beta
@@ -373,19 +370,19 @@ def _compute_from_coefficients(
         )
 
         # Compute aerodynamic forces
-        lift = dyn_pressure_area * self.c_l_lift_f(
+        lift = dyn_pressure_area * self.cLf(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
         ) + dyn_pressure_area_damping * self.cLd(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
         )
 
-        side = dyn_pressure_area * self.c_q_pitch_f(
+        side = dyn_pressure_area * self.cQf(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
         ) + dyn_pressure_area_damping * self.cQd(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
         )
 
-        drag = dyn_pressure_area * self.c_d_drag_f(
+        drag = dyn_pressure_area * self.cDf(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
         ) + dyn_pressure_area_damping * self.cDd(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
@@ -410,4 +407,4 @@ def _compute_from_coefficients(
             alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate
         )
 
-        return lift, side, drag, pitch, yaw, roll
+        return lift, side, drag, pitch, yaw, roll