Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / simulation / BasicLandingStepper.java

diff --git a/core/src/net/sf/openrocket/simulation/BasicLandingStepper.java b/core/src/net/sf/openrocket/simulation/BasicLandingStepper.java
index dc67e85375c60cdc8c2e15d1937f433c8db999ec..0d9c3954b5bff15ee04f4dcbbe4a8f9d74f628ff 100644 (file)
--- a/core/src/net/sf/openrocket/simulation/BasicLandingStepper.java
+++ b/core/src/net/sf/openrocket/simulation/BasicLandingStepper.java
@@ -109,6 +109,8 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
 
                data.setValue(FlightDataType.TYPE_LATITUDE, status.getRocketWorldPosition().getLatitudeRad());
                data.setValue(FlightDataType.TYPE_LONGITUDE, status.getRocketWorldPosition().getLongitudeRad());
+               data.setValue(FlightDataType.TYPE_GRAVITY, gravity);
+               
                if (status.getSimulationConditions().getGeodeticComputation() != GeodeticComputationStrategy.FLAT) {
                        data.setValue(FlightDataType.TYPE_CORIOLIS_ACCELERATION, coriolisAcceleration.length());
                }
@@ -121,6 +123,7 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
                data.setValue(FlightDataType.TYPE_MACH_NUMBER, mach);
                
                data.setValue(FlightDataType.TYPE_MASS, mass);
+               data.setValue(FlightDataType.TYPE_PROPELLANT_MASS, 0.0); // Is this a reasonable assumption? Probably.
                
                data.setValue(FlightDataType.TYPE_THRUST_FORCE, 0);
                data.setValue(FlightDataType.TYPE_DRAG_FORCE, dragForce);