Made example motor like SRM

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index bd778cacf81b2fcc35a8db62f4cf0ff3cf8798f8..ad2ecf7e39023d56512da361502120498886f693 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -47,6 +47,7 @@ import com.billkuker.rocketry.motorsim.Motor;
 import com.billkuker.rocketry.motorsim.Nozzle;\r
 import com.billkuker.rocketry.motorsim.cases.Schedule40;\r
 import com.billkuker.rocketry.motorsim.cases.Schedule80;\r
+import com.billkuker.rocketry.motorsim.fuel.KNDX;\r
 import com.billkuker.rocketry.motorsim.fuel.KNSU;\r
 import com.billkuker.rocketry.motorsim.grain.CSlot;\r
 import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain;\r
@@ -456,32 +457,30 @@ public class MotorEditor extends JPanel implements PropertyChangeListener {
        public static Motor defaultMotor() {\r
                Motor m = new Motor();\r
                m.setName("Example Motor");\r
-               m.setFuel(new KNSU());\r
+               m.setFuel(new KNDX());\r
 \r
                CylindricalChamber c = new CylindricalChamber();\r
-               c.setLength(Amount.valueOf(200, SI.MILLIMETER));\r
-               c.setID(Amount.valueOf(30, SI.MILLIMETER));\r
+               c.setLength(Amount.valueOf(420, SI.MILLIMETER));\r
+               c.setID(Amount.valueOf(70, SI.MILLIMETER));\r
+               c.setOD(Amount.valueOf(72, SI.MILLIMETER));\r
                m.setChamber(c);\r
 \r
-               Schedule40 pvc = new Schedule40();\r
-               pvc.setLength(Amount.valueOf(200, SI.MILLIMETER));\r
-               m.setChamber(pvc);\r
-               \r
                CoredCylindricalGrain g = new CoredCylindricalGrain();\r
                try {\r
-                       g.setLength(Amount.valueOf(70, SI.MILLIMETER));\r
-                       g.setOD(Amount.valueOf(30, SI.MILLIMETER));\r
-                       g.setID(Amount.valueOf(10, SI.MILLIMETER));\r
+                       g.setLength(Amount.valueOf(100, SI.MILLIMETER));\r
+                       g.setOD(Amount.valueOf(62, SI.MILLIMETER));\r
+                       g.setID(Amount.valueOf(20, SI.MILLIMETER));\r
                } catch (PropertyVetoException v) {\r
                        throw new Error(v);\r
                }\r
                \r
-\r
-               m.setGrain(new MultiGrain(g, 2));\r
+               MultiGrain mg = new MultiGrain(g, 4);\r
+               mg.setSpacing(Amount.valueOf(6, SI.MILLIMETER));\r
+               m.setGrain(mg);\r
 \r
                ConvergentDivergentNozzle n = new ConvergentDivergentNozzle();\r
-               n.setThroatDiameter(Amount.valueOf(7.962, SI.MILLIMETER));\r
-               n.setExitDiameter(Amount.valueOf(13.79, SI.MILLIMETER));\r
+               n.setThroatDiameter(Amount.valueOf(14.089, SI.MILLIMETER));\r
+               n.setExitDiameter(Amount.valueOf(44.55, SI.MILLIMETER));\r
                n.setEfficiency(.85);\r
                m.setNozzle(n);\r
 \r