hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use absolute value of jerk in calculating time step in BasicLandingStepper()

Browse Source 
Don't let time step in BasicLandingStepper() get smaller than MIN_TIME_STEP (.001 seconds)
This commit is contained in:
JoePfeiffer 2022-10-16 17:04:59 -06:00
parent 3745584e1a
commit 5f1440e3f6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java
View File

@ -13,6 +13,8 @@ import net.sf.openrocket.util.Quaternion;
public abstract class AbstractSimulationStepper implements SimulationStepper {
protected static final double MIN_TIME_STEP = 0.001;
/**
* Compute the atmospheric conditions, allowing listeners to override.
*

4
core/src/net/sf/openrocket/simulation/BasicLandingStepper.java
View File

@ -73,10 +73,12 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
double timeStep = RECOVERY_TIME_STEP;
// adjust based on change in acceleration (ie jerk)
final double jerk = linearAcceleration.sub(status.getRocketAcceleration()).multiply(1.0/status.getPreviousTimeStep()).length();
final double jerk = Math.abs(linearAcceleration.sub(status.getRocketAcceleration()).multiply(1.0/status.getPreviousTimeStep()).length());
if (jerk > MathUtil.EPSILON) {
timeStep = Math.min(timeStep, 1.0/jerk);
}
// but don't let it get *too* small
timeStep = Math.max(timeStep, MIN_TIME_STEP);
// Perform Euler integration
Coordinate newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)).

3
core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
View File

@ -58,9 +58,6 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
private static final double MAX_ROLL_RATE_CHANGE = 2 * Math.PI / 180;
private static final double MAX_PITCH_CHANGE = 4 * Math.PI / 180;
private static final double MIN_TIME_STEP = 0.001;
private Random random;