X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fsimulation%2FAbstractSimulationStepper.java;h=0aab853ac46fa485088747145a25d485eaf4cc83;hb=d986f8cf502d63b32f57189b1c9e9825ef19dc86;hp=85be91201282613b629491f40c9f82eb53e1ca3d;hpb=6200d1028c54fc15a2e332e3ab6137cf6886ea3a;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java b/core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java
index 85be9120..0aab853a 100644
--- a/core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java
+++ b/core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java
@@ -115,7 +115,7 @@ public abstract class AbstractSimulationStepper implements SimulationStepper {
 	protected MassData calculateMassData(SimulationStatus status) throws SimulationException {
 		MassData mass;
 		Coordinate cg;
-		double longitudinalInertia, rotationalInertia;
+		double longitudinalInertia, rotationalInertia, propellantMass;
 		
 		// Call pre-listener
 		mass = SimulationListenerHelper.firePreMassCalculation(status);
@@ -127,7 +127,8 @@ public abstract class AbstractSimulationStepper implements SimulationStepper {
 		cg = calc.getCG(status.getConfiguration(), status.getMotorConfiguration());
 		longitudinalInertia = calc.getLongitudinalInertia(status.getConfiguration(), status.getMotorConfiguration());
 		rotationalInertia = calc.getRotationalInertia(status.getConfiguration(), status.getMotorConfiguration());
-		mass = new MassData(cg, longitudinalInertia, rotationalInertia);
+		propellantMass = calc.getPropellantMass(status.getConfiguration(), status.getMotorConfiguration());
+		mass = new MassData(cg, longitudinalInertia, rotationalInertia, propellantMass);
 		
 		// Call post-listener
 		mass = SimulationListenerHelper.firePostMassCalculation(status, mass);
@@ -135,6 +136,7 @@ public abstract class AbstractSimulationStepper implements SimulationStepper {
 		checkNaN(mass.getCG());
 		checkNaN(mass.getLongitudinalInertia());
 		checkNaN(mass.getRotationalInertia());
+		checkNaN(mass.getPropellantMass());
 		
 		return mass;
 	}