From a0e48ab4db2c5ac39c1e009ae889a1304ca934f1 Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Mon, 22 Nov 2010 14:30:03 +0000 Subject: [PATCH 1/1] Add some NONSI defaults --- src/com/billkuker/rocketry/motorsim/RocketScience.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java index 9caa7ba..fb13ebb 100644 --- a/src/com/billkuker/rocketry/motorsim/RocketScience.java +++ b/src/com/billkuker/rocketry/motorsim/RocketScience.java @@ -21,6 +21,7 @@ import org.jscience.physics.amount.Amount; public class RocketScience { public static Unit PSI = new ProductUnit(NonSI.POUND_FORCE.divide(NonSI.INCH.pow(2))); public static Unit NEWTON_SECOND = new ProductUnit(SI.NEWTON.times(SI.SECOND)); + public static Unit POUND_SECOND = new ProductUnit(NonSI.POUND_FORCE.times(SI.SECOND)); static{ UnitFormat.getInstance().label(PSI, "psi"); UnitFormat.getInstance().label(NEWTON_SECOND, "Ns"); @@ -41,6 +42,7 @@ public class RocketScience { javax.measure.unit.SI.MILLIMETER, javax.measure.unit.SI.MILLIMETER.divide(javax.measure.unit.SI.SECOND), javax.measure.unit.SI.NEWTON, + javax.measure.unit.SI.GRAM, javax.measure.unit.SI.MEGA(javax.measure.unit.SI.PASCAL), NEWTON_SECOND }), @@ -48,9 +50,10 @@ public class RocketScience { javax.measure.unit.NonSI.INCH.pow(2), javax.measure.unit.NonSI.INCH, javax.measure.unit.NonSI.POUND_FORCE, + javax.measure.unit.NonSI.OUNCE, javax.measure.unit.NonSI.INCH.divide(javax.measure.unit.SI.SECOND), PSI, - NEWTON_SECOND + POUND_SECOND }); private static UnitPreference preference = SI; -- 2.30.2