ENH: Support for Hybrid Motors part 1

README.md

@@ -207,6 +207,7 @@ A sample Motor object can be created by the following code:
 Pro75M1670 = SolidMotor(
     thrustSource="../data/motors/Cesaroni_M1670.eng",
     burnOut=3.9,
+    distanceNozzleMotorReference=0.39796,
     grainNumber=5,
     grainSeparation=5/1000,
     grainDensity=1815,
@@ -234,19 +235,23 @@ Calisto = Rocket(
     mass=19.197-2.956,
     inertiaI=6.60,
     inertiaZ=0.0351,
-    distanceRocketNozzle=-1.255,
-    distanceRocketPropellant=-0.85704,
+    positionNozzle=-1.255,
+    positionCenterOfDryMass=0,
     powerOffDrag='../data/calisto/powerOffDragCurve.csv',
     powerOnDrag='../data/calisto/powerOnDragCurve.csv'
 )
 
 Calisto.setRailButtons([0.2, -0.5])
 
-NoseCone = Calisto.addNose(length=0.55829, kind="vonKarman", distanceToCM=0.71971)
+NoseCone = Calisto.addNose(length=0.55829, kind="vonKarman", positionNose=1.278)
 
-FinSet = Calisto.addTrapezoildalFins(4, span=0.100, rootChord=0.120, tipChord=0.040, distanceToCM=-1.04956)
+FinSet = Calisto.addTrapezoidalFins(
+    4, span=0.100, rootChord=0.120, tipChord=0.040, positionFins=-1.04956
+)
 
-Tail = Calisto.addTail(topRadius=0.0635, bottomRadius=0.0435, length=0.060, distanceToCM=-1.194656)
+Tail = Calisto.addTail(
+    topRadius=0.0635, bottomRadius=0.0435, length=0.060, positionTail=-1.194656
+)
 ```
 
 You may want to add parachutes to your rocket as well:

data/motors/Hypertek_835CC125J-K240.eng

@@ -0,0 +1,27 @@
+K240-835CC125J 54 819 0 0.570 1.859 HyperTek 
+0.131 278.007
+0.396 329.552
+0.66 338.024
+0.925 334.092
+1.191 326.199
+1.456 319.745
+1.721 315.195
+1.985 311.182
+2.25 302.916
+2.516 305.943
+2.781 289.975
+3.046 281.781
+3.31 273.33
+3.575 268.852
+3.841 255.702
+4.106 251.068
+4.371 234.82
+4.635 159.972
+4.9 96.543
+5.166 73.367
+5.431 55.477
+5.696 40.928
+5.96 29.542
+6.225 21.25
+6.491 14.787
+6.756 0

docs/development/rocketpy_as_developer.rst

@@ -174,11 +174,11 @@ In the example, a nosecone, one fin set and one tail were added, but each case c
 
 .. code-block:: python
 
-    NoseCone = Calisto.addNose(length=0.55829, kind="vonKarman", distanceToCM=0.71971)
+    NoseCone = Calisto.addNose(length=0.55829, kind="vonKarman", positionNose=1.278)
 
-    FinSet = Calisto.addFins(4, span=0.100, rootChord=0.120, tipChord=0.040, distanceToCM=-1.04956)
+    FinSet = Calisto.addTrapezoidalFins(4, span=0.100, rootChord=0.120, tipChord=0.040, positionFins=-1.04956)
 
-    Tail = Calisto.addTail(topRadius=0.0635, bottomRadius=0.0435, length=0.060, distanceToCM=-1.194656)
+    Tail = Calisto.addTail(topRadius=0.0635, bottomRadius=0.0435, length=0.060, postiionTail=-1.194656)
 
 If you are considering the parachutes in the simulation, they also have to be added to the rocket object.
 A trigger function must be supplied to trigger the parachutes.