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

[#2462] Provide air density as plottable variable

Browse Source
This commit is contained in:
SiboVG 2024-07-13 00:32:38 +02:00
parent e2b69c4650
commit 8daa8838ff
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java
View File

@ -323,6 +323,8 @@ public abstract class AbstractSimulationStepper implements SimulationStepper {
flightConditions.getAtmosphericConditions().getTemperature()); flightConditions.getAtmosphericConditions().getTemperature());
dataBranch.setValue(FlightDataType.TYPE_AIR_PRESSURE, dataBranch.setValue(FlightDataType.TYPE_AIR_PRESSURE,
flightConditions.getAtmosphericConditions().getPressure()); flightConditions.getAtmosphericConditions().getPressure());
dataBranch.setValue(FlightDataType.TYPE_AIR_DENSITY,
flightConditions.getAtmosphericConditions().getDensity());
dataBranch.setValue(FlightDataType.TYPE_SPEED_OF_SOUND, dataBranch.setValue(FlightDataType.TYPE_SPEED_OF_SOUND,
flightConditions.getAtmosphericConditions().getMachSpeed()); flightConditions.getAtmosphericConditions().getMachSpeed());
} }

7
core/src/main/java/info/openrocket/core/simulation/FlightDataType.java
View File

@ -275,10 +275,14 @@ public class FlightDataType implements Comparable<FlightDataType> {
public static final FlightDataType TYPE_AIR_PRESSURE = newType(trans.get("FlightDataType.TYPE_AIR_PRESSURE"), "P", public static final FlightDataType TYPE_AIR_PRESSURE = newType(trans.get("FlightDataType.TYPE_AIR_PRESSURE"), "P",
UnitGroup.UNITS_PRESSURE, UnitGroup.UNITS_PRESSURE,
FlightDataTypeGroup.ATMOSPHERIC_CONDITIONS, 2); FlightDataTypeGroup.ATMOSPHERIC_CONDITIONS, 2);
//// Air density
public static final FlightDataType TYPE_AIR_DENSITY = newType(trans.get("FlightDataType.TYPE_AIR_DENSITY"), "\u03C1",
UnitGroup.UNITS_DENSITY_BULK,
FlightDataTypeGroup.ATMOSPHERIC_CONDITIONS, 3);
//// Speed of sound //// Speed of sound
public static final FlightDataType TYPE_SPEED_OF_SOUND = newType(trans.get("FlightDataType.TYPE_SPEED_OF_SOUND"), public static final FlightDataType TYPE_SPEED_OF_SOUND = newType(trans.get("FlightDataType.TYPE_SPEED_OF_SOUND"),
"Vs", UnitGroup.UNITS_VELOCITY, "Vs", UnitGroup.UNITS_VELOCITY,
FlightDataTypeGroup.ATMOSPHERIC_CONDITIONS, 3); FlightDataTypeGroup.ATMOSPHERIC_CONDITIONS, 4);
// Simulation information // Simulation information
//// Simulation time step //// Simulation time step
@ -345,6 +349,7 @@ public class FlightDataType implements Comparable<FlightDataType> {
TYPE_WIND_VELOCITY, TYPE_WIND_VELOCITY,
TYPE_AIR_TEMPERATURE, TYPE_AIR_TEMPERATURE,
TYPE_AIR_PRESSURE, TYPE_AIR_PRESSURE,
TYPE_AIR_DENSITY,
TYPE_SPEED_OF_SOUND, TYPE_SPEED_OF_SOUND,
TYPE_TIME_STEP, TYPE_TIME_STEP,
TYPE_COMPUTATION_TIME TYPE_COMPUTATION_TIME

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

@ -2119,6 +2119,7 @@ FlightDataType.TYPE_ORIENTATION_PHI = Lateral orientation (azimuth)
FlightDataType.TYPE_WIND_VELOCITY = Wind velocity FlightDataType.TYPE_WIND_VELOCITY = Wind velocity
FlightDataType.TYPE_AIR_TEMPERATURE = Air temperature FlightDataType.TYPE_AIR_TEMPERATURE = Air temperature
FlightDataType.TYPE_AIR_PRESSURE = Air pressure FlightDataType.TYPE_AIR_PRESSURE = Air pressure
FlightDataType.TYPE_AIR_DENSITY = Air density
FlightDataType.TYPE_SPEED_OF_SOUND = Speed of sound FlightDataType.TYPE_SPEED_OF_SOUND = Speed of sound
FlightDataType.TYPE_TIME_STEP = Simulation time step FlightDataType.TYPE_TIME_STEP = Simulation time step
FlightDataType.TYPE_COMPUTATION_TIME = Computation time FlightDataType.TYPE_COMPUTATION_TIME = Computation time