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

If the user selected a really small (0) timestep, the simulation gets

Browse Source 
into an infinite loop.  Don't use a user selected timestep smaller than
MIN_TIME_STEP.
This commit is contained in:
kruland2607 2012-10-05 16:01:17 -05:00
parent 4d77c817d8
commit 372bcae9a7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,8 +138,9 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
*/ */
double[] dt = new double[8]; double[] dt = new double[8];
Arrays.fill(dt, Double.MAX_VALUE); Arrays.fill(dt, Double.MAX_VALUE);
dt[0] = status.getSimulationConditions().getTimeStep(); // If the user selected a really small timestep, use MIN_TIME_STEP instead.
dt[0] = MathUtil.max(status.getSimulationConditions().getTimeStep(),MIN_TIME_STEP);
dt[1] = maxTimeStep; dt[1] = maxTimeStep;
dt[2] = status.getSimulationConditions().getMaximumAngleStep() / store.lateralPitchRate; dt[2] = status.getSimulationConditions().getMaximumAngleStep() / store.lateralPitchRate;
dt[3] = Math.abs(MAX_ROLL_STEP_ANGLE / store.flightConditions.getRollRate()); dt[3] = Math.abs(MAX_ROLL_STEP_ANGLE / store.flightConditions.getRollRate());
@ -159,7 +160,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
limitingValue = i; limitingValue = i;
} }
} }
double minTimeStep = status.getSimulationConditions().getTimeStep() / 20; double minTimeStep = status.getSimulationConditions().getTimeStep() / 20;
if (store.timestep < minTimeStep) { if (store.timestep < minTimeStep) {
log.verbose("Too small time step " + store.timestep + " (limiting factor " + limitingValue + "), using " + log.verbose("Too small time step " + store.timestep + " (limiting factor " + limitingValue + "), using " +