Make atmospheric pressure editable

[sw/motorsim] / src / com / billkuker / rocketry / motorsim / fuel / EditableFuel.java

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
index 834b4dd5b79897e9fe9fdb98a5e1955bd976cdc3..a53909e6c296559c47da1fc278b357131012f3a7 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
@@ -1,16 +1,11 @@
 package com.billkuker.rocketry.motorsim.fuel;\r
 \r
 import javax.measure.quantity.Pressure;\r
-import javax.measure.quantity.Temperature;\r
 import javax.measure.quantity.VolumetricDensity;\r
 import javax.measure.unit.SI;\r
 \r
 import org.jscience.physics.amount.Amount;\r
 \r
-import com.billkuker.rocketry.motorsim.Fuel;\r
-import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;\r
-\r
-//TODO Implement MotorPart\r
 public class EditableFuel extends SaintRobertFuel {\r
        private String name;\r
        private double a = 0.0665;\r
@@ -21,38 +16,6 @@ public class EditableFuel extends SaintRobertFuel {
        CombustionProduct combustionProduct = new EditableCombustionProduct();\r
        private SaintRobertFuel.Type type = SaintRobertFuel.Type.NONSI;\r
        \r
-       public static class EditableCombustionProduct implements Fuel.CombustionProduct{\r
-               private Amount<MolarWeight> effectiveMolarWeight = Amount.valueOf("41.98 kg/kmol").to(MolarWeight.UNIT);;\r
-               private Amount<Temperature> idealCombustionTemperature = Amount.valueOf(1720, SI.KELVIN);;\r
-               private double ratioOfSpecificHeats = 1.133;\r
-               private double ratioOfSpecificHeats2Phase = 1.044;\r
-               public Amount<MolarWeight> getEffectiveMolarWeight() {\r
-                       return effectiveMolarWeight;\r
-               }\r
-               public void setEffectiveMolarWeight(Amount<MolarWeight> effectiveMolarWeight) {\r
-                       this.effectiveMolarWeight = effectiveMolarWeight;\r
-               }\r
-               public Amount<Temperature> getIdealCombustionTemperature() {\r
-                       return idealCombustionTemperature;\r
-               }\r
-               public void setIdealCombustionTemperature(\r
-                               Amount<Temperature> idealCombustionTemperature) {\r
-                       this.idealCombustionTemperature = idealCombustionTemperature;\r
-               }\r
-               public double getRatioOfSpecificHeats() {\r
-                       return ratioOfSpecificHeats;\r
-               }\r
-               public void setRatioOfSpecificHeats(double ratioOfSpecificHeats) {\r
-                       this.ratioOfSpecificHeats = ratioOfSpecificHeats;\r
-               }\r
-               public double getRatioOfSpecificHeats2Phase() {\r
-                       return ratioOfSpecificHeats2Phase;\r
-               }\r
-               public void setRatioOfSpecificHeats2Phase(double ratioOfSpecificHeats2Phase) {\r
-                       this.ratioOfSpecificHeats2Phase = ratioOfSpecificHeats2Phase;\r
-               }\r
-       }\r
-       \r
        public EditableFuel() {\r
                super(SaintRobertFuel.Type.NONSI);\r
        }\r