From: Bill Kuker Date: Fri, 17 Apr 2009 04:26:36 +0000 (+0000) Subject: Stored DT in intervals. X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=56746338fe5c2f571e0e621e7690665892e16e91;p=sw%2Fmotorsim Stored DT in intervals. Made more of interval data public. I should do something better than that. --- diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java index 924b1ba..1ced629 100644 --- a/src/com/billkuker/rocketry/motorsim/Burn.java +++ b/src/com/billkuker/rocketry/motorsim/Burn.java @@ -36,14 +36,15 @@ public class Burn { private static double densityRatio = 0.96; public class Interval{ - Amount time; + public Amount time; + public Amount dt; public Amount regression; public Amount chamberPressure; Amount chamberProduct; - Amount thrust; + public Amount thrust; public String toString(){ - return time + " " + regression + " " + chamberPressure + " " + chamberProduct; + return time + " " + dt + " " + regression + " " + chamberPressure + " " + chamberProduct; } } @@ -76,6 +77,7 @@ public class Burn { Interval initial = new Interval(); initial.time = Amount.valueOf(0, SI.SECOND); + initial.dt = Amount.valueOf(0, SI.SECOND); initial.regression = Amount.valueOf(0, SI.MILLIMETER); initial.chamberPressure = atmosphereicPressure; initial.chamberProduct = Amount.valueOf(0, SI.KILOGRAM); @@ -95,6 +97,7 @@ public class Burn { log.debug("Burn Rate: " + burnRate); Amount dt = regStep.divide(burnRate).to(Duration.UNIT); + next.dt = dt; data.put(data.lastKey().plus(dt), next); @@ -193,7 +196,7 @@ public class Burn { break; } } - + } @SuppressWarnings("unchecked")