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

Merge pull request #1808 from JoePfeiffer/landing-stepper-log

Browse Source 
Log time steps in BasicLandingStepper with log.trace instead of log.debug
This commit is contained in:
Joe Pfeiffer 2022-11-10 08:53:52 -07:00 committed by GitHub
commit bb47a5eca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
} }
// but don't let it get *too* small // but don't let it get *too* small
timeStep = Math.max(timeStep, MIN_TIME_STEP); timeStep = Math.max(timeStep, MIN_TIME_STEP);
log.debug("timeStep is " + timeStep); log.trace("timeStep is " + timeStep);
// Perform Euler integration // Perform Euler integration
Coordinate newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)). Coordinate newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)).
@ -95,7 +95,7 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
// The new timestep is the solution of // The new timestep is the solution of
// 1/2 at^2 + vt + z0 = 0 // 1/2 at^2 + vt + z0 = 0
timeStep = (-v - Math.sqrt(v*v - 2*a*z0))/a; timeStep = (-v - Math.sqrt(v*v - 2*a*z0))/a;
log.debug("ground hit changes timeStep to " + timeStep); log.trace("ground hit changes timeStep to " + timeStep);
newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)). newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)).
add(linearAcceleration.multiply(MathUtil.pow2(timeStep) / 2)); add(linearAcceleration.multiply(MathUtil.pow2(timeStep) / 2));
@ -176,7 +176,7 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
data.setValue(FlightDataType.TYPE_TIME_STEP, timeStep); data.setValue(FlightDataType.TYPE_TIME_STEP, timeStep);
data.setValue(FlightDataType.TYPE_COMPUTATION_TIME, data.setValue(FlightDataType.TYPE_COMPUTATION_TIME,
(System.nanoTime() - status.getSimulationStartWallTime()) / 1000000000.0); (System.nanoTime() - status.getSimulationStartWallTime()) / 1000000000.0);
log.debug("time " + data.getLast(FlightDataType.TYPE_TIME) + ", altitude " + data.getLast(FlightDataType.TYPE_ALTITUDE) + ", velocity " + data.getLast(FlightDataType.TYPE_VELOCITY_Z)); log.trace("time " + data.getLast(FlightDataType.TYPE_TIME) + ", altitude " + data.getLast(FlightDataType.TYPE_ALTITUDE) + ", velocity " + data.getLast(FlightDataType.TYPE_VELOCITY_Z));
} }
} }