Merge branch 'rel/v0.11.1' of https://github.com/giovaniceotto/RocketPy into rel/v0.11.1

Author: giovaniceotto

rocketpy/Flight.py

@@ -1368,7 +1368,7 @@ def uDot(self, t, u, postProcessing=False):
 
         # Determine aerodynamics forces
         # Determine Drag Force
-        if t > self.rocket.motor.burnOutTime:
+        if t < self.rocket.motor.burnOutTime:
             dragCoeff = self.rocket.powerOnDrag.getValueOpt(freestreamMach)
         else:
             dragCoeff = self.rocket.powerOffDrag.getValueOpt(freestreamMach)

rocketpy/Rocket.py

@@ -191,14 +191,14 @@ def __init__(
             powerOffDrag,
             "Mach Number",
             "Drag Coefficient with Power Off",
-            "spline",
+            "linear",
             "constant",
         )
         self.powerOnDrag = Function(
             powerOnDrag,
             "Mach Number",
             "Drag Coefficient with Power On",
-            "spline",
+            "linear",
             "constant",
         )