Tst/adjusting test distances vs positions

rocketpy/AeroSurfaces.py

@@ -114,7 +114,9 @@ def __init__(
             self.k = 0.563
         else:
             self.k = 0.5
+
         # Calculate cp position in local coordinates
+        # Local coordinate origin is found at the tip of the nose cone
         self.cpz = self.k * length
         self.cpy = 0
         self.cpx = 0

tests/acceptance/test_bella_lui_rocket.py

@@ -74,6 +74,7 @@ def test_bella_lui_rocket_data_asserts_acceptance():
     K828FJ = SolidMotor(
         thrustSource="tests/fixtures/acceptance/EPFL_Bella_Lui/bella_lui_motor_AeroTech_K828FJ.eng",
         burnOut=parameters.get("burnOut")[0],
+        grainsCenterOfMassPosition=parameters.get("distanceRocketPropellant")[0],
         grainNumber=3,
         grainSeparation=parameters.get("grainSeparation")[0],
         grainDensity=parameters.get("grainDensity")[0],
@@ -83,38 +84,38 @@ def test_bella_lui_rocket_data_asserts_acceptance():
         nozzleRadius=parameters.get("nozzleRadius")[0],
         throatRadius=parameters.get("throatRadius")[0],
         interpolationMethod="linear",
+        nozzlePosition=parameters.get("distanceRocketNozzle")[0],
     )
 
     # Rocket information
     BellaLui = Rocket(
-        motor=K828FJ,
         radius=parameters.get("radius")[0],
         mass=parameters.get("rocketMass")[0],
         inertiaI=parameters.get("inertiaI")[0],
         inertiaZ=parameters.get("inertiaZ")[0],
-        distanceRocketNozzle=parameters.get("distanceRocketNozzle")[0],
-        distanceRocketPropellant=parameters.get("distanceRocketPropellant")[0],
         powerOffDrag=0.43,
         powerOnDrag=0.43,
     )
     BellaLui.setRailButtons([0.1, -0.5])
+    BellaLui.addMotor(K828FJ, parameters.get("distanceRocketNozzle")[0])
     NoseCone = BellaLui.addNose(
         length=parameters.get("noseLength")[0],
         kind="tangent",
-        distanceToCM=parameters.get("noseDistanceToCM")[0],
+        position=parameters.get("noseDistanceToCM")[0]
+        + parameters.get("noseLength")[0],
     )
     FinSet = BellaLui.addTrapezoidalFins(
         3,
         span=parameters.get("finSpan")[0],
         rootChord=parameters.get("finRootChord")[0],
         tipChord=parameters.get("finTipChord")[0],
-        distanceToCM=parameters.get("finDistanceToCM")[0],
+        position=parameters.get("finDistanceToCM")[0],
     )
     Tail = BellaLui.addTail(
         topRadius=parameters.get("tailTopRadius")[0],
         bottomRadius=parameters.get("tailBottomRadius")[0],
         length=parameters.get("tailLength")[0],
-        distanceToCM=parameters.get("tailDistanceToCM")[0],
+        position=parameters.get("tailDistanceToCM")[0],
     )
 
     # Parachute set-up

tests/acceptance/test_ndrt_2020_rocket.py

@@ -86,6 +86,7 @@ def test_ndrt_2020_rocket_data_asserts_acceptance():
     L1395 = SolidMotor(
         thrustSource="tests/fixtures/acceptance/NDRT_2020/ndrt_2020_motor_Cesaroni_4895L1395-P.eng",
         burnOut=parameters.get("burnOut")[0],
+        grainsCenterOfMassPosition=parameters.get("distanceRocketPropellant")[0],
         grainNumber=5,
         grainSeparation=parameters.get("grainSeparation")[0],
         grainDensity=parameters.get("grainDensity")[0],
@@ -95,38 +96,38 @@ def test_ndrt_2020_rocket_data_asserts_acceptance():
         nozzleRadius=parameters.get("nozzleRadius")[0],
         throatRadius=parameters.get("throatRadius")[0],
         interpolationMethod="linear",
+        nozzlePosition=parameters.get("distanceRocketNozzle")[0],
     )
 
     # Rocket information
     NDRT2020 = Rocket(
-        motor=L1395,
         radius=parameters.get("radius")[0],
         mass=parameters.get("rocketMass")[0],
         inertiaI=parameters.get("inertiaI")[0],
         inertiaZ=parameters.get("inertiaZ")[0],
-        distanceRocketNozzle=parameters.get("distanceRocketNozzle")[0],
-        distanceRocketPropellant=parameters.get("distanceRocketPropellant")[0],
         powerOffDrag=parameters.get("dragCoefficient")[0],
         powerOnDrag=parameters.get("dragCoefficient")[0],
     )
     NDRT2020.setRailButtons([0.2, -0.5], 45)
+    NDRT2020.addMotor(L1395, parameters.get("distanceRocketNozzle")[0])
     NoseCone = NDRT2020.addNose(
         length=parameters.get("noseLength")[0],
         kind="tangent",
-        distanceToCM=parameters.get("noseDistanceToCM")[0],
+        position=parameters.get("noseDistanceToCM")[0]
+        + parameters.get("noseLength")[0],
     )
     FinSet = NDRT2020.addTrapezoidalFins(
         3,
         span=parameters.get("finSpan")[0],
         rootChord=parameters.get("finRootChord")[0],
         tipChord=parameters.get("finTipChord")[0],
-        distanceToCM=parameters.get("finDistanceToCM")[0],
+        position=parameters.get("finDistanceToCM")[0],
     )
     Transition = NDRT2020.addTail(
         topRadius=parameters.get("transitionTopRadius")[0],
         bottomRadius=parameters.get("transitionBottomRadius")[0],
         length=parameters.get("transitionLength")[0],
-        distanceToCM=parameters.get("transitiondistanceToCM")[0],
+        position=parameters.get("transitiondistanceToCM")[0],
     )
 
     # Parachute set-up

tests/conftest.py

@@ -19,32 +19,36 @@ def solid_motor():
     example_motor = SolidMotor(
         thrustSource="data/motors/Cesaroni_M1670.eng",
         burnOut=3.9,
+        grainsCenterOfMassPosition=0.39796,
         grainNumber=5,
         grainSeparation=5 / 1000,
         grainDensity=1815,
         grainOuterRadius=33 / 1000,
         grainInitialInnerRadius=15 / 1000,
         grainInitialHeight=120 / 1000,
         nozzleRadius=33 / 1000,
+        nozzlePosition=0,
         throatRadius=11 / 1000,
+        reshapeThrustCurve=False,
         interpolationMethod="linear",
+        coordinateSystemOrientation="nozzleToCombustionChamber",
     )
     return example_motor
 
 
 @pytest.fixture
 def rocket(solid_motor):
     example_rocket = Rocket(
-        motor=solid_motor,
         radius=127 / 2000,
         mass=19.197 - 2.956,
         inertiaI=6.60,
         inertiaZ=0.0351,
-        distanceRocketNozzle=-1.255,
-        distanceRocketPropellant=-0.85704,
         powerOffDrag="data/calisto/powerOffDragCurve.csv",
         powerOnDrag="data/calisto/powerOnDragCurve.csv",
+        centerOfDryMassPosition=0,
+        coordinateSystemOrientation="tailToNose",
     )
+    example_rocket.addMotor(solid_motor, position=-1.255)
     return example_rocket
 
 
@@ -72,23 +76,26 @@ def dimensionless_solid_motor(kg, m):
         nozzleRadius=33 / 1000 * m,
         throatRadius=11 / 1000 * m,
         interpolationMethod="linear",
+        grainsCenterOfMassPosition=0.39796 * m,
+        nozzlePosition=0 * m,
+        coordinateSystemOrientation="nozzleToCombustionChamber",
     )
     return example_motor
 
 
 @pytest.fixture
 def dimensionless_rocket(kg, m, dimensionless_solid_motor):
     example_rocket = Rocket(
-        motor=dimensionless_solid_motor,
         radius=127 / 2000 * m,
         mass=(19.197 - 2.956) * kg,
         inertiaI=6.60 * (kg * m**2),
         inertiaZ=0.0351 * (kg * m**2),
-        distanceRocketNozzle=-1.255 * m,
-        distanceRocketPropellant=-0.85704 * m,
         powerOffDrag="data/calisto/powerOffDragCurve.csv",
         powerOnDrag="data/calisto/powerOnDragCurve.csv",
+        centerOfDryMassPosition=0 * m,
+        coordinateSystemOrientation="tailToNose",
     )
+    example_rocket.addMotor(dimensionless_solid_motor, position=-1.255 * m)
     return example_rocket