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

Don't report timestep on thrust log line. First it was probably meant

Browse Source 
to be simulation time, not time step, and second it's already reported
elsewhere

Report altitude and event type at each simulation step
This commit is contained in:
Joe Pfeiffer 2018-08-06 17:11:12 -06:00
parent f41f9c1ae4
commit 39d961df56
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
View File

@ -128,7 +128,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
if (nextEvent != null) { if (nextEvent != null) {
maxStepTime = MathUtil.max(nextEvent.getTime() - currentStatus.getSimulationTime(), 0.001); maxStepTime = MathUtil.max(nextEvent.getTime() - currentStatus.getSimulationTime(), 0.001);
} }
log.trace("BasicEventSimulationEngine: Taking simulation step at t=" + currentStatus.getSimulationTime()); log.trace("BasicEventSimulationEngine: Taking simulation step at t=" + currentStatus.getSimulationTime() + " altitude " + oldAlt);
currentStepper.step(currentStatus, maxStepTime); currentStepper.step(currentStatus, maxStepTime);
} }
SimulationListenerHelper.firePostStep(currentStatus); SimulationListenerHelper.firePostStep(currentStatus);
@ -319,6 +319,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
} }
// Handle event // Handle event
log.trace("Handling event " + event);
switch (event.getType()) { switch (event.getType()) {
case LAUNCH: { case LAUNCH: {
@ -486,7 +487,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
break; break;
case ALTITUDE: case ALTITUDE:
log.trace("BasicEventSimulationEngine: Handling event " + event); // nothing special needs to be done for this event
break; break;
case TUMBLE: case TUMBLE:

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

@ -182,7 +182,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
double thrustEstimate = store.thrustForce; double thrustEstimate = store.thrustForce;
store.thrustForce = calculateAverageThrust(status, store.timestep, store.longitudinalAcceleration, store.thrustForce = calculateAverageThrust(status, store.timestep, store.longitudinalAcceleration,
store.atmosphericConditions, true); store.atmosphericConditions, true);
log.trace("Thrust at time " + store.timestep + " thrustForce = " + store.thrustForce); log.trace("Thrust = " + store.thrustForce);
double thrustDiff = Math.abs(store.thrustForce - thrustEstimate); double thrustDiff = Math.abs(store.thrustForce - thrustEstimate);
// Log if difference over 1%, recompute if over 10% // Log if difference over 1%, recompute if over 10%
if (thrustDiff > 0.01 * thrustEstimate) { if (thrustDiff > 0.01 * thrustEstimate) {