X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=MotorIOTest.xml;h=2bc2171c0422c2512306a5dba60aafa3cfa190c3;hb=HEAD;hp=786105e477e9af6a8fc04b81d84c79b7651438b9;hpb=0b442f1b389c7203a404c8aff2a4452b9f5225f1;p=sw%2Fmotorsim

diff --git a/MotorIOTest.xml b/MotorIOTest.xml
index 786105e..2bc2171 100644
--- a/MotorIOTest.xml
+++ b/MotorIOTest.xml
@@ -1,32 +1,35 @@
 <object-stream>
-  <com.billkuker.rocketry.motorsim.motors.kuker.PVC9>
+  <com.billkuker.rocketry.motorsim.Motor>
     <chamber class="com.billkuker.rocketry.motorsim.CylindricalChamber">
+      <ID>30 mm</ID>
+      <OD>31 mm</OD>
       <length>200 mm</length>
-      <iD>30 mm</iD>
     </chamber>
+    <fuel class="com.billkuker.rocketry.motorsim.fuel.KNSB" serialization="custom">
+      <java.net.URI>
+        <default>
+          <string>motorsim:KNSB</string>
+        </default>
+      </java.net.URI>
+    </fuel>
     <grain class="com.billkuker.rocketry.motorsim.grain.MultiGrain">
+      <count>2</count>
       <grain class="com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain">
-        <foreEndInhibited>false</foreEndInhibited>
+        <ID>8 mm</ID>
+        <OD>29 mm</OD>
         <aftEndInhibited>false</aftEndInhibited>
+        <foreEndInhibited>false</foreEndInhibited>
+        <innerSurfaceInhibited>false</innerSurfaceInhibited>
         <length>70 mm</length>
-        <endLight>0 mm</endLight>
-        <oD>29 mm</oD>
-        <iD>8 mm</iD>
         <outerSurfaceInhibited>true</outerSurfaceInhibited>
-        <innerSurfaceInhibited>false</innerSurfaceInhibited>
       </grain>
-      <count>2</count>
-      <flush>1.0</flush>
-      <delay>0 mm</delay>
+      <spacing>5 mm</spacing>
     </grain>
+    <name>IOTestMotor</name>
     <nozzle class="com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle">
-      <throatDiameter>7.9 mm</throatDiameter>
-      <exitDiameter>9 mm</exitDiameter>
       <efficiency>0.87</efficiency>
+      <exitDiameter>9 mm</exitDiameter>
+      <throatDiameter>7.9 mm</throatDiameter>
     </nozzle>
-    <fuel class="com.billkuker.rocketry.motorsim.fuel.KNSU">
-      <t>English</t>
-    </fuel>
-    <name>PVC9</name>
-  </com.billkuker.rocketry.motorsim.motors.kuker.PVC9>
+  </com.billkuker.rocketry.motorsim.Motor>
 </object-stream>
\ No newline at end of file