From d0a15f2a0f2e8e7401224bc632d04caa12fb2786 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Wed, 9 Nov 2022 16:07:12 -0700 Subject: [PATCH] Change peak thrust of G77 simulation motor so Falcon9H test rocket doesn't tumble until well after stage separations Put order of expected events to match the new test rocket --- core/src/net/sf/openrocket/util/TestRockets.java | 2 +- .../net/sf/openrocket/simulation/FlightEventsTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/net/sf/openrocket/util/TestRockets.java b/core/src/net/sf/openrocket/util/TestRockets.java index 44dc7b827..bb9ba1347 100644 --- a/core/src/net/sf/openrocket/util/TestRockets.java +++ b/core/src/net/sf/openrocket/util/TestRockets.java @@ -217,7 +217,7 @@ public class TestRockets { .setDiameter(0.029) .setLength(0.124) .setTimePoints(new double[] { 0, 1, 2 }) - .setThrustPoints(new double[] { 0, 1, 0 }) + .setThrustPoints(new double[] { 0, 20, 0 }) .setCGPoints(new Coordinate[] { new Coordinate(.062, 0, 0, 0.123),new Coordinate(.062, 0, 0, .0935),new Coordinate(.062, 0, 0, 0.064)}) .setDigest("digest G77 test") diff --git a/core/test/net/sf/openrocket/simulation/FlightEventsTest.java b/core/test/net/sf/openrocket/simulation/FlightEventsTest.java index 037290746..2b45608d8 100644 --- a/core/test/net/sf/openrocket/simulation/FlightEventsTest.java +++ b/core/test/net/sf/openrocket/simulation/FlightEventsTest.java @@ -76,10 +76,10 @@ public class FlightEventsTest extends BaseTestCase { switch (b) { case 0: expectedEventTypes = new FlightEvent.Type[]{FlightEvent.Type.LAUNCH, FlightEvent.Type.IGNITION, FlightEvent.Type.IGNITION, - FlightEvent.Type.LIFTOFF, FlightEvent.Type.LAUNCHROD, FlightEvent.Type.APOGEE, FlightEvent.Type.BURNOUT, - FlightEvent.Type.BURNOUT, FlightEvent.Type.EJECTION_CHARGE, FlightEvent.Type.EJECTION_CHARGE, - FlightEvent.Type.STAGE_SEPARATION, FlightEvent.Type.STAGE_SEPARATION, FlightEvent.Type.TUMBLE, FlightEvent.Type.GROUND_HIT, - FlightEvent.Type.SIMULATION_END}; + FlightEvent.Type.LIFTOFF, FlightEvent.Type.LAUNCHROD, FlightEvent.Type.APOGEE, + FlightEvent.Type.BURNOUT, FlightEvent.Type.EJECTION_CHARGE, FlightEvent.Type.STAGE_SEPARATION, + FlightEvent.Type.BURNOUT, FlightEvent.Type.EJECTION_CHARGE, FlightEvent.Type.STAGE_SEPARATION, + FlightEvent.Type.TUMBLE, FlightEvent.Type.GROUND_HIT, FlightEvent.Type.SIMULATION_END}; break; case 1: case 2: