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

Add thrust-to-weight flight data type

Browse Source 
Co-authored-by: ERKCreeper <erkcreeper@gmail.com>
This commit is contained in:
SiboVG 2023-09-18 22:52:15 +02:00
parent dd12e0c92a
commit 7d323862ed
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/resources/l10n/messages.properties
View File

@ -2030,6 +2030,7 @@ FlightDataType.TYPE_STABILITY = Stability margin calibers
FlightDataType.TYPE_MACH_NUMBER = Mach number
FlightDataType.TYPE_REYNOLDS_NUMBER = Reynolds number
FlightDataType.TYPE_THRUST_FORCE = Thrust
FlightDataType.TYPE_THRUST_WEIGHT_RATIO = Thrust-to-weight ratio
FlightDataType.TYPE_DRAG_FORCE = Drag force
FlightDataType.TYPE_DRAG_COEFF = Drag coefficient
FlightDataType.TYPE_AXIAL_DRAG_COEFF = Axial drag coefficient

9
core/src/net/sf/openrocket/simulation/FlightDataType.java
View File

@ -115,12 +115,14 @@ public class FlightDataType implements Comparable<FlightDataType> {
//// Thrust and drag
//// Thrust
public static final FlightDataType TYPE_THRUST_FORCE = newType(trans.get("FlightDataType.TYPE_THRUST_FORCE"), "Ft", UnitGroup.UNITS_FORCE, 70);
//// Thrust-to-weight ratio
public static final FlightDataType TYPE_THRUST_WEIGHT_RATIO = newType(trans.get("FlightDataType.TYPE_THRUST_WEIGHT_RATIO"), "Twr", UnitGroup.UNITS_COEFFICIENT, 71);
//// Drag force
public static final FlightDataType TYPE_DRAG_FORCE = newType(trans.get("FlightDataType.TYPE_DRAG_FORCE"), "Fd", UnitGroup.UNITS_FORCE, 71);
public static final FlightDataType TYPE_DRAG_FORCE = newType(trans.get("FlightDataType.TYPE_DRAG_FORCE"), "Fd", UnitGroup.UNITS_FORCE, 72);
//// Drag coefficient
public static final FlightDataType TYPE_DRAG_COEFF = newType(trans.get("FlightDataType.TYPE_DRAG_COEFF"), "Cd", UnitGroup.UNITS_COEFFICIENT, 72);
public static final FlightDataType TYPE_DRAG_COEFF = newType(trans.get("FlightDataType.TYPE_DRAG_COEFF"), "Cd", UnitGroup.UNITS_COEFFICIENT, 73);
//// Axial drag coefficient
public static final FlightDataType TYPE_AXIAL_DRAG_COEFF = newType(trans.get("FlightDataType.TYPE_AXIAL_DRAG_COEFF"), "Cda", UnitGroup.UNITS_COEFFICIENT, 73);
public static final FlightDataType TYPE_AXIAL_DRAG_COEFF = newType(trans.get("FlightDataType.TYPE_AXIAL_DRAG_COEFF"), "Cda", UnitGroup.UNITS_COEFFICIENT, 74);
//// Component drag coefficients
@ -218,6 +220,7 @@ public class FlightDataType implements Comparable<FlightDataType> {
TYPE_MACH_NUMBER,
TYPE_REYNOLDS_NUMBER,
TYPE_THRUST_FORCE,
TYPE_THRUST_WEIGHT_RATIO,
TYPE_DRAG_FORCE,
TYPE_DRAG_COEFF,
TYPE_AXIAL_DRAG_COEFF,

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

@ -623,6 +623,8 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
}
data.setValue(FlightDataType.TYPE_THRUST_FORCE, store.thrustForce);
double weight = store.rocketMass.getMass() * store.gravity;
data.setValue(FlightDataType.TYPE_THRUST_WEIGHT_RATIO, store.thrustForce / weight);
data.setValue(FlightDataType.TYPE_DRAG_FORCE, store.dragForce);
data.setValue(FlightDataType.TYPE_GRAVITY, store.gravity);