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

[nonfunc] fix typo in function name

Browse Source
This commit is contained in:
Daniel_M_Williams 2017-06-19 05:00:45 -05:00
parent 724c41e2d3
commit 76d4136011
2 changed files with 3 additions and 3 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

@ -174,7 +174,7 @@ public abstract class AbstractSimulationStepper implements SimulationStepper {
* @param stepMotors whether to step the motors forward or work on a clone object * @param stepMotors whether to step the motors forward or work on a clone object
* @return the average thrust during the time step. * @return the average thrust during the time step.
*/ */
protected double calculateAvrageThrust(SimulationStatus status, double timestep, protected double calculateAverageThrust(SimulationStatus status, double timestep,
double acceleration, AtmosphericConditions atmosphericConditions, double acceleration, AtmosphericConditions atmosphericConditions,
boolean stepMotors) throws SimulationException { boolean stepMotors) throws SimulationException {
double thrust; double thrust;

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

@ -111,7 +111,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
/* /*
* Compute the initial thrust estimate. This is used for the first time step computation. * Compute the initial thrust estimate. This is used for the first time step computation.
*/ */
store.thrustForce = calculateAvrageThrust(status, store.timestep, status.getPreviousAcceleration(), store.thrustForce = calculateAverageThrust(status, store.timestep, status.getPreviousAcceleration(),
status.getPreviousAtmosphericConditions(), false); status.getPreviousAtmosphericConditions(), false);
@ -180,7 +180,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
* diminished by it affecting only 1/6th of the total, so it's an acceptable error. * diminished by it affecting only 1/6th of the total, so it's an acceptable error.
*/ */
double thrustEstimate = store.thrustForce; double thrustEstimate = store.thrustForce;
store.thrustForce = calculateAvrageThrust(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 at time " + store.timestep + " thrustForce = " + store.thrustForce);
double thrustDiff = Math.abs(store.thrustForce - thrustEstimate); double thrustDiff = Math.abs(store.thrustForce - thrustEstimate);