]> git.gag.com Git - sw/motorsim/commitdiff
made it match pvc9
authorBill Kuker <bkuker@billkuker.com>
Mon, 20 Apr 2009 13:11:43 +0000 (13:11 +0000)
committerBill Kuker <bkuker@billkuker.com>
Mon, 20 Apr 2009 13:11:43 +0000 (13:11 +0000)
src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java

index 8ee1b317c34fba22260c67a137c3c26c6ec9e414..a5fec52d541fc0d689ae4f49b2d448f39d00531b 100644 (file)
@@ -108,14 +108,14 @@ public class CrappyEditor extends JFrame {
 \r
                CylindricalChamber c = new CylindricalChamber();\r
                c.setLength(Amount.valueOf(200, SI.MILLIMETER));\r
-               c.setID(Amount.valueOf(30, SI.MILLIMETER));\r
+               c.setID(Amount.valueOf(25, SI.MILLIMETER));\r
                m.setChamber(c);\r
 \r
                CoredCylindricalGrain g = new CoredCylindricalGrain();\r
                try {\r
                        g.setLength(Amount.valueOf(70, SI.MILLIMETER));\r
-                       g.setOD(Amount.valueOf(29, SI.MILLIMETER));\r
-                       g.setID(Amount.valueOf(8, SI.MILLIMETER));\r
+                       g.setOD(Amount.valueOf(23.5, SI.MILLIMETER));\r
+                       g.setID(Amount.valueOf(7.9375, SI.MILLIMETER));\r
                } catch (PropertyVetoException v) {\r
                        throw new Error(v);\r
                }\r
@@ -123,9 +123,9 @@ public class CrappyEditor extends JFrame {
                m.setGrain(new MultiGrain(g, 2));\r
 \r
                ConvergentDivergentNozzle n = new ConvergentDivergentNozzle();\r
-               n.setThroatDiameter(Amount.valueOf(7.9, SI.MILLIMETER));\r
-               n.setExitDiameter(Amount.valueOf(9, SI.MILLIMETER));\r
-               n.setEfficiency(.87);\r
+               n.setThroatDiameter(Amount.valueOf(7.962, SI.MILLIMETER));\r
+               n.setExitDiameter(Amount.valueOf(13.79, SI.MILLIMETER));\r
+               n.setEfficiency(.85);\r
                m.setNozzle(n);\r
                \r
                return m;\r