Add some NONSI defaults

diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java
index 9caa7baf12f72de32c89999481b5fc340b050ece..fb13ebb08da1fca7309c35dc598dd3244e96beb0 100644 (file)
--- 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 {\r
        public static Unit<Pressure> PSI = new ProductUnit<Pressure>(NonSI.POUND_FORCE.divide(NonSI.INCH.pow(2)));\r
        public static Unit<Impulse> NEWTON_SECOND = new ProductUnit<Impulse>(SI.NEWTON.times(SI.SECOND));\r
+       public static Unit<Impulse> POUND_SECOND = new ProductUnit<Impulse>(NonSI.POUND_FORCE.times(SI.SECOND));\r
        static{\r
                UnitFormat.getInstance().label(PSI, "psi");\r
                UnitFormat.getInstance().label(NEWTON_SECOND, "Ns");\r
@@ -41,6 +42,7 @@ public class RocketScience {
                                javax.measure.unit.SI.MILLIMETER,\r
                                javax.measure.unit.SI.MILLIMETER.divide(javax.measure.unit.SI.SECOND),\r
                                javax.measure.unit.SI.NEWTON,\r
+                               javax.measure.unit.SI.GRAM,\r
                                javax.measure.unit.SI.MEGA(javax.measure.unit.SI.PASCAL),\r
                                NEWTON_SECOND\r
                }),\r
@@ -48,9 +50,10 @@ public class RocketScience {
                                javax.measure.unit.NonSI.INCH.pow(2),\r
                                javax.measure.unit.NonSI.INCH,\r
                                javax.measure.unit.NonSI.POUND_FORCE,\r
+                               javax.measure.unit.NonSI.OUNCE,\r
                                javax.measure.unit.NonSI.INCH.divide(javax.measure.unit.SI.SECOND),\r
                                PSI,\r
-                               NEWTON_SECOND\r
+                               POUND_SECOND\r
                });\r
                \r
                private static UnitPreference preference = SI;\r