Renamed some methods

diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java
index 1ced62947a75ba6e4b90ff7b28f4d0d66a64c7b6..e867b616db451b04d6f3291acff56897ae8a43e0 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Burn.java
+++ b/src/com/billkuker/rocketry/motorsim/Burn.java
@@ -118,12 +118,12 @@ public class Burn {
                        \r
                        log.info("Volume Burnt: " + volumeBurnt.to(SI.MILLIMETER.pow(3)));\r
                        \r
-                       Amount<MassFlowRate> mGenRate = volumeBurnt.times(motor.getFuel().idealDensity().times(densityRatio)).divide(dt).to(MassFlowRate.UNIT);\r
+                       Amount<MassFlowRate> mGenRate = volumeBurnt.times(motor.getFuel().getIdealDensity().times(motor.getFuel().getDensityRatio())).divide(dt).to(MassFlowRate.UNIT);\r
                        \r
                        log.debug("Mass Gen Rate: " + mGenRate);\r
                        \r
-                       Amount specificGasConstant = Constants.R.divide(motor.getFuel().getCombustionProduct().effectiveMolarWeight());\r
-                       Amount<Temperature> chamberTemp = motor.getFuel().getCombustionProduct().idealCombustionTemperature().times(combustionEfficency);\r
+                       Amount specificGasConstant = Constants.R.divide(motor.getFuel().getCombustionProduct().getEffectiveMolarWeight());\r
+                       Amount<Temperature> chamberTemp = motor.getFuel().getCombustionProduct().getIdealCombustionTemperature().times(motor.getFuel().getCombustionEfficiency());\r
                        \r
                        Amount<MassFlowRate> mNozzle;\r
                        {\r
@@ -135,7 +135,7 @@ public class Burn {
                                \r
                                Amount<Area> aStar = motor.getNozzle().throatArea();\r
                                \r
-                               double k = motor.getFuel().getCombustionProduct().ratioOfSpecificHeats();\r
+                               double k = motor.getFuel().getCombustionProduct().getRatioOfSpecificHeats();\r
                                \r
                                log.debug("K: " + k);\r
                                \r
@@ -189,7 +189,7 @@ public class Burn {
                                        next.chamberPressure.doubleValue(SI.PASCAL),\r
                                        SI.PASCAL);\r
                        \r
-                       next.thrust = motor.getNozzle().thrust(next.chamberPressure, atmosphereicPressure, atmosphereicPressure, motor.getFuel().getCombustionProduct().ratioOfSpecificHeats2Phase());\r
+                       next.thrust = motor.getNozzle().thrust(next.chamberPressure, atmosphereicPressure, atmosphereicPressure, motor.getFuel().getCombustionProduct().getRatioOfSpecificHeats2Phase());\r
                        \r
                        if ( next.chamberPressure.approximates(atmosphereicPressure)){\r
                                log.info("Pressure at Patm on step " + i);\r

diff --git a/src/com/billkuker/rocketry/motorsim/Fuel.java b/src/com/billkuker/rocketry/motorsim/Fuel.java
index 976ebd99fbc8a21e357aa15f7a7a0321f5bd31a9..2f5f04ced493be13854a680996dc91682367dff7 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Fuel.java
+++ b/src/com/billkuker/rocketry/motorsim/Fuel.java
@@ -11,33 +11,24 @@ import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;
 \r
 public interface Fuel {\r
 \r
-       public Amount<VolumetricDensity> idealDensity();\r
+       public Amount<VolumetricDensity> getIdealDensity();\r
 \r
        public Amount<Velocity> burnRate(Amount<Pressure> pressure);\r
        \r
        public CombustionProduct getCombustionProduct();\r
        \r
        public interface CombustionProduct {\r
-               public Amount<Temperature> idealCombustionTemperature();\r
+               public Amount<Temperature> getIdealCombustionTemperature();\r
 \r
-               public Amount<MolarWeight> effectiveMolarWeight();\r
+               public Amount<MolarWeight> getEffectiveMolarWeight();\r
                \r
-               public double ratioOfSpecificHeats();\r
+               public double getRatioOfSpecificHeats();\r
                \r
-               public double ratioOfSpecificHeats2Phase();\r
+               public double getRatioOfSpecificHeats2Phase();\r
        }\r
 \r
-       /*\r
-       @Deprecated\r
-       public Amount<Temperature> idealCombustionTemperature();\r
-\r
-       @Deprecated\r
-       public Amount<MolarWeight> effectiveMolarWeight();\r
-       \r
-       @Deprecated\r
-       public double ratioOfSpecificHeats();\r
+       public double getDensityRatio();\r
        \r
-       @Deprecated\r
-       public double ratioOfSpecificHeats2Phase();*/\r
+       public double getCombustionEfficiency();\r
 \r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java b/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
index d835178c6f60265425a4339464db7bfec2b6726a..d7c2b2192d14ed66e824b2ced497af3d42f5df1d 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
@@ -23,26 +23,26 @@ public class KNSB extends PiecewiseSaintRobertFuel {
        }\r
 \r
        @Override\r
-       public Amount<VolumetricDensity> idealDensity() {\r
+       public Amount<VolumetricDensity> getIdealDensity() {\r
                return Amount.valueOf(1841, 0, SI.KILOGRAM.divide(SI.METER.pow(3))).to(VolumetricDensity.UNIT);\r
        }\r
 \r
        public CombustionProduct getCombustionProduct() {\r
                return new CombustionProduct(){\r
                        \r
-                       public Amount<Temperature> idealCombustionTemperature() {\r
+                       public Amount<Temperature> getIdealCombustionTemperature() {\r
                                return Amount.valueOf(1600, SI.KELVIN);\r
                        }\r
                \r
-                       public Amount<MolarWeight> effectiveMolarWeight() {\r
+                       public Amount<MolarWeight> getEffectiveMolarWeight() {\r
                                return Amount.valueOf("39.9 kg/kmol").to(MolarWeight.UNIT);\r
                        }\r
                \r
-                       public double ratioOfSpecificHeats() {\r
+                       public double getRatioOfSpecificHeats() {\r
                                return 1.1361;\r
                        }\r
                \r
-                       public double ratioOfSpecificHeats2Phase() {\r
+                       public double getRatioOfSpecificHeats2Phase() {\r
                                return 1.042;\r
                        }\r
                };\r
@@ -66,4 +66,12 @@ public class KNSB extends PiecewiseSaintRobertFuel {
                burnRate.show();\r
        }\r
 \r
+       public double getCombustionEfficiency() {\r
+               return .97;\r
+       }\r
+\r
+       public double getDensityRatio() {\r
+               return .96;\r
+       }\r
+\r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java b/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java
index cac65fc049101e7424924093b10557242ef7e889..c99e8d4b583641f05ea1137c12a89ea55b64c4c3 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java
@@ -16,7 +16,7 @@ public class KNSU extends SaintRobertFuel {
        }\r
 \r
        //@Override \r
-       public Amount<VolumetricDensity> idealDensity() {\r
+       public Amount<VolumetricDensity> getIdealDensity() {\r
                //return Amount.valueOf(1.889, 0, SI.GRAM.divide(SI.CENTIMETER.pow(3))).to(VolumetricDensity.UNIT);\r
                return Amount.valueOf(1889, 0, SI.KILOGRAM.divide(SI.METER.pow(3))).to(VolumetricDensity.UNIT);\r
        }\r
@@ -34,22 +34,30 @@ public class KNSU extends SaintRobertFuel {
        public CombustionProduct getCombustionProduct(){\r
                return new CombustionProduct(){\r
                \r
-                       public Amount<Temperature> idealCombustionTemperature() {\r
+                       public Amount<Temperature> getIdealCombustionTemperature() {\r
                                return Amount.valueOf(1720, SI.KELVIN);\r
                        }\r
                \r
-                       public Amount<MolarWeight> effectiveMolarWeight() {\r
+                       public Amount<MolarWeight> getEffectiveMolarWeight() {\r
                                return Amount.valueOf("41.98 kg/kmol").to(MolarWeight.UNIT);\r
                        }\r
                \r
-                       public double ratioOfSpecificHeats() {\r
+                       public double getRatioOfSpecificHeats() {\r
                                return 1.133;\r
                        }\r
                \r
-                       public double ratioOfSpecificHeats2Phase() {\r
+                       public double getRatioOfSpecificHeats2Phase() {\r
                                return 1.044;\r
                        }\r
                };\r
        }\r
 \r
+       public double getCombustionEfficiency() {\r
+               return .97;\r
+       }\r
+\r
+       public double getDensityRatio() {\r
+               return .96;\r
+       }\r
+\r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
index f8e1ab691143ca466ea26b6ca22d83c442ea190e..284e1342701cef3e83b65e7d9e42bde0bdb9a439 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
@@ -56,6 +56,6 @@ public abstract class SaintRobertFuel implements Fuel {
                return Amount.valueOf(0, Velocity.UNIT);\r
        }\r
 \r
-       public abstract Amount<VolumetricDensity> idealDensity();\r
+       public abstract Amount<VolumetricDensity> getIdealDensity();\r
 \r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java b/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
index df97885d3a64d793825e651f4a6e6a0c0a506725..81ece5308e0d9b1bbabe04e4c9d63fc20c8a48f0 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
+++ b/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
@@ -43,7 +43,7 @@ public class ConvergentDivergentNozzleTest extends RocketTest {
 \r
                KNSU f = new KNSU();\r
                \r
-               Amount<Force> t = n.thrust(Po, Pe, Patm, f.getCombustionProduct().ratioOfSpecificHeats2Phase());\r
+               Amount<Force> t = n.thrust(Po, Pe, Patm, f.getCombustionProduct().getRatioOfSpecificHeats2Phase());\r
                \r
                Amount<Force> expected = Amount.valueOf(87.2, .1, SI.NEWTON);\r
                \r
@@ -60,7 +60,7 @@ public class ConvergentDivergentNozzleTest extends RocketTest {
 \r
                KNSU f = new KNSU();\r
                \r
-               double cF = n.thrustCoefficient(Po, Pe, Patm, f.getCombustionProduct().ratioOfSpecificHeats2Phase());\r
+               double cF = n.thrustCoefficient(Po, Pe, Patm, f.getCombustionProduct().getRatioOfSpecificHeats2Phase());\r
                \r
                \r
                Assert.assertEquals(cF, 1.2454812344324655);\r

diff --git a/src/com/billkuker/rocketry/motorsim/test/KNSUTest.java b/src/com/billkuker/rocketry/motorsim/test/KNSUTest.java
index 917dc778640c7d59a937ef82e561dfb7f66d2bc3..9845a6f239bea8a3b6cebb02c76f7ab9b440fe22 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/test/KNSUTest.java
+++ b/src/com/billkuker/rocketry/motorsim/test/KNSUTest.java
@@ -19,12 +19,12 @@ public class KNSUTest extends RocketTest {
 \r
        @Test\r
        public void testEffectiveMolarWeight(){\r
-               (new KNSU()).getCombustionProduct().effectiveMolarWeight();\r
+               (new KNSU()).getCombustionProduct().getEffectiveMolarWeight();\r
        }\r
        \r
        @Test\r
        public void testIdealDensity(){\r
-               System.out.println((new KNSU()).idealDensity());\r
-               System.out.println((new KNSU()).idealDensity().isExact());\r
+               System.out.println((new KNSU()).getIdealDensity());\r
+               System.out.println((new KNSU()).getIdealDensity().isExact());\r
        }\r
 }\r