From 8daa8838ff5d41bbf035f1ee9ce49477f39ef53e Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 13 Jul 2024 00:32:38 +0200 Subject: [PATCH] [#2462] Provide air density as plottable variable --- .../core/simulation/AbstractSimulationStepper.java | 2 ++ .../info/openrocket/core/simulation/FlightDataType.java | 7 ++++++- core/src/main/resources/l10n/messages.properties | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java b/core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java index dcd152768..062536233 100644 --- a/core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java +++ b/core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java @@ -323,6 +323,8 @@ public abstract class AbstractSimulationStepper implements SimulationStepper { flightConditions.getAtmosphericConditions().getTemperature()); dataBranch.setValue(FlightDataType.TYPE_AIR_PRESSURE, flightConditions.getAtmosphericConditions().getPressure()); + dataBranch.setValue(FlightDataType.TYPE_AIR_DENSITY, + flightConditions.getAtmosphericConditions().getDensity()); dataBranch.setValue(FlightDataType.TYPE_SPEED_OF_SOUND, flightConditions.getAtmosphericConditions().getMachSpeed()); } diff --git a/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java b/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java index 0519f4ae3..15b4174bc 100644 --- a/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java +++ b/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java @@ -275,10 +275,14 @@ public class FlightDataType implements Comparable { public static final FlightDataType TYPE_AIR_PRESSURE = newType(trans.get("FlightDataType.TYPE_AIR_PRESSURE"), "P", UnitGroup.UNITS_PRESSURE, 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 public static final FlightDataType TYPE_SPEED_OF_SOUND = newType(trans.get("FlightDataType.TYPE_SPEED_OF_SOUND"), "Vs", UnitGroup.UNITS_VELOCITY, - FlightDataTypeGroup.ATMOSPHERIC_CONDITIONS, 3); + FlightDataTypeGroup.ATMOSPHERIC_CONDITIONS, 4); // Simulation information //// Simulation time step @@ -345,6 +349,7 @@ public class FlightDataType implements Comparable { TYPE_WIND_VELOCITY, TYPE_AIR_TEMPERATURE, TYPE_AIR_PRESSURE, + TYPE_AIR_DENSITY, TYPE_SPEED_OF_SOUND, TYPE_TIME_STEP, TYPE_COMPUTATION_TIME diff --git a/core/src/main/resources/l10n/messages.properties b/core/src/main/resources/l10n/messages.properties index cc5be690d..f4b354c78 100644 --- a/core/src/main/resources/l10n/messages.properties +++ b/core/src/main/resources/l10n/messages.properties @@ -2119,6 +2119,7 @@ FlightDataType.TYPE_ORIENTATION_PHI = Lateral orientation (azimuth) FlightDataType.TYPE_WIND_VELOCITY = Wind velocity FlightDataType.TYPE_AIR_TEMPERATURE = Air temperature FlightDataType.TYPE_AIR_PRESSURE = Air pressure +FlightDataType.TYPE_AIR_DENSITY = Air density FlightDataType.TYPE_SPEED_OF_SOUND = Speed of sound FlightDataType.TYPE_TIME_STEP = Simulation time step FlightDataType.TYPE_COMPUTATION_TIME = Computation time