Track fuel burnt at each step

diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java
index cea51d5d5834a970b018487c3122cfe6d4947f18..a87ba62c384ebda6e66a73978eef532aacdcb64d 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Burn.java
+++ b/src/com/billkuker/rocketry/motorsim/Burn.java
@@ -113,6 +113,7 @@ public class Burn {
                public Amount<Pressure> chamberPressure;\r
                Amount<Mass> chamberProduct;\r
                public Amount<Force> thrust;\r
+               public Amount<Mass> fuelBurnt;\r
 \r
                public String toString(){\r
                        return time + " " + dt + " " + regression + " " + chamberPressure + " " + chamberProduct;\r
@@ -173,6 +174,7 @@ public class Burn {
                initial.chamberPressure = settings.getAtmosphereicPressure();\r
                initial.chamberProduct = Amount.valueOf(0, SI.KILOGRAM);\r
                initial.thrust = Amount.valueOf(0, SI.NEWTON);\r
+               initial.fuelBurnt = Amount.valueOf(0, SI.KILOGRAM);\r
                \r
                data.put(Amount.valueOf(0, SI.SECOND), initial);\r
                \r
@@ -226,7 +228,9 @@ public class Burn {
                        assert(positive(volumeBurnt));\r
                        //log.info("Volume Burnt: " + volumeBurnt.to(SI.MILLIMETER.pow(3)));\r
                        \r
-                       Amount<MassFlowRate> mGenRate = volumeBurnt.times(motor.getFuel().getIdealDensity().times(motor.getFuel().getDensityRatio())).divide(dt).to(MassFlowRate.UNIT);\r
+                       Amount<Mass> massBurnt = volumeBurnt.times(motor.getFuel().getIdealDensity().times(motor.getFuel().getDensityRatio())).to(Mass.UNIT);\r
+                       next.fuelBurnt = massBurnt;\r
+                       Amount<MassFlowRate> mGenRate = massBurnt.divide(dt).to(MassFlowRate.UNIT);\r
                        assert(positive(mGenRate));\r
                        \r
                        //log.debug("Mass Gen Rate: " + mGenRate);\r