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

Fixed AOA tumble condition. AOA is stored in radians not degrees.

Browse Source
This commit is contained in:
kruland2607 2013-02-18 12:17:30 -06:00
parent 526131a64c
commit 0cfc8e6d28
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,10 @@ public class BasicEventSimulationEngine implements SimulationEngine {
private SimulationStepper landingStepper = new BasicLandingStepper(); private SimulationStepper landingStepper = new BasicLandingStepper();
private SimulationStepper tumbleStepper = new BasicTumbleStepper(); private SimulationStepper tumbleStepper = new BasicTumbleStepper();
// Constant holding 30 degress in radians. This is the AOA condition
// necessary to transistion to tumbling.
private final static double AOA_TUMBLE_CONDITION = Math.PI / 3.0;
private SimulationStepper currentStepper; private SimulationStepper currentStepper;
private SimulationStatus status; private SimulationStatus status;
@ -204,10 +208,10 @@ public class BasicEventSimulationEngine implements SimulationEngine {
double cp = status.getFlightData().getLast(FlightDataType.TYPE_CP_LOCATION); double cp = status.getFlightData().getLast(FlightDataType.TYPE_CP_LOCATION);
double cg = status.getFlightData().getLast(FlightDataType.TYPE_CG_LOCATION); double cg = status.getFlightData().getLast(FlightDataType.TYPE_CG_LOCATION);
double aoa = status.getFlightData().getLast(FlightDataType.TYPE_AOA); double aoa = status.getFlightData().getLast(FlightDataType.TYPE_AOA);
if( cg > cp && aoa > 30 ) { if( cg > cp && aoa > AOA_TUMBLE_CONDITION ) {
addEvent( new FlightEvent(FlightEvent.Type.TUMBLE,status.getSimulationTime())); addEvent( new FlightEvent(FlightEvent.Type.TUMBLE,status.getSimulationTime()));
status.setTumbling(true);
} }
status.setTumbling(true);
} }